gentoo resync : 22.01.2019

4 files changed, 16 insertions, 18 deletions

diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index fddf89876182..335153201cf3 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
-DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
 DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
-EBUILD bleach-1.5.0.ebuild 775 BLAKE2B bed91ab21bdf8e1b71222caa391619e46c8f4020af72502ad08a733291ff0be11cc91f40e7461797a9d014c63a7543a3bee72e3616497e9ff243f14490e497ad SHA512 81f7a5f0fdf45d61f4879debe3f3fbdb09d0fd69dc9a40bd672555437a66e1517bf621e7b1d5722337d8a57bc5d318df5603daecdf6eb8454b03e4f35a6b1155
-EBUILD bleach-2.1.3.ebuild 792 BLAKE2B c5ae1e13eb60de6325e0499601ea186247e144e023f0dc42c321a17fb5871b90e79a64c72e0cd21083efb2274bce941d884b8ece553252ab24a68af2422e00bc SHA512 a7897976905624bea8b5b6d55953260b1d57d2cf0b602ff445b884e261ce71942e8681fdfad15eeecf2f74174c30d713621eddae606f338154799cf2721599b1
-EBUILD bleach-3.0.2.ebuild 776 BLAKE2B ad751be4cb06af64969d08cb7bf6111fa87483637731a5d2987ca55f8af701083bf670ecfb2459703ba108c65b4cd367ed7847d5f1cf17e7042f42ec1005af3e SHA512 5a44eb59a6c8c7aa09417622c7d2ae0c2f01e4ac9d6f6f2b0c545cdd2d01d89de8cf6991d3a8d194ccb0badb15c87ab80d1e8dcba6a636e6bfecf530793867ef
+DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
+EBUILD bleach-2.1.3.ebuild 796 BLAKE2B 84f777274e563e86919a67248c9492362cd1697f7df61b355f96746694ff57e06365064616805d048485c525b82ff0413c4cc1dfec996df97b07088baa54a9a6 SHA512 a8a5ea0f4d6f8e5c241ab38cb3aa00fefe0121f7fd20b9294b81712361baf80b700b633c5b3a9e79aebb9b42a52e1a6679b673eb2b89066db66f3366374845ed
+EBUILD bleach-3.0.2.ebuild 770 BLAKE2B d67f6af4e918890e2cda903e949efa0315b6767ba9a282bf0fee12a3d32c088f610499a3b0581fd2685d0860b953bb85151f219b0f7883526b9c866e18d617e5 SHA512 1898a9a72bac4180a1f68984539e4e5e4b8de973e626a4e617db27750ce07c27726501ab646213ed4d2c343cf61b50bd2d8a703ee201b935450970eda3d80266
+EBUILD bleach-3.1.0.ebuild 776 BLAKE2B 1e9c547c067ca046d657cb77dc247812cf57abac1818bdd56b16f724a31a7648319e3d44ebd7b7c0aa65211f04a36e0180a0536b23fd70c70d8372014fc616ed SHA512 6f60c04ffb344b2ada594a7721c1812e9bb83b1b3209f8880c65848f988e24e84f7808d1b4e902e2108572c0435d852db1ea4f036d0a3bd1ef1bc726ec79c4a6
 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
index b397e3a658b1..9de8b738582e 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,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 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 3ae4009d0bb5..5f76613c2eb4 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,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 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-3.1.0.ebuild
index fc1dbd3b26d9..70494f99846f 100644
--- a/dev-python/bleach/bleach-1.5.0.ebuild
+++ b/dev-python/bleach/bleach-3.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -12,18 +12,16 @@ 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 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
+	pytest -v || die "tests failed under ${EPYTHON}"
 }