gentoo Easter resync : 12.04.2020

7 files changed, 89 insertions, 9 deletions

diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 796bf049da9b..f4e009cd77c7 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
+AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-2.3.0.tar.gz 43115 BLAKE2B 1ae30621c95d5cddb038b244220e9df02d6a32f31ed516f37ce23aad2d8cc906b0bd1e532a6ebce4e685ab3bd49eb6c73e38d8ebe85f63f74b35302771d1d93d SHA512 8c39c47c236904d3deb3893d43fd1a9332896e8a1883901ef6040607575250b0d661b010d94be6b0d52515b42e2c7924c93d352ca9b209cec54514e856d95c75
 DIST jsonschema-2.4.0.tar.gz 48293 BLAKE2B a3e4ddece8550dde833fb447aefe1e22db6e945b2f7bc01e1b969868480dc516ac0cb79b701d265f6996d892dbaed10ecf3e91ec8772ba5fdd2b6b8ad034fc0a SHA512 111d60f6b490c016a69bed6b0b22cc6395c949d4510fdcb530757d6e61720cd2e1e3346293a5dd1b6501b262b36510ec08ab4ed76dc7484065e692e041232a93
 DIST jsonschema-2.5.1.tar.gz 50855 BLAKE2B 552c8878aff8f67db6011abfcbda73efac82b557c2e7d0ed7fca755e51ab263816931e8c6e69ea43356257d25efabedc5bac135d1477534184d3783714bf2b8f SHA512 9e8f6ce16504b7ae7ef1ceb44ecb07eab85923e40967bd8e502b9fa779e772b547db90f56ca951d06591b951e7240db1071e909ac75543d42f6f2495f6de3298
@@ -6,8 +7,8 @@ DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf9
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 EBUILD jsonschema-2.3.0.ebuild 687 BLAKE2B be0d1616cf323f5a1b478f6a98c712568f3b58313757052f11405ed319426073a8b7ef20cdb85ebe1d573ae0de02d53fa1b282c813d9e351f1819c6d47e02cbb SHA512 e3c5679eced94600b57e78da474abeffc6076d4bd445fde7db1b33011366e82c378b4b8674ac8128c1a7f29e5ead348e195ddb5e8e1c241e31df59c9175f0e3b
 EBUILD jsonschema-2.4.0.ebuild 561 BLAKE2B 3f941c12adea187348f4ba79f22c1608d5e02f8407a5b126535cb0399d5308e74816c47fbe1af15357f94cc6a022c0bf78ec25d7efccf4559945d8b74fe83cd5 SHA512 2acf14f52fbfddc8af7cde759fcabc87c17293c36c5a2f47dc3987543cc3b8d3193a5dda2cc48b7673ea4840b25f867410b98aae5e4dd6cdfccad26e5d165ae8
