gentoo resync : 29.12.2022

3 files changed, 19 insertions, 13 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 1daaa9f2a30f..707b8baba13c 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,6 @@
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
-DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
 DIST bleach-5.0.0.tar.gz 198789 BLAKE2B 0b2847e9342be1854a08679230b3ea0fcb1a514eaa6c11f344057e59310b6d769e2bee91272295a0f60fa0ed1c2e4503340276d99794d260b6a63e2c4ea76703 SHA512 5b8e0c94a7bd8270581719928ec869c5c3c91900be0a293adfb342acfc55df7e63211e95786e6a39b3661b3852e91a8b37ff805387fb3e6a286e8a5dce8e3655
-EBUILD bleach-4.1.0.ebuild 1060 BLAKE2B c4bf4ba0d613fb8c0052984ad23224fda6fe8b85eeb6db811ded2eb36d0607dae15d37debb8b3f9ee125ea64e323d56761f25cc6c36b8124d0e27f0d34082e1d SHA512 99f6d19b23d11ead8260ba799df38e11b1b44ddd2773d5bc4d41dac698da6a34dc8cf50db0abb9772d32ffcdff9c95e73eaf398f321663ef519fb436e5f37330
-EBUILD bleach-5.0.0.ebuild 1075 BLAKE2B 9d388e114c3700be091f1b1f7750e8d3243e33db9d828017c75d3ab5fbed7793f33dbefde88266708f0da9800b539ffd58f72b1db603cad14dfef5d8ae143600 SHA512 15febcc501c0bc34c8142c66f442ff231d16ae31155ade31086b513754cca0bb78b50f3621df77bdea427a062a1c09503cae62e4b25022cb2c9e21ee50c1da5a
+DIST bleach-5.0.1.tar.gz 199642 BLAKE2B 8d06dd38e89b91bf48f3481b5337b8d9700d8cc88faf3a260898b2b8f15ecf5c5160f96bff2c5ce02f361b773b0ce9a51322d9836dcc99b7878921846e8da182 SHA512 6c8e80eaf6db6f0e6d9066f3443192f44c489e079945b6d11b11e7eb270ea865011019e05d43c7896262dc11ca168e697630d9da8dca9f5bb48f0e2161fda6c8
+EBUILD bleach-5.0.0-r1.ebuild 1101 BLAKE2B 4e34d0f4918b39b3c29d260714008bcce5a84a65ad7e72b4aec08b9f3c74dde52e768ea748d750a4cff8e377cc4116cf02b700076fd8c04a0dc6928b0a2fcdf9 SHA512 c07586ab99178517c1f84d73b45e4c46018706d10ef60895527e58b522c93b4d0cc6dea21f8f99fea65ad0ee7236e77046d544f38fe346bd1e038f266b42cf40
+EBUILD bleach-5.0.1.ebuild 1127 BLAKE2B 3b7354ed825d4a51052d1406a248adedfac87ce16362b305b504df280de2c9b6215614a1a7cee7ebad41e78a92971e7af8f3e13bb4624e2fb2be6eb64fbc8bd4 SHA512 cc2b2e9180e5cd04a5faa467319df0e4a45bb4ec8bd9b4b2b87c255d2ca639e817c68a0e7eeb33aad574c8190509ebd0d5e56bdafdb19e493ab20d12ab24cbe6
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-5.0.0.ebuild b/dev-python/bleach/bleach-5.0.0-r1.ebuild
index 4fa6c6bf98d7..2fe9eb311b0e 100644
--- a/dev-python/bleach/bleach-5.0.0.ebuild
+++ b/dev-python/bleach/bleach-5.0.0-r1.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
 HOMEPAGE="
 	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
+	https://pypi.org/project/bleach/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-5.0.1.ebuild
index ee2ae8a64724..587c260240bf 100644
--- a/dev-python/bleach/bleach-4.1.0.ebuild
+++ b/dev-python/bleach/bleach-5.0.1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
 HOMEPAGE="
 	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
+	https://pypi.org/project/bleach/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -24,12 +27,14 @@ RDEPEND="
 distutils_enable_tests pytest
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-py39.patch
+	"${FILESDIR}"/bleach-4.1.0-py39.patch
 )
 
 src_prepare() {
 	# unbundle unpatched broken html5lib
 	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.parse:urllib.parse:' \
+		bleach/parse_shim.py || die
 	sed -i -e 's:bleach\._vendor\.::' \
 		bleach/html5lib_shim.py \
 		bleach/sanitizer.py \
@@ -37,7 +42,5 @@ src_prepare() {
 	# indirect html5lib deps
 	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
 
-	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
-
 	distutils-r1_src_prepare
 }