gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 66 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 1e0cbea66c5f..45ce93e68dad 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,3 @@
-DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
-DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
-DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
-EBUILD bleach-2.1.3.ebuild 803 BLAKE2B 84b3524e8fdb4b886c453e6f1e33f36d47836368adf399dc4da57fc99e5128870b0b8186420753bf76e57f6de7617b59ebe569f00f3edfffc96610e29fc01850 SHA512 9c9d50f58dfc721fc6b90b72503b5feeb457b749a80539f9e0e9f444d3fff5bc416a9be96950d6d15924c7061661f360516f489aafcced89f883bb2ee8f24384
-EBUILD bleach-3.0.2.ebuild 774 BLAKE2B 51a57662bf92bc4036a335c5baed13868a63d54b4e238284ea90144c931b6978dbd9e1033a48f566a6045648997b5b63f610c92481059524dc9c1fa44c48b10a SHA512 622d7b9477397ab9e04f41e36eb405ca02ce113e3e313836962aac575a52ab338b091b2608989a151ca94baa4d282d7218e146b25e82b55e7376df3c5c3ad625
-EBUILD bleach-3.1.0-r1.ebuild 673 BLAKE2B 6e38dd14db6cf0b37cd213887cdbd80b85f54d8a6eaf6381f7983d5129d47c234e7f30deed05d7b2818e2a9eb98c1cc68a5e0b4f1b7211b211f539b808d6d783 SHA512 eddbdad07822184128323bd2478708762d4ae590b5375367f95967a795c6b35053d8990a164d084b542ee3c4188e80b1ec8b992b3245918e98b411331e865918
+DIST bleach-3.1.4.tar.gz 177813 BLAKE2B 446740fcb7f2aa137d7353b0fbbebd57db9d571248b67f4d0a6a47baf3581aa3793431f68cf340bc8a0478d21e84aafca17538d069d74657285fdc4a06869586 SHA512 da233794954aad4e63e334d3c3bab9089e7767e0d784b8c51d12d2862ac6ed73ad5122b4d9cfd291ba7d9fc86a4a3b515429d7e383f241a46e3290acefa2ffc6
+EBUILD bleach-3.1.4-r1.ebuild 867 BLAKE2B 4ee516e3b87a244dd4e065ab8ebc75e17ce257ec5d32826add063b5f71ac53409a63c3d2be2a1b4459087250dcd9be96768fc1254a1735f7ddca0619f411347d SHA512 be209bccb8f10374c9090042f030177176684e9cde540a18c30976405ebbb59a7a4e5fff7a2dfc45c6fa02c559ce8a3b5626a7f9e95b04892e8c22a07d873d0f
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
deleted file mode 100644
index adf0b60e88b8..000000000000
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 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 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/html5lib-0.99999999[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
deleted file mode 100644
index 5d9a20c33816..000000000000
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/bleach/bleach-3.1.0-r1.ebuild b/dev-python/bleach/bleach-3.1.4-r1.ebuild
index e487450fbfc6..d80fe336be4a 100644
--- a/dev-python/bleach/bleach-3.1.0-r1.ebuild
+++ b/dev-python/bleach/bleach-3.1.4-r1.ebuild
@@ -12,13 +12,22 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/webencodings[${PYTHON_USEDEP}]
 "
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+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
+}