gentoo auto-resync : 27:10:2024 - 03:04:35

4 files changed, 4 insertions, 83 deletions

diff --git a/dev-python/ftfy/Manifest b/dev-python/ftfy/Manifest
index d066b5b6687a..2fd22ede820a 100644
--- a/dev-python/ftfy/Manifest
+++ b/dev-python/ftfy/Manifest
@@ -1,8 +1,5 @@
-AUX ftfy-6.2.0-poetry.patch 1200 BLAKE2B a8bbc0f705bc8efee7dcf2a4a3657efdf7328a756ab9090e0bca8428c070bb6366e57dd6988476614237321192d7246bd95801c98a0fc1dd58c73ced6f0a2307 SHA512 ae464ec93bec2dbe587a5d8db474105a5bdf6337e26acf0231fd2c9161533a13fe57fe806f243f1809f86c5771cffdf372e574ae2c352b005df6649a25390aa5
-DIST ftfy-6.2.0.tar.gz 63675 BLAKE2B 4d2455c004737b2914edcdf22dc53e433f1f9d9a1b469f8b34069ce7a4b04c30a5b2a0d76db35d8e1f9ba0469cdff604271e7331f9fca0d8b579cc61c422cde1 SHA512 31724b3f65936a146f567a493988b3a3ce5ba87ac7578b97a64f0946cc20d09fcab040964cec9bcf3fbac1f79cad0b67c5e74aaa871a7d6c856f5939e7a30529
-DIST ftfy-6.2.3.tar.gz 64165 BLAKE2B 83fdd2ba0b8b321b2cbac62c4e41a68356cc8a73970c0683aca8915624b622d1ef462c4724afd1dbcae494387aad3b97ba836cc47d433fb10b57a5c1019ee602 SHA512 6711dbe9750db6bc25c57d5d600d1db52eff6f22caa7ff89c06615bbd7dd612cca56f9e9a35c633648747c421f2e710a6e24ee1f9a6d6df0ac6f6049a5189e8e
 DIST ftfy-6.3.0.tar.gz 362118 BLAKE2B 30dd2a94a155203827bd43f05371f5a8ac3fb880a621f1d6323cfd0570310f326ef3d97dac3f82bc683dfd9a7b2eb3c7d056b3dbd9ef94a950046cb2a2c567b1 SHA512 1fd1c209961a69a4424f3b0f51f599d7b1a86035470cb3a0ceef998f0b7a7dc80d709b2d2efa122beac16819a46799255dbb6bce58949c28c3d919c20431c865
-EBUILD ftfy-6.2.0.ebuild 856 BLAKE2B 3ed0c7a48ef5388f257fb687bc8bf1ca99398b64347526b68e27a03ec551de7b552eea43651e990eda851dd6f9d81f207021f9e2c9b67e755a5aede0985978f4 SHA512 d7c59fbd2f1dd676eeb30746c3eba42a27f3360cf16f1c52daa44b7a5e48285f5169477fab530177a53553406b6f8ef7b0374c922970a5e2ae29b88e580983e6
-EBUILD ftfy-6.2.3.ebuild 595 BLAKE2B 6189b5583c32412de11e51787c428030e0f532888687f1722f4a5ef09f84c21046a82e071c0f6778f3bbc506eef7ace6e5d8111d92aaa50590fff1622badf25e SHA512 397c2d022071ca73bcf9f8dac7b1ddbc8dca88173740b32e54a04bee7e31ac2ea29593e2d29b89952fa843b081aead5e26ca0ea634c40174bb21b662c7ad6975
+DIST ftfy-6.3.1.tar.gz 308927 BLAKE2B 8ec573e3a2b2f92489c811fe42e066a981cda970531994c984fe91acd55a302437665771a50a573715b1aa594840c1fa4043800d2ded6de9b19f27dd6737a018 SHA512 a6ef2fb906ad9bc91638a7427defdffafb8116991e20aa421b34b7151862edec7ae15cc1427a8d753b849ba929bfa8e64a97243fb69d1f4a1f2f7617ad71ed23
 EBUILD ftfy-6.3.0.ebuild 546 BLAKE2B f7b72aa0bf64aec403cbaeb7b28d1c512f7f4ca70700fb21d70a4ed6cd9757cd1cfea03477f20e295b8ff9621d9c697573b4514b30d3efe25c2e663aa9c1add9 SHA512 bf02ae91494ba746e7757c3a5c4e16dae01440f43e7a091916321ef6a9096629aeee0f8317b906e1f9ef37021d13bd57ffdf53096e6a9714f9eeb9a683d81faf
