gentoo resync : 29.12.2022

4 files changed, 35 insertions, 24 deletions

diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 7dbaaf51465b..902840cc7f8b 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,5 @@
 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
-EBUILD chardet-4.0.0-r1.ebuild 713 BLAKE2B 974dadd27cd39dc091ebc8c998a67074e6a69026f80821f9df993c1c6521902e1c51fc91e9b3267a04da7fabc0943d330428b2a5d3e19a4c3de728aa3a4c689d SHA512 bca89fd4a01ce4f0aac433da1bfdc5e4f5ef0e3d3b07d208f537f0b54d53f20466a13bb8b36082c98ee02976d10e22ee633037c05293b7594d64b77c919f4bb5
-EBUILD chardet-4.0.0.ebuild 659 BLAKE2B fbe72d35cb021ecd92e7a3e026359d26653bda2110020a3f087d2e6306fdf9f230223ff8514db4f262f6f98f842fc1a0a55c5c88e3d25ff0f1337c029ed47428 SHA512 4117c08066efa4f926bbe57457c92879e4e6d4f035eebcbc81e59a642d630e8fd14e5aaa62d186846da680b6ab569bd1177d24b41044828b4783a28df7123992
+DIST chardet-5.0.0.gh.tar.gz 2016879 BLAKE2B 006992a4945840b3720e93f932618cf81debc094a3ae353bfdd4e56ecdc5a01e4a250bed15473d8d59108978fdbfb769081a9b87f672d35f4892d5ba04c2deb5 SHA512 d19413a4f1f571f3627ec3f55dcc6a69497f6a1d72fe972051713f4d7a473cd539cfbce2eb2c7a070295aa640c6ac2aec6fc0064751e465311935c0e4d88061a
+EBUILD chardet-4.0.0-r1.ebuild 705 BLAKE2B 33750d7b4c1f4263412a7628ed6e4babe14764c3d5ef262fcc0790115ab86dfdbbaf16e4affb3f1b212809f2384e9d47e134363c0a0162903590c268616af656 SHA512 fbbbda1edda3d54d35b25799742834f0ed28b2b9a0ac354ca174be288c1530ccf5ab10f0dbe51712408b6c7314364991e8bdb36f53da6f917e4ead68977dff7e
+EBUILD chardet-5.0.0.ebuild 794 BLAKE2B 6eb014cd669d2cc293b8d7ebff79e60844fa9252e94025091da8b85b64bf9ad2be35af4d1defe15fed1e0d696b88a1683c2b6a9cda5772322d0d55c9adcef65d SHA512 c04f3b25ac004d8c5b1356a1d7f699b6b3a2fb6942c561ce5611bb8784d784435a2164601ea7a6c573f203321008b04380f14fd784b1d89dd3a760f75e990a26
 MISC metadata.xml 403 BLAKE2B 90447dade87db87cbe60f8a0ff84e0617156551d74869306167a5c196e2f6da7746a9ae9a73624099ef7d593f1f36a476cf3b61251d3ca97daab1eccc963e08e SHA512 ed1030c49899c34998da5ed13f4c6dd297f75f5f9e0a06e51106c93579aeb0b4fe37fbea08e8e182d6480877d28a963f73f4a91402241412a22ee389179d8ef6
diff --git a/dev-python/chardet/chardet-4.0.0-r1.ebuild b/dev-python/chardet/chardet-4.0.0-r1.ebuild
index a8afdd4a6f64..26a8f949b152 100644
--- a/dev-python/chardet/chardet-4.0.0-r1.ebuild
+++ b/dev-python/chardet/chardet-4.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
deleted file mode 100644
index f69796f4d505..000000000000
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
-SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/chardet/chardet-5.0.0.ebuild b/dev-python/chardet/chardet-5.0.0.ebuild
new file mode 100644
index 000000000000..1a0f32883fb2
--- /dev/null
+++ b/dev-python/chardet/chardet-5.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="
+	https://github.com/chardet/chardet/
+	https://pypi.org/project/chardet/
+"
+SRC_URI="
+	https://github.com/chardet/chardet/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# super flaky test
+	# https://github.com/chardet/chardet/issues/256
+	test.py::test_detect_all_and_detect_one_should_agree
+)