gentoo resync : 20.10.2021

4 files changed, 2 insertions, 94 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 660455355c2b..d56856595d4b 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,4 @@
-AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
-DIST bleach-4.0.0.tar.gz 183459 BLAKE2B 380e94163b353e9436748fc6c1f368fb4d261087c2d6bc6fab1262295d597dbe81a67c34b889a29fd6a5180b8b522b517dc234e78b26556a16845f26f83151c8 SHA512 21f2a2dc5fa5e09cc2e38325191d7dc0bff2606cbe68ade54d866e326e712cb00a80b3a7a44f844ad4967ee6fdf453cca07d02c337bf147e4a12237231bcd99f
 DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
-EBUILD bleach-4.0.0.ebuild 994 BLAKE2B f51f660e8bcac01deea9dc8e4aa45c098d990f6a0637ead10967dace56734067894c9a2e5e0efa26ba7f3c14957c5845f1277c3aeb10b0074a01c78a3344a193 SHA512 6b404eedd2086899f33e2c8972c09eaf300ab40304ad4b5474ee9063920b5d8db4419b5bdd9a318ff1c5f8ff4846fb4d4af9ddc7dca707866152d7bbb532244a
-EBUILD bleach-4.1.0.ebuild 1068 BLAKE2B 97773e6ac97f013b3c5584ede91857cbab560d79a0ee859b2d821512597a7c6e8bae63c79b85d9811a5bbd322a5f4148e3fadb8af30b1ec2491da00296d8f7ab SHA512 28351a1e6acf43eb632c7f5f4d3862a5c1d202af24bf080faf6d31ea09600646079e20403782c311a037d88854f2821edf64ae11acce25df63c9b10660c53871
+EBUILD bleach-4.1.0.ebuild 1060 BLAKE2B c4bf4ba0d613fb8c0052984ad23224fda6fe8b85eeb6db811ded2eb36d0607dae15d37debb8b3f9ee125ea64e323d56761f25cc6c36b8124d0e27f0d34082e1d SHA512 99f6d19b23d11ead8260ba799df38e11b1b44ddd2773d5bc4d41dac698da6a34dc8cf50db0abb9772d32ffcdff9c95e73eaf398f321663ef519fb436e5f37330
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-4.0.0.ebuild b/dev-python/bleach/bleach-4.0.0.ebuild
deleted file mode 100644
index f378247bac78..000000000000
--- a/dev-python/bleach/bleach-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/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"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-3.2.1-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-4.1.0.ebuild
index 0dc5d1156b83..ee2ae8a64724 100644
--- a/dev-python/bleach/bleach-4.1.0.ebuild
+++ b/dev-python/bleach/bleach-4.1.0.ebuild
@@ -14,7 +14,7 @@ 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/files/bleach-3.2.1-py39.patch b/dev-python/bleach/files/bleach-3.2.1-py39.patch
deleted file mode 100644
index b281031b3df0..000000000000
--- a/dev-python/bleach/files/bleach-3.2.1-py39.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ccb0d5e98b30577fe27016b5bc774388f02db876 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 19 Sep 2020 08:00:51 +0200
-Subject: [PATCH] Remove tests relying on py<3.9 behavior
-
----
- tests/test_clean.py | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/tests/test_clean.py b/tests/test_clean.py
-index 1cd58df..2b2f7c5 100644
---- a/tests/test_clean.py
-+++ b/tests/test_clean.py
-@@ -499,31 +499,16 @@ def test_attributes_list():
-             {"protocols": ["http"]},
-             '<a href="example.com">valid</a>',
-         ),
--        (
--            '<a href="example.com:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="example.com:8000">valid</a>',
--        ),
-         (
-             '<a href="localhost">valid</a>',
-             {"protocols": ["http"]},
-             '<a href="localhost">valid</a>',
-         ),
--        (
--            '<a href="localhost:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="localhost:8000">valid</a>',
--        ),
-         (
-             '<a href="192.168.100.100">valid</a>',
-             {"protocols": ["http"]},
-             '<a href="192.168.100.100">valid</a>',
-         ),
--        (
--            '<a href="192.168.100.100:8000">valid</a>',
--            {"protocols": ["http"]},
--            '<a href="192.168.100.100:8000">valid</a>',
--        ),
-         # Disallow implicit http if disallowed
-         ('<a href="example.com">foo</a>', {"protocols": []}, "<a>foo</a>"),
-         ('<a href="example.com:8000">foo</a>', {"protocols": []}, "<a>foo</a>"),
--- 
-2.28.0
-