+EBUILD ftfy-6.3.1.ebuild 546 BLAKE2B f7b72aa0bf64aec403cbaeb7b28d1c512f7f4ca70700fb21d70a4ed6cd9757cd1cfea03477f20e295b8ff9621d9c697573b4514b30d3efe25c2e663aa9c1add9 SHA512 bf02ae91494ba746e7757c3a5c4e16dae01440f43e7a091916321ef6a9096629aeee0f8317b906e1f9ef37021d13bd57ffdf53096e6a9714f9eeb9a683d81faf
 MISC metadata.xml 368 BLAKE2B 96639093056e0d54294c9c5b095855a76c1719497018d3c3a64be3b20cecb5c708c8bb8d18305f59c2e90e2f9fdf9a48201df44fd8aabe1d8eda300ce209b093 SHA512 e2ecb35c3ae0d92def0ac84f493f7cd00e94be64065cecca5e207af0dd48394e2a09adecc506c6187eb1b0336ed34f635666e8868073a987d7add7d0b5e49bff
diff --git a/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch b/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch
deleted file mode 100644
index 1766a9aa98b9..000000000000
--- a/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4ef6eeef8764086816034992705d4a4ebba4e88c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 3 Apr 2024 10:33:02 +0200
-Subject: [PATCH] fix pyproject.toml not to install stray files into
- site-packages
-
-Fix the `include` directives in `pyproject.toml` to include the relevant
-files in `sdist` archives only and not in wheels, where they end up
-being installed straight into site-packages, e.g. as:
-
-    /usr/lib/python3.12/site-packages/CHANGELOG.md
-    /usr/lib/python3.12/site-packages/README.md
----
- pyproject.toml | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index fc3e6b9..3bc68e2 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -4,7 +4,11 @@ version = "6.2.0"
- description = "Fixes mojibake and other problems with Unicode, after the fact"
- authors = ["Robyn Speer <rspeer@arborelia.net>"]
- license = "Apache-2.0"
--include = ["README.md", "CHANGELOG.md", "tests"]
-+include = [
-+    {path = "README.md", format = "sdist"},
-+    {path = "CHANGELOG.md", format = "sdist"},
-+    {path = "tests", format = "sdist"},
-+]
- readme = "README.md"
- 
- [tool.poetry.dependencies]
--- 
-2.44.0
-
diff --git a/dev-python/ftfy/ftfy-6.2.0.ebuild b/dev-python/ftfy/ftfy-6.2.0.ebuild
deleted file mode 100644
index 91e9718f0575..000000000000
--- a/dev-python/ftfy/ftfy-6.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fixes mojibake and other problems with Unicode, after the fact"
-HOMEPAGE="
-	https://ftfy.readthedocs.io/en/latest/
-	https://github.com/rspeer/python-ftfy/
-	https://pypi.org/project/ftfy/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/wcwidth-0.3[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.2.12[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/rspeer/python-ftfy/pull/204
-		"${FILESDIR}/${P}-poetry.patch"
-	)
-
-	# https://github.com/rspeer/python-ftfy/pull/205
-	sed -i -e "s:'poetry', 'run',::" tests/test_cli.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ftfy/ftfy-6.2.3.ebuild b/dev-python/ftfy/ftfy-6.3.1.ebuild
index fe56cdad539d..5cfb846a8c63 100644
--- a/dev-python/ftfy/ftfy-6.2.3.ebuild
+++ b/dev-python/ftfy/ftfy-6.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=poetry
+DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
@@ -20,8 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	<dev-python/wcwidth-0.3[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.2.12[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest