gentoo resync : 16.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
commit: fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree: 10baa743a5340b42ad538dd19d48669ccac209b1 /dev-python
parent: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
68 files changed, 180 insertions, 759 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a21ad5f50f42..8227aefecb07 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 025ca6759337..22dde63f97d0 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 601 BLAKE2B 4f69cb1abea2577bcd872d7ec5f4b899951414d69ad6eb9d9a69ad2ffb53c035210fc1b10d468017cbab3d643768ba399b28d2e0e6d08895e7e4b42491433cc6 SHA512 16dff5f5416c0b112b36782f8c9b321f9e9966b944d3d97d17a775d8fea58380199793b2b869cb2d9042b89e85dc770297c0b0bce6a39df98fbfea9b430d57f0
-EBUILD asn1crypto-0.24.0.ebuild 830 BLAKE2B 4dd95b3421fb67e560edbc3b861f6ff3320525b407c4afc734530aba518cee28c96ed073c1a61a7c4f5dd69dd68de794a1873350c239d9edde74360a3ed62a5b SHA512 a702a9b4b0c7ac73f18cb9fbf059b126e534bcf150878008a24a98a5306564d11d6d6d963f341ccfff2e663b493c2db2795bdc4b361cce2f018f9add45a650fc
+EBUILD asn1crypto-0.24.0.ebuild 842 BLAKE2B 3ece401b5b7eba93d4a2b71884400d2382c8f9b9fb8f1a6548fa81ab237b90bc1d0a5220f97ffca9eeb0846cc9c5ac3909e963f544ba8de1d49e9e6f249b9e6d SHA512 0316be1ce225d30a0e7717ce5c2dc02464a12e2f7e38d1dab9e7e8765e6b33735d1818ed231ac21c55a56c3d0a08d43cad1bd26315d5c124885983f035a9f469
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 9817f8ccb7d9..1e420188ba9f 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index fdd627efb4e0..ae34d87581d1 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -13,5 +13,5 @@ EBUILD cryptography-2.3.1.ebuild 2162 BLAKE2B 107ab46113d303cb65ea7a525dc52cdbe4
 EBUILD cryptography-2.3.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.4.2.ebuild 2117 BLAKE2B 3e57b574745c93c3418cacbff7e878c55b14623817dd3568146424b8a58e55e16365e8df0bc484f56e95914c50d5cec9babb8f77d1663512d458dc2e62a396d9 SHA512 6c507578db5f181ef9b72804d7b0ff33d2314bba8dc9a59d378e0ff7d36a51fdaaa1d71a06ddca25854850900159553e4597da96584e5a32baca4ac7d555a4fa
 EBUILD cryptography-2.5.ebuild 2132 BLAKE2B 1820f42eee23ede2b0248a3a962493030873c50c82f46dc76bfb56fdcfd7097ba3fbd078694a0ac19178ea5b929a2a31d8e4ca30f5e25fd3f1397243b1f6ed19 SHA512 a3bef75e92e4ecfea739ee7cc8f94179577bfc2d99d4ec7a5ae19a3a32afd50a0cefb0b83d2456e1f7b3c1c427a718702e70b3a16648727a33f10fc99c122146
-EBUILD cryptography-2.6.1.ebuild 2214 BLAKE2B d51e32a3c2db9738d4d23161f1edb549e545af19a613915daefc532d712c92c8e74e3770960ba2a862c525ba6ac2fc03ee109ea246237970fb2b461ec83a97e6 SHA512 9ce23cc07f0f1672b716c10eabcf84eaf76329b82f5da0d46f7715c9e150a9f15ede451a6f404a2c24b047a239339d34dffc86fe9bfec09531a329c33d77ed72
+EBUILD cryptography-2.6.1.ebuild 2226 BLAKE2B f1d48009f72b3926a4531e5548251880bc209290a4a18cba100905616bc0ce44c71ebbf8a13fed23605193263e3137085491e606e02ceb0e4a8e8db9fc02b97c SHA512 1b2b0ca56e816a2c495a180cf7a6407ee77fc421d547ade989f25baab02d6e8b75f8afe2edd23310a7e98f90a25244e6e4f8f436745869461854f13b3bb8e9e1
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.6.1.ebuild b/dev-python/cryptography/cryptography-2.6.1.ebuild
index cbaa768497c0..857fb14cb2c7 100644
--- a/dev-python/cryptography/cryptography-2.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index f62d26fa13d1..20a236da67a0 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -11,7 +11,7 @@ EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
 EBUILD cython-0.29.10.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.4.ebuild 2162 BLAKE2B 6e8d845a05d93dccbbebf6af2bb2ac3fb62701a314a8f545088350c5b71a17b8ee9f8c3018cebaec933bf996be2313d4ebe81ec874f31b10c63953662b994f02 SHA512 9cd4fa338f1c71147d73478cd4102fed7f1a7e7bb848122c34b965553309cf61d2d92e9667b0bf2cb31536f790de6388be55139bcc36b51501e84d05740c3e79
+EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
 EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index 2a75daddeb8f..e828c36daa42 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 115dd0982fcd..1a6a6cee21cd 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -3,6 +3,6 @@ DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b9
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1153 BLAKE2B 1db9e9c166a235e4da1e5eddbc767f10d9381283b20169a47fff45d1d2ed39c382412f71929e23b49966c97803cefc67bbde254e2f0cbea0cb24beb7ecb5b235 SHA512 7a40e104bb60ef53a9c3c6df65d6a58331b5d1f671b759e42faee518dad584692997b063b8cee47a0db3988dba08b51177ed7c29cf924c94fa9ebb468d0b48e6
 EBUILD docutils-glep-1.1.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
-EBUILD docutils-glep-1.2.ebuild 837 BLAKE2B 3b2498da9b55c9358929bf8e9d0bb63960ff3cfbb74cd092e194119b85f5b249c76d9b5066f10ef4f2257462ee669b47fd20f31ddaafb7d35b76530f8af2e725 SHA512 8ac2d0abac43d8c893c637ced2afdce787f5801cb9fffced7559bd4f2515a80aec0e7868633be0958ad7963c92eb11307418c00222707618ddfa58df438a1644
+EBUILD docutils-glep-1.2.ebuild 835 BLAKE2B f7d64aa918745171bdf1848c64063a0b7f81e400eceeeb150f8b902a578435fafad03f7b248caeb023fe56ea93e9fc20ab0c3d3fa27a0c221b7f2d508a392ad0 SHA512 ef3846b94377829ad51f0bed99b53fa8724a8a878d7e911dea39563acc8ad64e20f54cf9e2bc8d8437c3209ca5ab8318a33b8f445ae4fee9171c5eb036f36bee
 EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index aaec82c88005..63b86045e925 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 30b7b221fecd..de7864c9f61d 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,5 +1,5 @@
 DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 EBUILD ndg-httpsclient-0.4.0.ebuild 815 BLAKE2B 4faff1f1005d1ea6cf8df544ac041fe2952c487311a067f60c13e4347bb904f01fddfaa7cd67d397aaa1bae7b3fab373f1ba54052d43378dfaecd4776068051d SHA512 115c9181bc485de09c745083ae57decbeedebcaad7a1b8985dafd67e6972d0ebe0d3112683f90410bd3fb9f059530fa7187c3a4d012b678eb6c3da348e6a9320
-EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1644 BLAKE2B 618dfb2452a61b8a0aad5744aa897d05c3f52406e735aeb06b3c04e168c854e47441a1a2f3c28d7373733d56bb961ac8830d677fbf2c7a2238fda454b86cefbe SHA512 81513c3fb2836ace4b4086ba4e4cb153cafc90397976e8ff6c10c32f6305ffa78083be410e34a3b5535321c097c7f81a71e385290e55708a6379c6111cc40870
+EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1646 BLAKE2B 895c2cbe7bbbf3102e351a62d5dc5e718ae76c0b6d5e6551a7c4b7c7b5106ab892b66800711da409dd8b679c650da2992327cbd56dd87c0b124c654a55c4ad49 SHA512 d6d02df27c0e789e02809e5bd1391f2833d541ae4e163c6dcfd74a7a4664a732e7d2d67660201ef768041fe556f8d7da6022cbbc75775c7924d5d6d00cda837d
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index 412b15434662..7fec4ed8b952 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 7ea4b4b5b504..211d50002ba4 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,8 +1,6 @@
 DIST bug-681012.patch 4751 BLAKE2B 50c95275ec06522292bcbc7833af63bff98dcc112b2c2f742c0807d02bf090cfdd70fdeed433149ca3f27b7b5d356d7bd321c145aa8fb212ffa6e77b42da976f SHA512 f7ebbe5fbdbb570fbadc7d840c11fba49a9bc13e04626df053aae3da5668641f095a48d89229a7fd2b894d86c58f14699822e16923f183c099792dcde0777051
-DIST oslo-cache-1.30.3.tar.gz 53116 BLAKE2B 0b63f828f61dd82b69efe7a6e345974c56b2e980d88f159dd7c3ba5484cd1e8f78a393a7f73a6f2152db1c30178a054e2f20d753a286a0cd8f7d83af7f623bf2 SHA512 3ab9842cd388a846fe9004b97364057245936b9af185ba0f68e6d6bcc750dd957eb873d45e686cddeec94fda6872b72e4549c71ebc9e1de4755504c2a138b85c
 DIST oslo-cache-1.33.2.tar.gz 55778 BLAKE2B e75fea8b669d30efdf72bd565deb560dfe2c1627e4bca74ffbce923341e5663d641ae44b144e070e4af7587c08e911a4b025ffd0ca1bbc39dfc4ed3266cde1c8 SHA512 8111ba9f62724ff6ee64750a88807e40a38252273669c96b86dedd0e36f2d1661f54fd55bc462ffa577e95771d08965ad6be208224d442306d869db2d155da91
 DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
-EBUILD oslo-cache-1.30.3-r1.ebuild 1173 BLAKE2B 82fe972fda987f22c495edaaf42c2218224a6e562f3b04ffac9ef1429ee2195e931701ddb48b6bb4f1e08b1c1954cbd6e5845852906e1249bf3d06f5275aca6d SHA512 bf93c8cf44e6724ce1b77972f5603625f0fcb795e037506721a92e492cb919e4fe958d8f9680f6c90d53d360021677e8ff4e2c0cf40585c86ce8025eb90530b9
 EBUILD oslo-cache-1.33.2-r1.ebuild 1192 BLAKE2B edea95d24eb2756e656cb37790c2693dfa3b25fc3f004cf75fd0da136275c727a75600b1520720921f8a2990c8fb2dea786726801ad8b147b19077930f7cf9d4 SHA512 96bb301424cb4530e75e9f096552d323eb99532d483afa26089cbb17dd092760e8ba76f35c4b7c5c8730e34777eb667e0f3375db6ec78721f751133e7e910ec4
-EBUILD oslo-cache-1.33.3.ebuild 1074 BLAKE2B 1f3f19873b43d48447699aee44a55d03aa4bd61dbc8ff3cd13d090912abdf4d0258c25e2fceeb217c2a4c10988908137b5e72c37ba1ee56be9124bb508c2bab5 SHA512 76621ca251812cbf8b1daad7731af1824b267533d34dd46c2085deb69db0490059e75ba2e23ef8f47b4ae187b8b9deb9a9dcba3e7730921540d5a10570a783b0
+EBUILD oslo-cache-1.33.3.ebuild 1072 BLAKE2B 58f04bebc6eb68e244e03d8dab1d1c259afde97ff6b1f492c5df5bd5d73872dc4e46412a790a45075b64cd3265a0d61581549538ac4a65dcbfdf4cd6333f51ca SHA512 4f0cd1b96d53eb27fc30df3c016c532fdeba82de21bf99aa58a1ed7f526daf5dfae919c7daf9bba7b49abcc90db2315aae1e54a96759d9dd7af925418212b151
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.3-r1.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.3-r1.ebuild
deleted file mode 100644
index a185fd034056..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.30.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/patches/bug-681012.patch"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${DISTDIR}/bug-681012.patch"
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
index 9ceba426c4e4..0958aba71861 100644
--- a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index b852efb4ca7a..39c41b8a01b1 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,6 +1,4 @@
-DIST pyGPG-0.1.tar.gz 15441 BLAKE2B 5f14788d17ecdf9459a3332fab050892273adac75c7adb5c82c5770956017c3336385e35d4e2827cd070162efeacd4f4e3b2f2fa2cf17837826913fdced89875 SHA512 58a89fbee4311b89c5515ad1bc1d901057e8acdfdbcf36813f50a766374100a62efe456d52263711e5c2f46957791def9343d94f019e413506cfdbd353602060
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.1.ebuild 1023 BLAKE2B 94811e069002fe9f05b3e3474a0a0e9cd32704fe2d8b21e119c389db998f5318875e2b2a5a80a6093d14e905a4727f6238dc1ac4be2d770476e27d780b32795b SHA512 344be87147bef5f0a816c28c3324b023b04b42e0ffc37105d0a50b165a5303b8a5b6217e216f5c763b43c90021910217aa761554c0b4670da79380d40651de7c
-EBUILD pyGPG-0.2.ebuild 1044 BLAKE2B dfb439bed56543aff1542ad495d84ddfd535c3739b8b5b39c79a6d9951ed4942fdde7df038ef69f9355e00f233023fece8652bbf9222593bfedeaaacac744279 SHA512 c76c72cdc9408ccdd426933a4b636a3384d0a884d472e87990f74255f2a15a17f005dddba991d07b1e216287afbef64356a5669c5845c92baaae4811790560fe
-EBUILD pyGPG-9999.ebuild 1020 BLAKE2B d8d05084ab15c4c5d7c04e2de325b27b07f03e7613a49b37446ff1c16d6d647d7f13ec089a830f539d738791f57802c1f736628e817fd47d34afe77e5a8f4bbd SHA512 0164f36f2861643659b2550b023722946c0fe9bb8f7cf983ba98caab56b5aba6e1acb102381527c552e4ce9c745a4fd9cff8678a7f057b9d806cbc3af3bad18b
+EBUILD pyGPG-0.2.ebuild 1128 BLAKE2B bd9c98fbeadce7f24d82cd477485e0385f5ff885d50fcd8c7da5e795c9f2d1fb553cb0f7150201e1228ab549ad17565add1a9cc6e12c99b60dc0c323ca3a9563 SHA512 10beb7bc4671fa2db678dfd716c3564f7b705abfe35e437951dcad388bf5988d2f8ee3654d22844bdfc96914898a2a22a75e5311b60ea2733fec90f3554a0298
+EBUILD pyGPG-9999.ebuild 1137 BLAKE2B 413a02bd7ab8aa9eea83c6b8ae075f7e148d33f95e58485d71fa7db3151bae5f53f842aa2ea60a03ffbce1ed58bf4adeba7317f2220f28533364a14e98c4aa77 SHA512 228b7e18adf0e7d3f10b5432713cd1ee4d329046b141baaa7831fd58ecce010021d71a2d386a265ca5d151bdddf3c451f3678ea8684735b089252fd9d2efe916
 MISC metadata.xml 672 BLAKE2B 27b2cf23f9d5b57b3b125bbfe3bf7e3ee581cb2d438e60295d94bdccc1d7c6549c412df0771b0d20d053f8efaaa1659ef9cc3e948a9afe2c70137047d63772c4 SHA512 3e10843a2625c38e9481e3d7d70318312efdda48c3ebf2c97af5f1319e03840765116856de363da5a7088e0fa25f03c513ec11bbe8eae55d932470e9f3bee420
diff --git a/dev-python/pyGPG/pyGPG-0.1.ebuild b/dev-python/pyGPG/pyGPG-0.1.ebuild
deleted file mode 100644
index c73c9a749895..000000000000
--- a/dev-python/pyGPG/pyGPG-0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
-
-DESCRIPTION="A python interface wrapper for gnupg's gpg command"
-HOMEPAGE="https://github.com/dol-sen/pyGPG"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	"
-
-pkg_postinst() {
-	einfo
-	einfo "This is experimental software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
-	einfo "Please file any enhancement requests, or bugs"
-	einfo "at https://github.com/dol-sen/pyGPG/issues"
-	einfo "I am also on IRC @ #gentoo-keys of the freenode network"
-	einfo
-	ewarn "There may be some python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
-}
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index a6a797b30f4d..e3d575a7cd70 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -1,24 +1,28 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
-EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
 HOMEPAGE="https://github.com/dol-sen/pyGPG"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
 DEPEND=""
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index d1140338e37a..a5839bdc60dd 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -1,35 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-EGIT_BRANCH="master"
+inherit distutils-r1
 
-inherit distutils-r1 python-r1 git-2
-
-EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
 HOMEPAGE="https://github.com/dol-sen/pyGPG"
-SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS=""
-
 DEPEND=""
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
 	"
 
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
 pkg_postinst() {
 	einfo
 	einfo "This is experimental software."
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index fa305321e162..5a43c97f48ad 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,9 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.4.tar.gz 479157 BLAKE2B 5b650c7916127219ba18212f035793bb805adda570dd4a89cc7fcda8af581c7aa3916d2851117a5efe7b434dbe2e9ff103e37e69de5d158d0a58162b15f1e18b SHA512 046e8830d403d869418a8cf7f22549293e336fa1b8fc108489c3c2299316838724d1eebc8747005d594e1c6c3596aafa5192dd64a1f34e0a2d080c83214324da
-DIST pygit2-0.28.1.tar.gz 496243 BLAKE2B cfd9ddc8b1e5665016a2743bb0a2f6f5821e08a5173f7be4d99b11e1bf5bc0ba97a9d9fce7eb560f6394f30f23f7b7ce69abc5968ac2d566565c6b06b06f0f8f SHA512 46bb9d6150b7413311f26ea1aeae15cdcd22a2d5c4cafa17bd8a1c02dbf0c9a630cf89583e77a07be5c74334ac28a672de31290ba986476ded25e8a19abf7f3b
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
 EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
-EBUILD pygit2-0.27.4.ebuild 838 BLAKE2B d93bd63226b8428103d17a5870d7773aea35155c2b8eb73f5df573a4f72775e5d60878e131a31b32ff5ef1a4ee41d6c8483c860638da1f25328e350b619559e2 SHA512 db19631909b47e7895dbae8b2217522b1640623dbd31cbdaecbba7a2a96bc431a2f224426afdd4bd45b29f9ae0447a2570f6e231619f507942313aedbc5323fe
-EBUILD pygit2-0.28.1.ebuild 728 BLAKE2B 4aabbded2e54267b53fa5a234c09396b76017ec703d3979a63e2527bfc673e24f430aa84f7300348cdd91a07fd9271fcf0fec44d5c697fdf10761b8ec78aced8 SHA512 b5fc02a1e0b71c5fc7e0c9c2ea5212b9bfcc1fe5a56324fdee087227fd8bf275ec5e5834caddb4d5c532f7fd3be907d187c0d41b57667d0c91d6c49893a5d23f
 EBUILD pygit2-0.28.2.ebuild 908 BLAKE2B 1c9e89d18d2a5a61c583bed417c294f4573bb69a52ebc319411d1690bb26423a296bb7e790b4a549464f452216d97f6de91fb4b3bdf8ff0b1b00c8535bce69ce SHA512 45de481b1c50545466ccc866f5e22b0945289d41c54fdeac4a0b8958723d46e0b00571987ea08da36a7fb5f70bcca24793c03fb9f0bdefa2b47caedbf711d416
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.4.ebuild b/dev-python/pygit2/pygit2-0.27.4.ebuild
deleted file mode 100644
index 79087595fdfa..000000000000
--- a/dev-python/pygit2/pygit2-0.27.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-python_prepare_all() {
-	sed -i -e '/pycparser/s:<2.18::' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv --import-mode=append test || die
-}
diff --git a/dev-python/pygit2/pygit2-0.28.1.ebuild b/dev-python/pygit2/pygit2-0.28.1.ebuild
deleted file mode 100644
index 020409cd616d..000000000000
--- a/dev-python/pygit2/pygit2-0.28.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv --import-mode=append test || die
-}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 98e3e7061b71..932281e028bb 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,5 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
-EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B e7ae0bfee3dc195c6539be92e49fb4260700d0bd1302625be04f5ce3038d2251ef0191b7de08c1a9ca849b0b5b3287fb410c55ff5fe9ed8340d0616bf4cc2323 SHA512 eff953cf7c4725a8758c7ab94d2f913f41b2d4eb6eb276526c41848ca35a762ee258279147c9b93b08b90e1cb24eeb880644defb14da20e9ac57bd5270580350
-EBUILD pygresql-5.0.6.ebuild 680 BLAKE2B a252bea18db05222cefd87c0517e7998e3753f1de4347a619dc33a3149c3c25b12b0cf69ff889a9bd480e5eee274a01866ba957f94a3d017e99e40caf329ed7c SHA512 1d692dcac9b0f50b4737ca3a89745b964504f69b5464c170cb025712430c4c3e849a1766029ccfba0cf740851bbc6a22b33adadeff4606b36a4f0d6f9dd3ff5c
+EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B b6aba084401746eff21c7d274de495a3b3a8a8f1fa27cbd33dc7a344f2188fa6a5efb681ea38c9f29478df5d7de99aa5aa14a335f23a9c45d8b7a9f2604e1b4d SHA512 ce194c95ae14ac485dbc53f5848614b8af1f0e87ef87e370e7810a95f59711d7c0c0035482669b9f4646f7238b6fa15bfac850f62baf8b64c14616b20050a6bf
+EBUILD pygresql-5.0.6.ebuild 680 BLAKE2B 35931862fd43c4121a47eb7dabe56ef00905b521bcf641dd30dd06de7cf1e1db705ac6ea10bf59feb0d90265c00d3b50060c8752d83cf8f110a320c0a4028084 SHA512 f16ba7b8baa228d4f218ccaf2c3821e0954d60b406b42d47f4e39014dc53344f9f10c667f0d8b1be07db7df61aa1a0e91a9ae7458193177f4f67948d73d51ec7
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index f1e62372667e..7ee66e6f8b29 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+POSTGRES_COMPAT=( 9.{4..6} 10 )
 PYTHON_COMPAT=( python2_7 python3_{5..6} )
 
 inherit distutils-r1 postgres
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index 0027fca8c7ee..37b859644fbb 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-POSTGRES_COMPAT=( 9.{3..6} 10 )
+POSTGRES_COMPAT=( 9.{4..6} 10 )
 PYTHON_COMPAT=( python2_7 python3_{5..7} )
 
 inherit distutils-r1 postgres
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 62062fc856bf..79c53d71903f 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -4,5 +4,5 @@ AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 EBUILD pyilmbase-2.2.0.ebuild 1129 BLAKE2B b3876947d8104e5dca92dc6e02780228b30c5c3b3fcf0975b8a8876b3b48e8f95990d16b1a94101626d439972128e0c4f0d901d847a93468f88592e92f0855bc SHA512 abe726f6a70ee90242eee1a9b70ca8386e09a1c7de32e30372407cf4c49ef653e260f392b15407f7d13d76b737a424699d72d0c35f92793c470bddeedbda3e65
-EBUILD pyilmbase-2.3.0.ebuild 1429 BLAKE2B 7910bc31dc4dd04c83ba7a68a20d1f56f35a20a42ae66b85edb88273e861debb3e8889975adb1741e686b78624ab7c02d76c82406f61bb41d396541646d31050 SHA512 9f918d152a48e83c188670b7f88af0c4b3e5b76dad9989d3fb99e278e9ce03639c10c1cfc2786b7bb060e47fca59e47d9bf3aae5d3f061da1065d456c0700fee
+EBUILD pyilmbase-2.3.0.ebuild 1427 BLAKE2B 5b353ca731b5efbbf90313789a0540fb469f3c1665359bde264b837703fe0c7e16e82ea3005447216ad2aef00609e1f0b527ab254b9d2c8f6c6e1cad4b36afe9 SHA512 b4a1cc005b53a03ddea0bef680591ea1eb87e231ff6a6fb898f8a104c67c6b08d9893e7b4e20d3c4be73b13f1316922375679a79e24f06303375036d3a876518
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
index f0a627779b31..7516ec8323e2 100644
--- a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+numpy"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 5830142d0627..6787065ce3e7 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
-EBUILD pymilter-1.0.4.ebuild 490 BLAKE2B b3e3b18819975ddec6b43f5b629e1098f8c9fcf7a938b76dd519de2e2b773ed9f6ae4b13d3d7cd3125ff0142619bf2ed2af71f979d6c3349fbd1fc644c708b7b SHA512 1f540da720f2be1032ae6a5a0b6752202a2a34fc8bb71ca824d2adb663dcd8ca193dc6a18e124afc5a19d1a07f7f91f546dd8b301cea32c6c4eccb5a6f359af9
+EBUILD pymilter-1.0.4.ebuild 542 BLAKE2B d4bad3bcf14417511632dfe358a13cfaaa844da8192eee6e0afb436e891131ec17dd3bc3f295c4907ec879e8c3c84afa958c925c9266e14cfb930c13be1f8e4e SHA512 cb0bd7c2d7a54dc60ed82205c583740896be28665c1e32cddf3bca3e69ea8ff8a146dee520c6ce124da222fd039336d67cad336836259b5a4f853f40b1726c14
 MISC metadata.xml 745 BLAKE2B 20fb9f28930e8252bcbf5e678a4c53bdbdaf2dd0ae2d06a1ecabb993c1f172fb462419377b5a44d57d2e71a15b41676beee93c371a6b58642b5db02dbed868d2 SHA512 03a63f23eea33c7ea8d0de9b121b7edea4dc96199cc390a5488085865ed41272d7e599ff3f5043cdfe7582c3ed0dab7afb3d2bc6b173620390a118a282f5e800
