gentoo resync : 23.09.2020

4 files changed, 130 insertions, 0 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index e9ebe95a3754..e442dcdae362 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,4 +1,9 @@
 AUX bleach-3.1.5-py39.patch 1043 BLAKE2B 9af8ba9c8e05eecc96ba6e85424e748cbc8c36ff251144fc32b78987f3c1b902fa725c05aa0d750184cd4ca98ee0a3f577020d7351cb0869949cbe038f819444 SHA512 c1b9b81b3a2c79a468aed858d75be143d441a10ceea5ea95f131e9e84502633a7c35dfead709fffce1c137093200123bbdcaec4d71180f747d839cb945e98afa
+AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca737d122efb7b0c5b5ae6f153b8989b4efc0bf26bdc34c9391af0e81fae5a0f01bc25e2b11db0c5ca76785d6b848 SHA512 5bffd50d9be425a97d6032ad6a55e2d92826ea9e074ea76039a94377c2b4f53599a740cd7fd5c6f90aa2ba87882d46514d014889b0a09f8273fbd31fa98f5b50
 DIST bleach-3.1.5.tar.gz 177972 BLAKE2B 6033871f757247f05ee67f66b3596c7a76a9bc5105113206bc8749f9ed103fb6a7c91630540f5f17ddc17e261b24043cc2edcc2562ea7f4cf54774080854de32 SHA512 20db9ab6924a1e884107f30e1059f774b45fd169d3965a61a4ff028e3de17e30be81474d7da89d9275b2173a005c5504a9d11f0e0ca528bf36a9bf08aeed0607
+DIST bleach-3.2.0.tar.gz 178910 BLAKE2B e7e97cc367420a656086e5a0e6c1c527348a0edc23c15f5f4b5a40b3079a2fa32b71fd2d99c4db8891e1b2ed06e4ac8ab3d3f0c9a3de77d02499bf32746a9dd7 SHA512 06dd7e22204280a03e37cfc303b4de8fc8776e9ac3f7a4c2451f1ff768b68d97c6b00fa42dc275eb4404dae5e448b9385b4e6ee204fdc7e11f31207cdc3d926a
+DIST bleach-3.2.1.tar.gz 179763 BLAKE2B 5288277ceae1f51fb76c360db72fb646e1d391b3e51f29ba2b25f5dba7704af8ef7cfd2db017237dad42ff4a99e502daa29cdf4edd82952e15842e288c50c0dd SHA512 61710f48f00333b38d251360736e19078063433ca4d7aada210a986f7d79b08c79c64b412686c67f360e4b2e8420c40c4b515eb175ab92bd546f88e2ba0e5835
 EBUILD bleach-3.1.5.ebuild 940 BLAKE2B 5315ab3d17d8bb34c94476e8002fb39797a250fcc27d80d2742d4fd4d094ddfc1dd05e45444f6129f6f3bde9b43094ccaf5d07a4785180dd84e182a6583973fd SHA512 90b38022a46803687d0cd0ca59d34096b326eb41794890ee39989b0bee48d8ce7434d2dba5b2ccefcfba24eae0065e681993915cf627608ee73e28d3f8a2f7b9
+EBUILD bleach-3.2.0.ebuild 957 BLAKE2B 212d497c9a976c26e5e114dbbc08d670330638b1a90f96730393f7d530a5faaaa54ad15aee07e93848653ac7b5ec82d078bcf7c8a75075f0d9e6e2b4015ec544 SHA512 66f3cb38660ecff452034774df89a8690d2dddafda66c93972e1404a07e7c5b13f852c9ff5ab45f465c5d00f7af5e05b86237be0a136159bc8d3f6e58542922d
+EBUILD bleach-3.2.1.ebuild 973 BLAKE2B f40585757043d04ca894d70bea67b99a801dfabe88cad3222d303731c5490f312b6977aa3f6b2ef1f8cf6affd36a360e278f16645d33984b3732768a7ef873fb SHA512 e40a6e10c5b7a1aa0e8dbdd6630274835eab469d9166e25a971e7846671fa00ffe2101538b74de5e6448267286ee5ca5ad34005494a26deffc6ec69064e8468f
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.2.0.ebuild b/dev-python/bleach/bleach-3.2.0.ebuild
new file mode 100644
index 000000000000..eab1404c49f4
--- /dev/null
+++ b/dev-python/bleach/bleach-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} 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 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-3.1.5-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py tests/test_clean.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/bleach-3.2.1.ebuild b/dev-python/bleach/bleach-3.2.1.ebuild
new file mode 100644
index 000000000000..4d1438843f60
--- /dev/null
+++ b/dev-python/bleach/bleach-3.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} 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 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/webencodings[${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
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/files/bleach-3.2.1-py39.patch b/dev-python/bleach/files/bleach-3.2.1-py39.patch
new file mode 100644
index 000000000000..b281031b3df0
--- /dev/null
+++ b/dev-python/bleach/files/bleach-3.2.1-py39.patch
@@ -0,0 +1,48 @@
+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
+