-EBUILD jsonschema-2.5.1-r2.ebuild 1023 BLAKE2B c436332469692366bf1437481ad262d25c8f78b17aba0c307a4d48f704c61ecad48499d8817a9ee4c9b66c3d6c6f16afb9f903162323252c8d62067c73cb4a6d SHA512 ae41f72e9810aec048ce0144989e332170f5efbfff153cea7a87f1d7e15265e04b80e1c110055ef64ea1c19490744a78d00a887555182e3611cf5928c74b3f93
-EBUILD jsonschema-2.6.0.ebuild 1041 BLAKE2B c9b65b75e69535422ca41678e6eb13681620e37a5855b3ddfe342a21d7d444dcdb20506157e1b2469edede08a2ffa956bdf30274aba574c947a5ec5988cd8213 SHA512 523558e3897420e3b8a9d291bd8dbe609105fc8832cd0a84101ef286387f66ddcd06c9f6a1238b18d8d84c85f391248a018cad66b18c80c88fb7a636cd50aa49
-EBUILD jsonschema-3.0.1.ebuild 1193 BLAKE2B e794968d6e67e80d03c011d473952620824554969ac9060d6533bc617667d6581313253fed1ae1773656f9177f70715ae1a794da8898244d97ece6ee3744c70a SHA512 36d9254597100030ac1ac974f95a682a1421a2f4352a07af018a16222282ee206de665e50bc52ee363a06c1b35e6422de601f6b9543ec34a6374d4ab58379a2e
-EBUILD jsonschema-3.2.0.ebuild 1559 BLAKE2B ae91d81dcae4b23de39f30c9d9d4458ed56719a954fa3fe331f3b544ac801a4cdceda5dcedbff711ba5ceb0f0a3c469479cc8531e9f540045c74453a9c08420c SHA512 7b3bbfd6998b1002ed30e16ca60e554f9b797c1a90bd795b279780f6b3319090a96b56bc0ed742815ee716fa4372bc983ab01a4b1c1002fc24240ceb66869d13
-MISC metadata.xml 559 BLAKE2B dbfd5c0c2d3b9e3ea197db40ca1c1ea22e63e61bb540646a4b7dd711ed4e5a8a3bf5cc149a90e9911de76db8895f4a807b7ca1500d8a3937527902b0036a8360 SHA512 6824c104780402599891db143c021ecb833d2bca3dee97a6d12cc51f23856f6e9dcadd2a438ca8ad13a6e292048cb5bdbdf024665b06da547fff1c7b9f5090cc
+EBUILD jsonschema-2.5.1-r2.ebuild 1021 BLAKE2B 4de0a7854ce1c1c1054d907264a14e89c7daff586ab066dedb9764d4a72e57c77ca5e780687f004b52a65e7b1a497e023c7763202bc18f15b393c4f8de2d79c5 SHA512 4b850e4a23c0f267c69ddf602ecc511b8b92b21d0e3c65b6b09c246536b7edae8be68769200f259dc37530abb8e6b5c19729fb7d6f92fb23f6a47f4a2e49ef6b
+EBUILD jsonschema-2.6.0.ebuild 1037 BLAKE2B 53228667cdf093e796aa33d9a75051ff6f8d55a7777746227ae821af820f7ba782db4852d92369e5160c598ce1442fc8f693b1183802ba2f72724c0f0347578a SHA512 71e29830554566c8bc27c2d0d7a1d90a91006e91c6c930708f23a393f25a801bf4f56ad68d0b0d7f6319ce4dad4020e2bd7c784c1dee1fc6b1d235146a4a171b
+EBUILD jsonschema-3.0.1.ebuild 1180 BLAKE2B 38c26f2ab42b24860d030877729ce56a5b8d52b36844d6fe11209032d9aeb30a606bfb602a6a254f1de4128db7053581c0bd085de97c0e95ed3d674f3106b810 SHA512 88904954fff96974a7f4af7c57dd33f298a1c6a39b9dd2f74aa5f690fc24619713a87906ac607e18d8b65fdca7af40acf524130bbbbc1e21d59eddf1439b6a63
+EBUILD jsonschema-3.2.0.ebuild 1644 BLAKE2B 2b8c61283eeb781d8ad5361a9c26d92d9ac765026c3e89759912ea3d16f48b63cc79507564aea6b381c1d3350e45ea0dc685b1d89e61a9f66972494614b4504d SHA512 4fd3bd94984509e5266730a00e36a3430904427bd16c5f5c6421da2810e3bf009f751d18b8750756e86ebba8557af343960796869e5c7e8c2b483da68fef7c27
+MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch b/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
new file mode 100644
index 000000000000..bfb4fa8d139b
--- /dev/null
+++ b/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
@@ -0,0 +1,70 @@
+From 09595a50f507399bf3fa8c68ed6371c42b9c4874 Mon Sep 17 00:00:00 2001
+From: Julian Berman <Julian@GrayVines.com>
+Date: Fri, 21 Feb 2020 09:30:05 -0500
+Subject: [PATCH 1/2] Newer webcolors has a new API apparently.
+
+---
+ jsonschema/_format.py | 2 +-
+ setup.cfg             | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/jsonschema/_format.py b/jsonschema/_format.py
+index 281a7cf..f3c758c 100644
+--- a/jsonschema/_format.py
++++ b/jsonschema/_format.py
+@@ -354,7 +354,7 @@ else:
+     def is_css21_color(instance):
+         if (
+             not isinstance(instance, str_types) or
+-            instance.lower() in webcolors.css21_names_to_hex
++            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
+         ):
+             return True
+         return is_css_color_code(instance)
+-- 
+2.24.1
+
+From 0d192e192526252c30c16b3651c293bb5f21a99f Mon Sep 17 00:00:00 2001
+From: Julian Berman <Julian@GrayVines.com>
+Date: Fri, 21 Feb 2020 09:56:13 -0500
+Subject: [PATCH 2/2] Sigh... but also drops Py2 compat.
+
+---
+ jsonschema/_format.py | 11 ++++++++---
+ setup.cfg             |  4 ++--
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/jsonschema/_format.py b/jsonschema/_format.py
+index f3c758c..b96efb6 100644
+--- a/jsonschema/_format.py
++++ b/jsonschema/_format.py
+@@ -342,10 +342,15 @@ def is_draft3_time(instance):
+     return datetime.datetime.strptime(instance, "%H:%M:%S")
+ 
+ 
+-try:
++try:  # webcolors>=1.11
++    from webcolors import CSS21_NAMES_TO_HEX
+     import webcolors
+ except ImportError:
+-    pass
++    try:  # webcolors<1.11
++        from webcolors import css21_names_to_hex as CSS21_NAMES_TO_HEX
++        import webcolors
++    except ImportError:
++        pass
+ else:
+     def is_css_color_code(instance):
+         return webcolors.normalize_hex(instance)
+@@ -354,7 +359,7 @@ else:
+     def is_css21_color(instance):
+         if (
+             not isinstance(instance, str_types) or
+-            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
++            instance.lower() in CSS21_NAMES_TO_HEX
+         ):
+             return True
+         return is_css_color_code(instance)
+-- 
+2.24.1
+
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 9e31994522bc..ec2584da018b 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index ef3f34fe4724..6fa889c5c9e6 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-3.0.1.ebuild b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
index 08d340d3912d..2831d238932f 100644
--- a/dev-python/jsonschema/jsonschema-3.0.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index 9163778afc7a..271abd7c8c33 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
@@ -41,6 +41,10 @@ RDEPEND="${BDEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-add-webcolors-1.11-compat.patch
+)
+
 distutils_enable_tests unittest
 
 python_prepare_all() {
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index 0ba78538e44e..b833d5ed8a63 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -5,10 +5,15 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 jsonschema is an implementation of JSON Schema (currently in Draft 3) for
 Python (supporting 2.6+ including Python 3).
 </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonschema</remote-id>
     <remote-id type="github">Julian/jsonschema</remote-id>