diff --git a/dev-python/pymilter/pymilter-1.0.4.ebuild b/dev-python/pymilter/pymilter-1.0.4.ebuild
index 3a205f24df6b..f143496421bb 100644
--- a/dev-python/pymilter/pymilter-1.0.4.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4.ebuild
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+DEPEND="mail-filter/libmilter"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${PN}-${P}"
 
 python_test() {
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index d33345c613ad..8b569cfba9b6 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,5 +1,7 @@
 DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0c5fb567ea1633df0184870d4472d5c2c4c48e7b65ebd8fa6516ae04409643910a527eb4a17ce2cfc00e504 SHA512 bc1010fab290e96a973dbdd6a4fe7ffae3bed0ecdf20615dc609e4a784faf9668c2673c2398626a3b08f1d840d1aa07661506d35343ae122ad2666f6a7107ba5
 DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
+DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
 EBUILD pyocr-0.5.3.ebuild 679 BLAKE2B 8c7e4136251eac927fa72d7d12aaac341d6c77568cbe7a6a95123a8ae36a5646388fcd1702ec973fca97a95212734eb0f98d1769f905971a294e78cbd5a916f3 SHA512 8dc96807a2f6402f58dafde3f55ffc1b111426439aa1a29066c3439c1b30f126decd755217f245f41ecade68f5648cd8fd32cc48dbfc918e98ce8019c3339a7e
 EBUILD pyocr-0.6.ebuild 613 BLAKE2B 9aed7132d856272c881493af267fc50d064143d0e1a58e073ec6f0830ab0d7e72b49ba88746d01c99eb5cad9ea0acd4a2bac52854a439f1063e3426b0a83bf8a SHA512 64f07c267b0a89708f8cd22f8eaafad449a9de1491413e5306644b2e8b16527c02b711182a9515be4886080b3fc107552cf25664a5f332029acdb94d9ab80ec0
+EBUILD pyocr-0.7.ebuild 705 BLAKE2B 6de6a3cbbbed259dd59bacffc2667686fc1899036325d5f8faee0ab66f1ef6f2e7e5b2e1c946d2cda77f8bdbdc8fafe2154456642cf8f543a6e7b12e0569175f SHA512 80859eab7f6f3efe841f69acf3bbb46b30dbe8770ca5675bd862d47524fffd7593e5a833e5b5e5ba6754ccddc87b2c63e653c10d84580c0bf64cebd1a37efd43
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.7.ebuild b/dev-python/pyocr/pyocr-0.7.ebuild
new file mode 100644
index 000000000000..07ad6371df5b
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	dev-python/pillow
+	dev-python/six"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index f672cd453b3b..e3f4575ca224 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -3,5 +3,5 @@ DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b0
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 EBUILD pyopenssl-17.5.0.ebuild 1710 BLAKE2B ceb19771cc8dca511e6e2771c7646467e37dd1000d08f5df2b43cd8b494d7c19a2a233aa013f7e769d00b6b0634f63688103cc970f499861c707ffcacee3f1b7 SHA512 2297eac460c89aa6fc7189b909f3aaef1cee3fba47854007287e279769c4d6dc52d6c7161578a67948b1ca39596931befd655085cc7a9af744d8d2cdd144c438
 EBUILD pyopenssl-18.0.0.ebuild 1724 BLAKE2B a62dc348e12c606c409d238e239f69dd35e5e92e6171f941372b29b718cd339535aed829706ea01e605932b2ffc7589397b07d25e52a78fcd840460a1feaeb3d SHA512 096bfa8ba6b0434b88078c0013c7149cf911c11b2c1d3e1bee5310fdb8031e1de91ba7ce377af09f88c20db5319f186b6e7cf7e2245ed779c6d5c850ec4807a6
-EBUILD pyopenssl-19.0.0.ebuild 1709 BLAKE2B cc86ece9600a99d038784d8642ecf439466a7804c7a7844644cb3ed72a47f2350cb9646662f16c8419041d62ea9dee93d4108b2a7fb42e6c8859933511d0eb2d SHA512 733970f2694255b8df3cc1b89d51a9b3f8c9db6f034feb2499f07a155b4bb099d173adf48facae4579d29be2ad7b3824575c022db5520687d9ff03791098bcae
+EBUILD pyopenssl-19.0.0.ebuild 1721 BLAKE2B 05ac531b688e786eedc15ed68c0fbceb805dd7682bb3f27e65536110f2c67cdd82efc2bfcfcd82255e2327682ce070bbefc3a527407ccbad54ab151733d090d5 SHA512 c7b6be8a4e84a44a9ae7508d3d2a26654977955cf995106935625c69ba7e7e5c8d9dbb4eece7559e8a2762cb0cf859491c6f886504cc04a896aaaaa13f290caf
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index dc6a20f16736..5c54bae40901 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 60f9ed21188a..0de0e0881762 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
 EBUILD pyrfc3339-1.0.ebuild 666 BLAKE2B 95a81b02e00ca3ecf9037a883759b692c6ae64e38d968c3eb1056c82faee9cb20120921136b6dfbd282014185074043da4953f70a383e8459eb54aa1f22f5757 SHA512 caf59eb1859fcf66aa0cecd94c2624320bb2fa73738905b62724a015e49950ee5df412396cd761d356da928972c4dfd89e80b14e71c2f2061344f00837bb7941
-EBUILD pyrfc3339-1.1.ebuild 668 BLAKE2B 9ca2e2c2e003256ed34c4e05e4341ae7994bf7eeba7cc5b11ba7151c894ebc7ff2fe425f2f3b3b9c56c405780129fb2404e9ed9c6df9275ba8cadcd01e4c7489 SHA512 f2cd9be771b1bc18e8d713f69a468bc553512d635c5f4668c6904ae3efddfaf497aedadc7ac95bc68b3fb9f03fa3a40656d27f0b80f12cdaad329801aa479fb4
+EBUILD pyrfc3339-1.1.ebuild 666 BLAKE2B 7b73aa27a654daea075113ee2e01d63507b6ac5bce29de0eaf66377055bcd99e76b4d28e12f3ae7a251a47396a8cc23a8859b3fd1dd7097a2f453148cda6486a SHA512 5ad1dc5cb9d5e44bda63063571f8d6d0e36e94144e8642aef33f8d48e4172e62de8ec3ab5f156b9e17fac73d9d1ffa3ffaf4d23b46c33049930fc09e6a2fddec
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
index 0d30481718a6..993518840760 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index 94594a4f35e9..e185381f4c72 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -3,5 +3,6 @@ DIST pyroute2-0.4.21.tar.gz 577795 BLAKE2B 721f0e7958d50de356a424a5f87ab895e95fb
 DIST pyroute2-0.5.5.tar.gz 702481 BLAKE2B 7d9db1efe0d76e5fbca3f07d0ce666f919001fa26c220bd432c719aa6fc3a4d0148ea6357ed84cd5d0a6e47069994f35d2501365115b9c497674159098c2e5e5 SHA512 c7166e667b6fd21eefd34a01a0bba8467f3ae4d9526af32d5a6e96747c8aac7590da1097f1ca9b12390158e90ddfd6ff9f68c85765abbe179e8761658dda6b86
 EBUILD pyroute2-0.4.12.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
 EBUILD pyroute2-0.4.21.ebuild 496 BLAKE2B 219ee433271a4366a9ac16bd916de6374b1e0cf1e7d389392f0ec8d86f213083ca17ae6cb25d46ed0913ca37993659e0bef91e0220ab8fe73685f6624b72a84b SHA512 6f06d47e00b1fde471d5e4774515b8df4b448aaa8771d1f19c8658c83c34aadd3bee1ba0b1b1d28ab39201a5382466ae982eddd15ecbb4eb8889beb9cc238fbf
+EBUILD pyroute2-0.5.5-r1.ebuild 518 BLAKE2B 95129c5e1ad4298979e7b6c44e1bb0f1a43640a5a1c6abc27fb7ca61b2b7ca5e9a41b4db0653ff2cacdb59448b31d2d59eb620c860b06667a58c45c4da47f8b1 SHA512 aff59523d73c8370271b65f719af36a3e6312c7f1378fb2eb7777ee181633e5aa65ebfc3d95c0215fb8ba876ab2fd3f1c2dafbf32e1d6e12da5b82e1549a8443
 EBUILD pyroute2-0.5.5.ebuild 494 BLAKE2B e388d2448e54b67391fb5992adb5b25724c65a40d822ec8b7a1a3240820dae532a2981ab70c0edf8757111f04721e03485f39e1f2055265553c2fa7f42ef9062 SHA512 2cee28c9689ba0fff89d64f230d19f9b3f742bdd1705049a183c90369acefd9f3ee9cc43599833bda6297e816171eaa36cf519ad8db34e5f07f541707bfffb16
 MISC metadata.xml 613 BLAKE2B 81956270df2ad42126ab220bfbfc35ccd4681abf9779bad96580ce6866bfc08ea1cd2216782a8fbbe76aed58d74de752fea55d0967f24c0d3d3b6bb01f66f18c SHA512 9c88578b74af7890a2ecd8437581eff4dfbb49696d9c3e6fe1bfa807fffad66f949538aaa08d57f56a11ffe95b48c9ceb9d6b97594635b429a8a54bac3db3912
diff --git a/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild b/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..c144bf26f0c9
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.5.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library."
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 924943e72f90..c2c43a557f02 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,7 +1,3 @@
-DIST tables-3.3.0.tar.gz 7004337 BLAKE2B 7ca95e65920c3bc16b5bac8c3bf92f2fa9c498eedfc981ee9e27c77f30f31bd527f15b37d8ffcc03bb2dbede170cce1a1ab7fc54de5ffebfafa4e41f69bbc46b SHA512 e19445f0f5f2530d49ce55f258931babb7b05df2366637ddbc306323a1f75b7f7dcf91d70a8cc1f41b182d4cdd9c83872873168592bdcce7bd5acae9f3274f36
-DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed958aa824dfba5a6c902200c56253c7d5609cd674dfcb288f6ebf2ecb76f4324e53b852f70d0cfc60d6b222510a SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
-EBUILD pytables-3.3.0.ebuild 1571 BLAKE2B 43d8ede420ab0e4ffc70afd44a72afb5ecc8b71ffdd1554ca888bc22a944cef2f70ecf0fab452b9de445247d06dd5a7d9e4a71d78cb02451cc1a81bf53242514 SHA512 4aa19713c2293855b0d0886623392dd43d0f9f7cf995c0b7ce471deb60f67e1c15bd93733ce4ffefbd5260bb8b677153861f7d2e617326be3f5894efa2f2455c
-EBUILD pytables-3.4.2.ebuild 1697 BLAKE2B 15db86b386567c880bcbee47bab5dc7cec42c09923c6d92474a83d7270b2228957c606c368ce82226a62ec01acf5419010dd77431ed7a9cc3f663ec7ab143866 SHA512 f04cec90e3646aa5f2668a742c0480aec57eae2257736310f4994d68b715afc07b8df35f2b17e7499875ca2510be9277288bf931331b0fcb8d9706a74754ae64
 EBUILD pytables-3.4.4.ebuild 1719 BLAKE2B 0109ec6c1466f56c36fdaf867d061743e6bef8ab3ea1e8d80382c00b12bf81b36531db262bcd5effc4c95ae8c774638249c0372b93197216ea0f78d28120550b SHA512 f6fa0c3836a4aae5ea1df4877439a1686b8ba443112698cca2931a17611819f8be6a3e1ab9949a49fd9147b06d7e58c4969bdea6acbe029d7b1f5131f171dfdf
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.3.0.ebuild b/dev-python/pytables/pytables-3.3.0.ebuild
deleted file mode 100644
index 53b3611e43af..000000000000
--- a/dev-python/pytables/pytables-3.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc examples"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0
-	>=dev-libs/c-blosc-1.11.1:0=
-	dev-libs/lzo:2=
-	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.15:0=
-	<sci-libs/hdf5-1.10
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	rm tables/*.c || die
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-i setup.py || die
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		doins -r contrib
-	fi
-}
diff --git a/dev-python/pytables/pytables-3.4.2.ebuild b/dev-python/pytables/pytables-3.4.2.ebuild
deleted file mode 100644
index f262ec077eb0..000000000000
--- a/dev-python/pytables/pytables-3.4.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-MY_PN=tables
-MY_P=${MY_PN}-${PV}
-
-inherit distutils-r1
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="http://www.pytables.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-IUSE="doc examples"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0
-	>=dev-libs/c-blosc-1.11.1:0=
-	dev-libs/lzo:2=
-	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.15:0=
-"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ANNOUNCE.txt RELEASE_NOTES.txt THANKS )
-
-python_prepare_all() {
-	export HDF5_DIR="${EPREFIX}"/usr
-	rm tables/*.c || die
-	sed -e "s:/usr:${EPREFIX}/usr:g" \
-		-i setup.py || die
-	rm -r c-blosc/{blosc,internal-complibs} || die
-	sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${EPYTHON} tables/tests/test_all.py || die
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( doc/html/. )
-		DOCS+=( doc/scripts )
-	fi
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		doins -r contrib
-		docompress -x /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/contrib
-
-	fi
-}
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
deleted file mode 100644
index 41f7a7dc614d..000000000000
--- a/dev-python/pytest-relaxed/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136ab2c9baf1ac281c9f400345fe9cf794c16200279113528cdae7911f559f9c771e78b7ada354985fb1945aac96c1b1cc3807515e8 SHA512 27f45f5b6a6649305f2a1be67277d70b9fc9de4e1ad937ad7e9be3775184167838d9daf518a1967b4069c6133cfa858e768f9a70b6f1a73486f3f32e6c98ce2b
-DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
-DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
-EBUILD pytest-relaxed-1.1.0.ebuild 902 BLAKE2B 05a936e0013d0d7c92f4783b7e983572db376317434ec098a34fe83ea44ad6db5115d1004b81ba8f7f7a6fbcc4ce6dfd58915a4b358dd8e48f326d7e2e2e392c SHA512 bc51bbb84ee12bc4b91637aa8706904f14c8775dc1ee1c16c40ad70b3137c98425721e23291212cc5e59129e307cea9616ec6015537801f0f0a8eb71c29fef04
-EBUILD pytest-relaxed-1.1.4.ebuild 1392 BLAKE2B 01965df17f30884947cb878fe5fab1e5a7a3724d83492d2a12a7b8932fb4bb6d8a6fa6fd5f23fc65df161c877ed6e1a29db9bc6d8db2bc5d356226aec9fbfc30 SHA512 9c465d25f2fa206d3a1dcef1f16d19563954d5a0cd2634bdd8a390a3261748972f550fcc8104db5116130e499211349c3465b1b281f51abf290a3c92dc0d80f8
-MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch b/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch
deleted file mode 100644
index b176e4e86c3e..000000000000
--- a/dev-python/pytest-relaxed/files/pytest-relaxed-1.1.4-no-autoload.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 28c72c7..6feca5b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,6 @@ setup(
-     packages=find_packages(),
-     entry_points={
-         # TODO: do we need to name the LHS 'pytest_relaxed' too? meh
--        "pytest11": ["relaxed = pytest_relaxed.plugin"]
-     },
-     install_requires=[
-         # NOTE: pytest 3.3 broke something, not sure what yet
diff --git a/dev-python/pytest-relaxed/metadata.xml b/dev-python/pytest-relaxed/metadata.xml
deleted file mode 100644
index 2d23528854f3..000000000000
--- a/dev-python/pytest-relaxed/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-relaxed</remote-id>
-		<remote-id type="github">bitprophet/pytest-relaxed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
deleted file mode 100644
index 1fd62c11b70a..000000000000
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for relaxed test discovery and organization"
-HOMEPAGE="https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pytest-3[${PYTHON_USEDEP}]
-	>=dev-python/six-1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4[${PYTHON_USEDEP}]
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-# various misc failures
-RESTRICT="test"
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
deleted file mode 100644
index 1e8201173b13..000000000000
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Because of its <pytest-3.3 constraint, python3_7 can't be added
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for relaxed test discovery and organization"
-HOMEPAGE="https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pytest-3[${PYTHON_USEDEP}]
-	<dev-python/pytest-3.3
-	>=dev-python/six-1[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4[${PYTHON_USEDEP}]
-"
-
-# This package is a broken mess upstream. Tests don't work. Fortunately, it's
-# not actually used by many packages.
-RESTRICT="test"
-
-PATCHES=(
-	# We strip pytest-relaxed's entry point to stop it from autoloading on all
-	# tests. When this package is installed, it has the habit of being
-	# autoloaded everywhere and break every test. If you want to load it, add
-	# "-p pytest_relaxed.plugin" to your pytest invocation.
-	"${FILESDIR}/${PN}-1.1.4-no-autoload.patch"
-)
-
-python_test() {
-	pytest -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 5e55d563ddc1..ee80ba0a3827 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-cinderclient-4.0.1.tar.gz 282913 BLAKE2B 22b20bf80950dd501b7ae89350a7c1d5f44b3489f07063160f7d69b0160b3100536dfeae7b609e709ce2eb963865279faf22ef176ffb60f33b4adc6e2d527fdc SHA512 b74f0d83019ede4598490c8bf4b675bbc75c362ce08099c8590e925d419ee2d55c23ce4d4815d6c31a3aeaf6276f4e72f4801bd629b56ac045025a181030d03c
-DIST python-cinderclient-4.0.2.tar.gz 285946 BLAKE2B 979f49275cd5e21eaaf6d3f60a96066d0584c73d7afff7c5eb8f37fc9cb735dfca13b858378e047ad091dfc086ffd7021eef42cb3e4dbdfc3f13a45612c5aa27 SHA512 79ff79ba6bd2990112b1e9d94d01a0e286c7a33b2b9028fef72bcf35dff0f12f43afd644f4574069c88035e232e96fb4dc965c51481ad8d3063b21ad32460cdb
 DIST python-cinderclient-4.1.0.tar.gz 288464 BLAKE2B 492baefef164e74eca662cbde31b77ae751730420782b9926d265548d064cef08e993279482c566f1c810a62f6cda657e59680d511e5633a7c17be8dbc6fe7c1 SHA512 e895e90dd12802c5991bd05c825b712b30bded38a5dd0dc8d845949cc7e76440959a426cb680447496cccdbb0d5aa31f3b982838a91c7b36e8e31bbaa3fb7b7a
 DIST python-cinderclient-4.2.0.tar.gz 284743 BLAKE2B 2306cbc80cf47086aa0dd545f73adc54cbc6fe162f972f2c5d610f26ecccbd38b0b6f028b8e1a548b63d6dcdd32b26bf3dfdcd8e9e360db0325b024e3bbe7bb0 SHA512 d61a10719fbcffd6562c9b7802ac26e317878f52f5db8a704ef57c8ed9b883eaa3a961c2f29df5746befb82b1a29714fa75082df2deebc305115e103e49eee91
-EBUILD python-cinderclient-4.0.1.ebuild 1115 BLAKE2B 19e434724a43efafcc12ab2128cce90957af6542ddec67bbf89dad921663b79b01c13f6963b8681a58c8f35dd52e97c8e2fa50011cda659899b170705ad76915 SHA512 65fd77668db7ca68188492f9f522c48f27703f0f77c114a32ae5a8e0acd6f6d3b75794f9b6a6208f21e39e58b87c411115729ea51979971efa640a8e81541069
-EBUILD python-cinderclient-4.0.2.ebuild 1117 BLAKE2B 8cf1ad3bc5985c1e600a227c5c6b63e98303f01ad4349743557442d19cbee1c474cfa807123c9aa70afbf7645352ec2c230cc2c7f280ab731fcf0faec194eed2 SHA512 4f7ec3bc3deebaa4a2c64263ef29991f0181bcc917b29967a7e3834abaa24db4009cc1f9899750e05b90dc18aa4f91fd0dd2b3b20e683d45cd3573bfe7a486b9
 EBUILD python-cinderclient-4.1.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
-EBUILD python-cinderclient-4.2.0.ebuild 1119 BLAKE2B 09eff65811760148a77bd871ab289e8d37bffa8d0e975f280463619d25ac9a4ad9f1b9ba804f0b6be4beb2ecb90c5c9362c64439f6431ac460789c6d3bdfcd2d SHA512 4a8c307edac5c09623c4db0f6e32c980a8120ca1221f4a5ae035a1d45bf25482b74a3895c46a4cbbfa61693a804935a0ceb584947dee3c82b5392a2d31cfcec3
+EBUILD python-cinderclient-4.2.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
 MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.0.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.0.1.ebuild
deleted file mode 100644
index ff87ffc354f3..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-4.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.0.2.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.0.2.ebuild
deleted file mode 100644
index 277842cadd8c..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-4.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
index c89d38330451..0dee45615822 100644
--- a/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 7a403ec58700..4a00dc8f78b4 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,9 +1,11 @@
 DIST python-novaclient-11.0.0.tar.gz 302163 BLAKE2B acc249b58e0bbdade3b7db7bdb6cd5be790a36cfb429aa72a22c44b4fae58d24411ea0d7fd2e0e7da3275e708dd34a22e9079ec9b5bbd08583ecd58f02071bd7 SHA512 6a7101dcb27674115817b724dbab877d875637503a69a2342c7a23f6f79f8065e9aec68806c8646feb0a83a704a11141a4af9f49a6596980b69a689b9d7fc74c
 DIST python-novaclient-13.0.0.tar.gz 312459 BLAKE2B c6be6e7f4f7ec554100adf7fa0ffdd07e6f2c6ecb19ecc289966dae39ec1466f972d56be6eba87270b38b382eb05f29fbd238341eeeaf3fee6d0cb8f5d1335b8 SHA512 91994e5f0ea5537d27cb0fbfe1c1412c9e3e423d8c0d0028a1011645722d2b1b30718fa7a502ffe154a3299e603ba9bb4aa51f1187b67c1cebce564203030981
+DIST python-novaclient-13.0.1.tar.gz 312975 BLAKE2B 8f512a6b9e84e352d77f82b81777f1f9d9c8c6b40e86639c9400dede461c7f61d222ea304b8f407cf1775558aa3efe2519e03ee7ee83b17d80d5a7fa0e965284 SHA512 cca8eab5a11a784d5b701a128125e5de25c802081defa61df99449cbd711b0d6913dafeceb28e452fd9a33f901e04b5875b9cd641622af5ac6f06c00c30f7bba
 DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516
 DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b
 EBUILD python-novaclient-11.0.0.ebuild 2361 BLAKE2B 36f5934e3b0aac4351cbeb523b72215c7949670dd7b03d5db971b13b54ab0ac7cc7eea8fa802822cf4f09c537829f5c9ec4621f61110d69a38abb95f5231798c SHA512 96ca79119a1ff1d534b52870acf9064f2899aeab0f84f9e5152369778dec8ef2bb2065b078fbaa8151ea14c1cfaf31f3b006805211818a21c78c0e2c52000ee2
 EBUILD python-novaclient-13.0.0.ebuild 2359 BLAKE2B 309dadfe3778a0e64155ca7120f818eb480f315946c660fb1d9f74c5e6b6aaf07a2adf3d69dadbff2960661eb076e169e19e6dbc7e342710ed32fe78e1813efe SHA512 0b07d9959ed84c5987e713d36aa9e9ea89f00e209fcc632fc4a671ed06561c69c6310106701ff1440d2e48c96c7c547d5637e2f76f922486e83dbfa57bbcbbe5
+EBUILD python-novaclient-13.0.1.ebuild 2361 BLAKE2B 2b04ef23f6fe57f18ef724be3fe0f38766ebf4204c9a07d7a7eea4556c9aeb02fcbc1a858b86c00fb3c76a50e903ae733787a7545d395cda906eebdff66de4d5 SHA512 dea757d772bb814912a7510c3f26d6216c4d294667f328a902c5a091ffc04f752a998004b2b1dff8408b47514a6ed830c3ad67dba4540818ff163b0d852c13ab
 EBUILD python-novaclient-7.1.2.ebuild 2390 BLAKE2B d4a856764ed0d880d043e75cdec5229245aec40e73dcba0b90f396d911a2e357b176b9583898b682b8dbf5ca14b78ca50357dd9409f6cb276d0c8234b1824579 SHA512 ce9a3af7e47badcecafbc4085787c5095993d76a99b07c48dbb00946021f636fd1c589fe4c93182a8f01ac498fa2057c4ab638279ecc24639bbf4fbb239874e7
 EBUILD python-novaclient-9.1.2.ebuild 2567 BLAKE2B 0c9aa58112f0b5ebdafce403fc8ca71a40de279e5d27a7e0e9ed34f6018fc7ba9c541823878bf691369c77a8c4b208bef391ee9eecf81b0fc22d82aa89fd0204 SHA512 1d6f0ba892a300a79f24a7999f6479f3184879b9ed6937d92ae5d319694741df0c121969a5fb498795fc64d6a9cb24a3265e18c42dd95a0ea5b6c09b0200ecd0
 MISC metadata.xml 760 BLAKE2B da041e2d4a5118a32574fd39fb38e5a4b417562e90f345f731b5bb9d1109c760044eb3d18b6c82c440f5a121791f1315213e58ac657be61518aab440e6a359df SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1
diff --git a/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
new file mode 100644
index 000000000000..5c078c718de5
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-13.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.2[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index d8000a09a937..755f7ceab87b 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 EBUILD pyyaml-3.12.ebuild 1068 BLAKE2B 75d565e4f368a85bcdc8f7a0b505c0969edaa8835480d09acd58e3a714c9502b085f419851d5bd15bc773f359a355101179fdedeee4d8468dc4adb0c5d5ca2c0 SHA512 7c839298eeca6ac9ca443cfa7e15e6cb1151789985391eb6b0eb81ec40c0e48dacd5c1ab0c7aef541f96312efb67b48e7cbb201c68278fb38a84dd7c272ce661
 EBUILD pyyaml-3.13.ebuild 1070 BLAKE2B bf3e7dbc8fcfbbf12bb5282ee012c9c1c83197f5573351181965efdc75a022f5b065181b975680240016b6c84f6259528e7010dd6645152b6f9b35bf66ea17fd SHA512 803c12130e4996bb868d71d8fef7819ae1f6f4aa44818bc68d6599c0e7a49b551c368d62370544811535c9bbe2126f3f190e1974148a727dad3a5adb52aaf79c
-EBUILD pyyaml-5.1.ebuild 1155 BLAKE2B 13f052887f359d7fea7d493fa87327637170f5d13d1ba69b80835afe684ec201c27281f4ece65072dc40dfbd9ff36655dd8fcc432d31371b6020ceb7281789cb SHA512 22a4490594842c6a424d4552cfa6ce006a658416c7649de11e2342206f893c8fc29202558bddc7dbde786243fc5ea063632d8dff3527297bc186e67dab0367f9
+EBUILD pyyaml-5.1.ebuild 1153 BLAKE2B 2fc4bec2f14d5982d433b0564d4a735fe0254107403a0006bc5d69ef6836d542193e6636cbe4ecb60165236f9b8a4b9d263db162837d64db24a31a527c80bb77 SHA512 df0e89caac252e76cc703e969a51ae1844654a5adefe698a89571c101eac7503740ddc39b21e887b0b5ce303afa037e6bf10320eba0f49a65950c86a647b988b
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index dfc468fac980..cb8f0ff6f457 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 57a29344feb8..69a66f0e05be 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -1,12 +1,6 @@
 AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a080337c00697493958d9bfd424eef9b9998233336ccea06ecea345cd55ff1321939421bbbb5c7ea566de8ed3d5d8133d62083c80f2bc2a6 SHA512 22332dceb704750d1d6ca7d640251dacea764dbbda4e530977f6788e19c1d1a857471d8cd94d99465e146bc96be9c35b67a9608a31997725b6284e7c10117f8f
-DIST requests-toolbelt-0.5.1.tar.gz 187981 BLAKE2B 1e3cfafd8e0b8625dc92ff40bf88d9cf67d40a679eef8c6825de032d51107d2486aed34611818a3b97c286ea9e452ad3b196a8ba7a4b7f57a9377366991d33a3 SHA512 fff70b7262efae616fe9fe8e25af9856d42ccecdaca71cfde0dd81c5d7c509aec30f7c99f4b886d844c168937197ed8287e873fffe6073e93e48412b5a902997
-DIST requests-toolbelt-0.7.0.tar.gz 194062 BLAKE2B ea7120e58ea23dbe1d17bc2f8c346ec00bd00d62a4c8fdefa1490b9b3ed62a0dcf45ce60b071fcbc7e510d943ec4f10a7031525bd24f5fb02749125cbccc9f0b SHA512 77f11d12643d7cacf0c5dab5c5490359fc6f11c038d56d6ae27939394c5788622edb230d38d2202192eec6a7b1229feeb5669cd6a33c78f6891699d017e8205e
-DIST requests-toolbelt-0.7.1.tar.gz 194670 BLAKE2B 3f8b5950d3a87f519f40e2d21bce13ba2d3ed205b5d7f4fa0872339df391e5477f262b104697b264a75783d686eb44231ff2943bfe56f13695d63869227c48c5 SHA512 2559db13054c4d9b7c459603809a16d8d9a9c1a348369e1bc68e557bae10c41291286112e3b4a71e83b42203d40fa5cbc8441028693eeb986162d212a65f68ac
 DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae9986c761fcabe567826454d3f055db7e3e5c95905f1d178dcb37e2173bf856a9fb168a856c1301026e8c5d0de6cafb4be51 SHA512 71a4ed8961b742cb1b5b0deec7f9052a2a177d2ed6e4f13ebe22b56b7f1b6b1bad2736f1640c8b41398b082eddc1c1205f0c446602d979d5bf370fb0e10ecc88
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.5.1.ebuild 489 BLAKE2B 4cff955e05c70096f61c16b8ef0317fa5fe630a8cd040cef4ca04f3b4a59d171722f1b70960d01ecaa72823462d33a71e9fe8d39abbfb824300e561e8296733f SHA512 ad842f351e7d2ca8b8e0f442aa816e9fde6d8e3b5c198568cb8295ad34d55bd8dd8cedc2134f8e71c5480d100f6153809de37b3e7c8ea85849509c9a3f819d8d
-EBUILD requests-toolbelt-0.7.0.ebuild 489 BLAKE2B a7e893356fb041f13bfb37c72b2e2bc8f79dbd4787a1d7bd95312f6edab39c82c627cc1e5f074b56ed750f6d8ec891258a9c498ea1b4fb7eb45dd51ca7c81c09 SHA512 bbe8529cf6abe455edcf1fb8b4556411aa7a4cdde54f71d89c4906a1c9c4ce385c437c55a35660bf47ef54344351c80ac7db0d4147ca37b12d5d05b4de50cc30
-EBUILD requests-toolbelt-0.7.1.ebuild 759 BLAKE2B 385251bcac0036c48fccc83456ece8aa12e34322aec749488fca694b4e28f25647d0f8112c36aca08d9a74bb6c5055581b5d575909f5c461ea4f4998cb562879 SHA512 b7680df8a24d8f5e994d890c0cf962f274e0e8b2bdda857af673669c0d2af69d860f2cf11658bd0d434ffe54b0703ce9a75b0e1fedf16226a7b066936c81ac5e
 EBUILD requests-toolbelt-0.8.0.ebuild 1042 BLAKE2B 7f94fcd22dea93322e3faa641fb54e0e4856191894912b8387806dacaa12386f338a257aba012c5a084fdd3a5738fd28f732c795346b4f0a5e7409d170ef4f14 SHA512 618f44f24bad2cffe25c3ded828593d9ede70edae37d83f60e38ea5c1ab48ea75610e23d0825e2532c497559d9a02534f2687f80886995f024908b858affa1b7
-EBUILD requests-toolbelt-0.9.1.ebuild 1048 BLAKE2B 7a0b3298b0fdf56da4432a7359f72e5686ed8a9242c29bce5661f224ade3126f5ef54a160a13a314f4d6a35d5b6dd6e1292f27c4068cd2af579318fa3347cbb0 SHA512 0abcae87d4e0086c549510aceb91178efa02de20a3739d663dc48d479c8c96bc64adc0a96aa3f7b06af69bbf31ac7ab84e937b0e7d0ee7c865d6e118e0b3e840
+EBUILD requests-toolbelt-0.9.1.ebuild 1046 BLAKE2B 9312673e283d3156fef105c3adf896904316feab4e17f6dfa13d79273e95af56bb4f05161940b3adf7d4612f2e48fe0fe21197f80053a51bc8efb53cc04706b4 SHA512 528455e866384167a1223d32a3ae0101c979b28cc44c85305cec655f19c19e9fdfbaf23ed485e88f13fb8cda2f449dbaf65fa39f8f539fc0a51d9578163cef8b
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
deleted file mode 100644
index 7791ff85dab4..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="https://toolbelt.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="<=dev-python/requests-3.0.0"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild
deleted file mode 100644
index 811c6c95a605..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.7.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="https://toolbelt.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="<=dev-python/requests-3.0.0"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
deleted file mode 100644
index 53c777d98d8a..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for advanced users of python-requests"
-HOMEPAGE="https://toolbelt.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index d7c16d63b6c0..ed22f1180b01 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index 27cd18c54db8..d31f85639c7f 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
-EBUILD setuptools_scm_git_archive-1.0.ebuild 708 BLAKE2B 33c80b60585488b6141132053aee93403d98ebdb18a5296e8246312ff0abbcbbd0c33b7c85e8abf73f83af7d268de7a0d745c81f45253b4cb25b6c9e29eac0e2 SHA512 5ce0fe4455364c0a86ac0b8ead1ce6756ffd152924c12dda8a4de06b784f0e07719a815926d1185bffecf1275e1a00cbaab1bb4397035519e984a67dbc160dd4
+EBUILD setuptools_scm_git_archive-1.0.ebuild 713 BLAKE2B bcdead99b6194691550578e5a9480d5625836a9ffef43fda82a6c9803a9dfcd95484866fd01e2587ce19a6ca5ab99a32c0d81101e83c6594d93987d433543e1f SHA512 4c924591525ea847c87ab74dd9896071c5b43e374260b4b06650c74ebe853d50d7dbe0529186ebb490028bfbfa4c7de66408737a192acbd95a1c3aea1b4c15b6
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
index c0318e8daece..264b344cc2f0 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index ddebded86794..3f568c3bee5d 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1,11 +1,5 @@
-DIST taskflow-2.14.1.tar.gz 1060937 BLAKE2B cf6092aebd6365ed2677d54528d1a40ca0d08934f6438f692bfdda7d7a07365d63cd60e7f2ae1170c3a9f5866c094fd5b8bae4a157aefbc2dd7a3c5309ba4340 SHA512 224067a92d8e979a6c18d4f5ae7dd5d24ed1ce3c3ca07f39c6f4d63abec6a736aa3588d792778f4283783358c59f7d820df462311510a300775d2346eefaced2
-DIST taskflow-2.9.1.tar.gz 1061514 BLAKE2B abef1651311da6ea1f475510e293e6b1eab1c8508e981b1889a7a810053a4b07522efcf81b21cbbd792704e2bcb59b5844de8fbe044cf357fa0b83aeee9a7687 SHA512 a8211edb2c4507b2f9845ebfbd028701d341266ea8d000bee60a037b726b1d2ad5e6432aca781659d91dac13198451495270eeba821f5905fb20f27c0d758b77
-DIST taskflow-3.1.0.tar.gz 1062425 BLAKE2B 8aa5ed0bcc52db3032d6abee03a48327d9790321fd927488cab13176ac10aab46cb57e29b9df81337fe9a7789816148d9f1f9f5f8790c152099c4fbf87ecb72b SHA512 fe37d8eb2a4c22fccabb2779a7318e5075617bcc692dd36460169b4dd75637cc753bf7abb117322d77be8e74b40c260c64032e37cf8d51ef11ce99fa7cbc72ab
 DIST taskflow-3.4.0.tar.gz 1067856 BLAKE2B 1244fa3124cb09114130ecb1bf9bac1b7471cf6d9f6e297c8445a5a447d7fc81e435ef56783359bd00b35dc3219d35e0f1f26ff1b1593bf99ee83592178794e5 SHA512 16d0494e9062a1a22364ed0c4429d6fecca87b4d0328c3c711c53173e79bc1caeea24f4ea5e5d64c5d6d519fa2b5088eb3a232169e6f0062d964c98bf8b81241
 DIST taskflow-3.5.0.tar.gz 1068208 BLAKE2B 5c11faf60f332aad442c5415219f572a6b14735fdeb30f305a1e033067a847bbb6a827395bd1f02ae20e11b682adf31585848ecac47438b1860fd04b51a7d5b4 SHA512 635123ed975461a84790be2edb09f45e3c372fa03918f6f6257b4a3725f67a83a958f80ca15f1da5eb7d5f6223ba8fb8a6bdc6941b9eb9572c12274fb2d75ac0
-EBUILD taskflow-2.14.1.ebuild 1538 BLAKE2B a3cfb8676b6053872874f22136f387b5d86b3ce1b9b5bac1d9a45354bc8d6d82bab387c4454f90f830680663ceb12d1efcffb8abab66c686cc94ce5f1132d81a SHA512 59e8bf06d700eef96e5dac3651beafcbb39ccbd6e9d0d048960bafe1d8814e7c87aeac856c9300cc455b8a1ab071b08289c046e5e6a170bca7e8deb21cd94cae
-EBUILD taskflow-2.9.1.ebuild 1454 BLAKE2B 38b248cad39baeceb465a2ab097fd4e78c9fbad8075d316fa1da8a92092aee47c4961a9390f05ab1340080504b1e6c304ef27c4284bd652851fd6e6384c18b7a SHA512 215e4cbae09de572864a234f3fc4698395ed18cb7ffa5226432b58e3834c933a7505ce3fe6763ad78fff9105acfca0b09a4e7ee4b773b3b43307b3b253fd7783
-EBUILD taskflow-3.1.0.ebuild 1491 BLAKE2B a6f45efc2caf6735d025e0af2792a3d44bf312524133b345dc2ee55f582464b5cbf14cf83e444ea7b5f56abb50092518f326573ed09b8d9c0de681027760038d SHA512 df33dfe1e10b54cda67649d89c1ae2ecf2c6d4352fa804f2cc5b1f17a451006eac9e07e73959f033229e6bc83e4f298caef373bf7fd5f2efbaabb1216a5a5019
 EBUILD taskflow-3.4.0.ebuild 1493 BLAKE2B aa44e7b3c6d1c5bf087043be62f3b287abbb6327fc7c5c49d48c759cdeabe78a4d4bc60474a9b98572b40482e9b8e175f941111b166ac8f7bd26e09c9eeb7b84 SHA512 35fb8b9798acf5180ff4981ce7f51e30af441b4aae585f80452391b82d403163ce05e25ae5a5b153b53f6656f40eafef407e299fd01bb6d02de4f53674dd07f1
-EBUILD taskflow-3.5.0.ebuild 1495 BLAKE2B 090270448787de492de74dd4b8a722e9edb7f3f9f89923be927a25ae1902df171daf96890a497ca5c07e14fef962df4fc3ae449a35fc7469c4a2f734235adf77 SHA512 f71190fa6e784df200df362edb1be8a7f7fddf1d13b4a0da54bc9742a371c5fd4f755e3eb04b2b8b1e2668e63bf964374f9705887a1a35c2a3f7f6580f649c58
+EBUILD taskflow-3.5.0.ebuild 1493 BLAKE2B aa44e7b3c6d1c5bf087043be62f3b287abbb6327fc7c5c49d48c759cdeabe78a4d4bc60474a9b98572b40482e9b8e175f941111b166ac8f7bd26e09c9eeb7b84 SHA512 35fb8b9798acf5180ff4981ce7f51e30af441b4aae585f80452391b82d403163ce05e25ae5a5b153b53f6656f40eafef407e299fd01bb6d02de4f53674dd07f1
 MISC metadata.xml 676 BLAKE2B 32a696fc754d94e1d1f37e67ec09de6c588f9ee3eb151dcf81f955f7b0632c522796343131a5acbf73e852ef78f89ce7bca6060c6fb83b9611e084e20a5df3e5 SHA512 c274ae9882c74b8bcaeb054b9feade463c1fa7f2f6ac559091a4bed85075198873c4b994cca1f28083b682bbcf66dbb31971da97f9074a1b04a57a6eb0a612ad
diff --git a/dev-python/taskflow/taskflow-2.14.1.ebuild b/dev-python/taskflow/taskflow-2.14.1.ebuild
deleted file mode 100644
index b411b81fcaf9..000000000000
--- a/dev-python/taskflow/taskflow-2.14.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
-HOMEPAGE="https://github.com/openstack/taskflow"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/automaton-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-2.9.1.ebuild b/dev-python/taskflow/taskflow-2.9.1.ebuild
deleted file mode 100644
index 0f45dfe4fc11..000000000000
--- a/dev-python/taskflow/taskflow-2.9.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
-HOMEPAGE="https://github.com/openstack/taskflow"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/automaton-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-3.1.0.ebuild b/dev-python/taskflow/taskflow-3.1.0.ebuild
deleted file mode 100644
index 5d9fde95d424..000000000000
--- a/dev-python/taskflow/taskflow-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
-HOMEPAGE="https://github.com/openstack/taskflow"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/taskflow/taskflow-3.5.0.ebuild b/dev-python/taskflow/taskflow-3.5.0.ebuild
index ab5d9a48bae0..3a6781627266 100644
--- a/dev-python/taskflow/taskflow-3.5.0.ebuild
+++ b/dev-python/taskflow/taskflow-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index af98d8625534..1ab4731e35d9 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -6,5 +6,5 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 EBUILD urllib3-1.22.ebuild 1750 BLAKE2B 053a1a4590e26d363c8a7b76fb2bc69f16a2d20e7532e44b5b6f15f0a1cb3e4594318ee1d3cc3f28014fd0f4f077d0a056448e720a6ca0f596412aa411436081 SHA512 a8cbb45a3aefbe76aa0119d2a67aed90ed95769c68e296da7aed7a2d85b53c42c4235c8439608351da6eeb03a2f97c25bd25ce1be78efa1aaf91c4fc4954ba38
 EBUILD urllib3-1.23.ebuild 1906 BLAKE2B d3e2981f3133db3ac25739a5740c278ccd238d6a926265be96da15b200341f50bf138cf685b0d28735bbdc9328d45b237a8a45dde63f920b2075f05db421b6e9 SHA512 a38a14962ac9ffd7e86397545974721aff6c745da4d25ef07a99d0c4effb670b9d95f74b3efbfb8fd7624cc118621d99c26de2d9fec691f8f2d4b6d92221df62
 EBUILD urllib3-1.24.1.ebuild 1819 BLAKE2B b1d16553a388611486ade62774bffbf471eeb3336e4a4c7d42b2e1721239081b2cca61c48eb91291a387d24619763b13bc8ed08faa8461b0e53a4e61309d51ea SHA512 8b7aec6288e77c410e4ce47c983f1033a120610478d4ea95e0f813c314ab8f917211ff77abe419bd9bff21b8c884b86963a17a77aeec407462c66c526b9c9158
-EBUILD urllib3-1.24.2.ebuild 1810 BLAKE2B d472e9b15f0c088ace378b46a469c477aa1e39ef1447afbcdb63103d705de18007499bce06a56d31a3b8963a909e00d615e45953cb906932a63d3c6f558fa46f SHA512 e883a425a81369d5cb3db9636d0474eea463ed080540e917ac48d55e2a16cd367a78e9b99b05286a254ba9678e64780383d8b71c66fb834026b0eca401464531
+EBUILD urllib3-1.24.2.ebuild 1809 BLAKE2B 763728e9d1428f1bd16436c71d6ce3402d7d1968142296f49959f48679cf1d9f26469824fab17928bf4c908ae507fb1ae1ad22f5615428fb46818ccd7ae61631 SHA512 846efc6c4bd51c063eedf70b3d85a06b81639c45a81a9fed3b3b09b9147a078b1643a3bc9a5cac971e7c6ecdbf0c7dbc7cd45d3ae0e3b8099d06dc7c1ae2ea51
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index aa9836ae9095..c788f5082aea 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 #RESTRICT="test"
 
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 3386a733108c..242cb464951d 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.3.0.tar.gz 85971 BLAKE2B af49d4e523edddaeaf288f8602f6f8c6a92e9fec9ada88878f6a0be2ed9c859842d312f9888c6e806ef762f1ddbb5260a2da37dc992551d496c090cdd4338486 SHA512 0c078bf2471bee44acac0c291c3159f4315cdbdb3eaa504f97c1b345fdba5efff6a1514ee2ab558ff3c3e4a18924f982de7c7ddf323080ee99f573d6776d91cc
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 EBUILD zope-component-4.3.0-r1.ebuild 976 BLAKE2B 7d83ae12c48638e9e296ee6873abd7f26b3ca2f6c86c11692fbf737d3a501e8329d9234a48f88d64f3a8814d9f0dbffd4b78c9644d63117d643d7d64eaaaff6c SHA512 2419e33a6ead03dcb25b5272e00b3e3a5a5e556d8cf373f1a271339d2e74bca4734ee64ddb0f240c73934cf2abe189a4206f73dfc7d82cf63d92b7d31b701a4a
-EBUILD zope-component-4.4.1.ebuild 997 BLAKE2B a4ae855199a608037c411cc006eb9b691f57485bffd233a76133c07267936486ea4352eced94d4aabb5f1aa3d6984d492cdf3d890dda9ee70ed832ed52155ffa SHA512 c990e18432a2fb95f659b41fe81aa45a54c72299362af7be426a18c146f25d39ae0d2d2b85a2754b614ae14c03f8d7ffe3ac85a9476fceabba5568083ab6aa6e
+EBUILD zope-component-4.4.1.ebuild 995 BLAKE2B e4f16d53f231e61ab0674d72c7168a63f7127291ac6a59cb5e309c1476aa3b456078e4ae9a11d61b5313c08efed18c56e95442eef8d8d33d838c4e7386e85065 SHA512 0010b02a28277f1dc9a8838b4ed4b2c7b244c854a5327f2b82c0e3e7659ca5acbe6e20874f7e18cfb9890aa3e45ec3f695ffe3704edaa0632e466e9971a83973
 MISC metadata.xml 386 BLAKE2B 0a14d662d38198dc4d4075246edbd47d6645e8210cc5fcf92f2cb00f6e6f7d24a202bd0b57125f3b2057cd62c3745a0ba0cac27a437b2f479204cc74aed6c527 SHA512 adb346917ce5dd31ef902cb6e247143f753bb42e22f41300d89b192291f5bc9ab1b6c2aa43c63e5a21b7ceff4a4e6187bed6d8b398121411e5e9f04df2e736ad
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index 8f436cb0f0a8..9701ce3ed6f0 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
commit	fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree	10baa743a5340b42ad538dd19d48669ccac209b1 /dev-python
parent	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)