gentoo resync : 20.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-20 15:11:50 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-20 15:11:50 +0000
commit: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch)
tree: b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /dev-python
parent: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff)
101 files changed, 826 insertions, 203 deletions
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index f764c52dc983..2bc25d072a62 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 19050028921b..13774bf17210 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index f056341ba246..10f26a7170e5 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index c4557a94c05a..f102fc24a0b7 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,8 +1,8 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b84b13d0bb66c0e1772dc5de8321ee06f0d0dfeb6c9364a724286d0ee50a3ab4c2ea789894057fca39bb11dc46 SHA512 a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0
-EBUILD Babel-2.5.0.ebuild 1471 BLAKE2B c9c9e00923f2b27400a7898c0bb69025840bf058569f52220699cd468980f17132faebca0b5710f9fd797fd4857d49d8d5768ef05d4768908b7dbaa41245e36a SHA512 eb9807bb50fe367a92cff89826189f29135c08006e77aff84d0228ecf6e772011050148aa4e655636206aaca7ba7281818ee448a7d457084f38c8ac7bfd7c511
-EBUILD Babel-2.5.3-r1.ebuild 1534 BLAKE2B 4eccc6bd8298a8bac485f6d4fed00431b10c22de80fafcf17ec1e06576a90cd7743052195cb8a50696550a8ddea0dbf0c05eae69a31c407db98d0b72359c7d1b SHA512 77d992c031e74c612d7134fa314fae693d3916b2fff21083e97457b598cc1cff639a41899359ed7e1d364d0b8d9c74ffb77e75066cb6ab017f9818bfa776f521
-EBUILD Babel-2.5.3.ebuild 1472 BLAKE2B 130348dc2960f5ce61e4708069826ef73fb18c0e24117e514a0329843448037fd0534cf649c18af2fe6b04452b1b777c5b64bff37cc23c071d4a7b56827674a2 SHA512 6a23c39ef56ec915b73128eafefb895fa19a1743159a5578d24ad77cd291328127324a95b5687483f9a2cb51aab982bc117d9b4fe6940f170bf4383af15b0f33
+EBUILD Babel-2.5.0.ebuild 1467 BLAKE2B be45a8cbb9f853efe59876c739f1f24cdb0ca934a050830348df09a41adeab2f4c1face797c18720aa89bdd0e66b586eadeee534d0fe3be639ecc1e4eaaf9ce8 SHA512 61167611440026fd5976d441a541f0aad1b27f9ac4111c666bd9dbe0ebac217d57759cd7cc74b118117dc431e892b5ec7b0cb8e4d02a410f398392a18db34414
+EBUILD Babel-2.5.3-r1.ebuild 1530 BLAKE2B 33e8d728d0617495f5cef705e2560a4aefeeb43dfe2872196185ecbeaf09b2dc562aea9ec566cc598309a364eaf8547beae86f29d2768a1487f7ee7d7b60217a SHA512 3c7c5f59033e062ba0becb0b040ab823323031fe5f64b02a2bc26808a8065d4ca927881209ac14d0651ba965180cc4346936739b3a079b3e0f5588b39854a3fd
+EBUILD Babel-2.5.3.ebuild 1468 BLAKE2B 507102d8d7e1072805d501d66f93fe504e2ba9025c033f7ed3c7ca689d3454568abd52a9dfe27c61b3ddfd9d9f036dd4c52077b12fa79e6269e9fe80dd55354a SHA512 c6f4229f4a593884a3c63bacb0cde3675acd6ae0b1843042437be34daa2349993c5cb878d4574b9ddc3373b5caa1a961d9183b6a589013204d34cc12a4a012fb
 EBUILD Babel-2.6.0.ebuild 1479 BLAKE2B e4697f6443bac97f602d520ea80b469e9ab9901f4bd8af0e827236ba6789f328285131bfd7806db838e736341940f12478f5c6d9bdad734477d2ffb00354117f SHA512 7d0fc140635ab543b7701783cdf90cbb27c832b97037ccbeaf386f0f6c92162988bc5f11f892a228638179db1e49183ab9cd1121dd4d39b868d0f8d32501aa76
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9599da9447ec..03c5b370ffd1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 4c67b5796c44..e3b570690bd1 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,5 @@
 DIST absl-py-0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
+DIST absl-py-0.7.0.tar.gz 213291 BLAKE2B 9a8575f1c6d0c98d750cf0fc5bc528778b0498beb67291368ddf210131ea32073228fe5b354be92bbfac2e36ede1638006d65b5517917b6453e2e599110699d3 SHA512 032201603aa0757e70cd35dc2eb1c4f7ef668060f42a5e22223e7102b2abf8d5e9e08c883deaa7bce822712245b040aaf99abf94a8cd5bd9688937fbad982586
 EBUILD absl-py-0.2.2-r1.ebuild 567 BLAKE2B 12a24717907a4d51575c37602a211f7570bb52fcadc68b5f4f2f159794a0a90b66cb9c9b5263065d0c8becb50475bd76e91d83058bd3c5e2c4c96955acb534e9 SHA512 1b47bd7f878ee9afb80464f5862a55aa0983f0934e46055e738e6fe56e5553f1e604cace226c7d4a7d5fa0f8c5d6421cfea68b033ca919ab7a51463c73b374c6
+EBUILD absl-py-0.7.0.ebuild 564 BLAKE2B a5619872992c9b8d0e45c9bda1667c5510d0139cf381e97c659cca5fdc930d9638a602d11c5c1baa03e9b277d4c922221ae2c7956bdbaacff4ffdeeb0905d2c7 SHA512 a5ce033e8279fc90215ac430d2e186938a653f72e37bb8759a7a6d5ae2b54e9ab995ffc9623661af558b4da908836e46b4724b984a3a7c1136c75a9c96f28237
 MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
diff --git a/dev-python/absl-py/absl-py-0.7.0.ebuild b/dev-python/absl-py/absl-py-0.7.0.ebuild
new file mode 100644
index 000000000000..27a30fd06963
--- /dev/null
+++ b/dev-python/absl-py/absl-py-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Abseil Python Common Libraries"
+HOMEPAGE="https://github.com/abseil/abseil-py"
+SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d7787b4415bd..148f5d155747 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -5,5 +5,5 @@ DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014
 DIST astroid-2.1.0.tar.gz 276196 BLAKE2B f09ef4629bb29d0492f1f6ddafd1c0f4d4ef09df5612f3a9a811b09dec7a8c6294a44458e79223232f467a70434022cc23b4745515199beaf4727bd0591bccb3 SHA512 ca200d51613782a85c3f164e9ef55bac1de288c45e7662645ef080cc84a88e34499b2a924b130e9215418842c25352bb948c02d569ac45c251ac37bc57f0dcd8
 EBUILD astroid-1.4.8.ebuild 1093 BLAKE2B 89692333f08a4c9b3b46086a20ef4e6cc186cfef6e9530b1ccd0eb6515fa74117fce8fbd1c55710323957a3f2eec57310b752e791d59a06a06926b8909d46140 SHA512 8e076be66daad2fae26351d89f3c61c6d41523ad7240c78a0e3c184fc1db634c708ca7348137d0eff11bfa20959084d7a97b0a9791caaf164c877984ebb90473
 EBUILD astroid-1.6.5.ebuild 2018 BLAKE2B 3a1bf455d17fc76abbce1b6739d4c81bc1a06fdc1d36e3b06187175cdf3825442221089a48f81b434a9daff92b4d727e3e885555ce1eb2e2dcc92263ce573da1 SHA512 61cd00a454cf0c0c092a0cac9db03bdb87eae1da854991ee4524ec749b143e05c432c83312aff0e1e9be4ef6c678a3a60b4e81769dbb267783de3af7db96d964
-EBUILD astroid-2.1.0.ebuild 1353 BLAKE2B 2c951fcf5242716f084864882e8ef2786507f5987b0203c183d10c301733b34af0c3761e18e3b45a29ec7bed444d638f0ffc615f1f4b2cc4cdcb3b03900d3f97 SHA512 7fe46d0233bee3e4d50e260e370f9664d7bf52d2740f637333067d854444c9c7792297fc927994c2cb85ca8340c218967dd0ce4f0112c8b428b666a53bb04ef7
+EBUILD astroid-2.1.0.ebuild 1358 BLAKE2B b2b8028692a723be3fb5a640f121439654d9b6599f4a615c8a2cfd3e57dd747d43a3df323d49a7dca9863dd8dde6b055b9df6f5d783c147e34a6300a3ccf33b2 SHA512 9b9d150aca933b3e110631b4194df2293af705a0522fef5e2f80ea972b07f761eca69790c1da0f58579d4285d30bf16eed988b41ff32bda2bc104379de20a3e7
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-2.1.0.ebuild b/dev-python/astroid/astroid-2.1.0.ebuild
index 37e1ff128e5d..5b0bb04f7bb9 100644
--- a/dev-python/astroid/astroid-2.1.0.ebuild
+++ b/dev-python/astroid/astroid-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Version specified in __pkginfo__.py.
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 2a4db1a48aa3..412df7d3a69c 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -6,5 +6,5 @@ DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
 EBUILD attrs-18.1.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
-EBUILD attrs-18.2.0.ebuild 936 BLAKE2B 4854a3d73cad3f54892cf5e75c90fecbba7ad30b234c1eeaf8f3de70b699fa1560b71e09d0e862214a207b4151fb6d8ab69e90c87f9c88e6a955abce5eec7ff4 SHA512 23ce297834a6de9eccc2e1786cd75d1e2c763be076e67001d2f6e4a0f396be8a226bf00a4bb1897ca14e8126b80f619e6b75ce696c9cd6d4c8075752892c8614
+EBUILD attrs-18.2.0.ebuild 935 BLAKE2B 43325202963df00b4ee224dc554e097260d536f41ec4ea9c36dbeb513c63da510956137259dabb534884bb88c52e9bfee7b9fb70c6890ef1df94c45119febc21 SHA512 cc9e9c6caf2a5523d1a932412c1586129f77a63355866cc3b30c615dd23978cb6fadb2d23186b733794872aadc71297374cc2d86c34e831ec792294091a468de
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index cfbcb7cb13fa..501e922e7186 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 0e86e397012a..652335517b7a 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,3 +1,3 @@
 DIST booleanOperations-0.8.0.tar.gz 19914 BLAKE2B 121eb4c8587cd56717c757589cadd08334c7a3d90d878c17d24e36b232a1cbf0386a4c1090638818f0e264296796d89a8231204656d2a7432802b385e8200c80 SHA512 76eaeb6a5039f4f5ff3a066545a70c35a512b7ec20e54873cde90a14a18f6a9fc33a2ac356325f7390f206ad2f34412e178212e30065ede41d4b3fa8397eecea
-EBUILD booleanOperations-0.8.0.ebuild 694 BLAKE2B 419289377d4c19650390f8a20594c5e0b56cfced88bac86e8f1e15ce2ac87b0257c707cb691dff9a2bf88a5071c9fc3892c017cb5b00db6a821eca630ee4bab7 SHA512 b308af6e4fba358d384b67c074db8e140bdafbdc09c9977f191cb29fbe950555f9c4a4341e61865cbb9d15eab659867357e96ebb050ab824ee7dc4be1fc2ab5c
+EBUILD booleanOperations-0.8.0.ebuild 693 BLAKE2B d49a232eb7227cbb5b7f27e8e8231e8cb73da453b584c51c23771d040ce7a4f93dd517ca36762ca0b6fc1a4a30009522a793230e387bc806ac20027ade995972 SHA512 4bc6ecc8e97657072ec98f4f7da008814e6d3de544a0107ac26058caa4c4023ffb976c241763e8004439417cd51686f238f4104697edbba3bc1da77c0ab98fbd
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
index 3a04ff471681..41424b74bc6c 100644
--- a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index ad4c3f6be78f..a2d27105ecab 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 EBUILD bsddb3-6.1.1.ebuild 1947 BLAKE2B bda23117bcc3cc0ab639c090a5a3f28634796cfb33a4f89a08cc51bb032af030b83af443e241fbf43eb24ddd97d950cc60f9c36bdb612b743cf0b23e315c96c9 SHA512 357fb9d30626dc5bad2a869b506cb1cf6246b417c06ccbcb8e585294312454c05394d8b7e76c103e4298562ffbc627f1e192176e6cc4da3cd2df40ba5a487022
-EBUILD bsddb3-6.2.4.ebuild 1928 BLAKE2B aa6301b285d515b34623c40cce0152ad455671dc3e48c50e1e8926a168dde68bb74e0002b3b27dc7f8e3d08d5305511e6d15d62a54a2bdec453d9b3921d11967 SHA512 37197c1c116fb0fdfe25bd66269f630ff77300f527d0fdb58b4dfed3bfca0f653b50571540b208954243447b36ede3c34e767477343521ca3d02546a26eb011a
+EBUILD bsddb3-6.2.4.ebuild 1932 BLAKE2B 86bdc24163c1dac6459ad3d7436eea3dddb71837cddd10ac69f9219fbe2fdcf712bab2bec8db0e54157fe13a050fed52bca4006fbef2b837ffcf0985240a20e1 SHA512 6c0ab4ca87b66e04e117d449139cd165914aa40169cad3b0a3a1c82fb9e5fec06b3eca1e486d6b32f1c28b4373da872be1766e094dd7e97af6edfc556011728d
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 6394b1711490..80f1b645f981 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index b0a65dce2e06..641e2b89dabd 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,9 +1,11 @@
 DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c67212b546d42ca56c3360496d01c59984f72d5ce61b1160aa6117b869e567b17df8458de2c88a42dc5e653f6129 SHA512 8ccd8988bb6b4beb760abe5d8cac7cbf65a7dcfad5a535343e5961912751f426fdf6e602a983430e6aa9f56f2f623855b0cfb5ed8e5294a95d122866a4533eda
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
+DIST cffi-1.12.1.tar.gz 453584 BLAKE2B fb0fee63f5cc4dacd1055036ed6e7882452e848dfece99adadad7ebb1f0cc4171d1be5370fda5552da45127e374382b29cdc8e1f5122081d2551604630774cac SHA512 1863ad26d730d629e1397ba155bebd3f9edc881d661fda5301a5acb080c8e006925317c1b092f054c46834d693c437d6e91a687f379c9ab029223a9a159eaf48
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1476 BLAKE2B 25125ac60f6f4c5d9ff2ef82ba26e125153898a82f4e3320dd0593fc40c7ac8baac95961cdd8fdf1d905608a94f4d90ea72eaae54cafe27effa3f18234937223 SHA512 2b7462558ee2126c40966b17de05010b66b9b2535fa6e31fdc3f1f55527944529d79c6b7404dddc7cafdbffe3058f43493aee5f0651eda693768989ce27c947f
 EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B 8908398c5a76403e7b7157852374d29f287310b11d5afe6164d540d034b50374f497ff3a86118079ca8987117862789aa9822a517c23d77763ceb6b8cc74de6c SHA512 af4121b4931e23497f2593a1265543f61bff092f56e3296121c3b1d4740f86748e8bf3736d4d9aa371b82eeb775aa377ceb8c9bdd80f5afd00cee92bea42b429
 EBUILD cffi-1.11.5.ebuild 1579 BLAKE2B 9763e00bfda6509a14cac4b2f6576e99a432f4995fa6568e40dc0bce3d5ec89f44e926d748426a3fc03803ceec76de06cf9da31e4a7ac923c4a36360aa4ddc5e SHA512 12be405a1ade74113581a92f031f42feac962752ca5969d7bc3e6dfa41662a4608f08bf18edadc8423c99ff309b4bf656481639b2ae02e7ade2d11a0cc9439d1
+EBUILD cffi-1.12.1.ebuild 1579 BLAKE2B f52a516db9e8eee747177c30a818ca1393aa85c3331b9b785ea3e7a9952483f8afdcf9d244cf59b1a5c90f187f6a4cf6f66ed6454b87a96e7cae3c9923a4c40a SHA512 546f7cb05e783dcaffd517f2cb4275b57b0dd82a45f3fbee384073248a81b72d518057ceba8dd99e8d17a5bba6f38f5cb7a9d6e5dd36abb9bc0e4e4569851f15
 EBUILD cffi-1.9.1.ebuild 1466 BLAKE2B 439b6504bdb7b2b6b84dd5580ec4a155361d453ee5de5133102826ff6ac9b42a169c55e3952677f438b3b3087b2cccf57cee785d357c9f7d706db8d9481994ad SHA512 40d33d6e223d157a7e20f9ea96133fbf1d6d49060d9cb8bdb80188075918e864c64cf34062fca7a8ea909b0a6a65f39b8b1a6b6f1aea0f741d7ca779fd466aa5
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.12.1.ebuild b/dev-python/cffi/cffi-1.12.1.ebuild
new file mode 100644
index 000000000000..c24d74972d80
--- /dev/null
+++ b/dev-python/cffi/cffi-1.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="
+	virtual/libffi:=
+	dev-python/pycparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	einfo "$PYTHONPATH"
+	$PYTHON -c "import _cffi_backend as backend" || die
+	PYTHONPATH="${PYTHONPATH}" \
+	py.test -x -v \
+		--ignore testing/test_zintegration.py \
+		--ignore testing/embedding \
+		c/ testing/ \
+		|| die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 42582f3459a2..5f48b0d1681b 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -2,8 +2,10 @@ DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034
 DIST cryptography_vectors-2.3.1.tar.gz 35308320 BLAKE2B 47ec40722ed571f980030a4a8dcd35230a4c2b2c63320537a9b965ae39f4d85eb5528ac3ae017e40c099a1cb083feeaea201a8e2cb2fb5b30ce781f716bbfcb4 SHA512 d607571c6471a1a7aa391c0ae441937b88caec0497daaa539ddc71ba76da7c534f0cf6460fce1124035f9fe10e55c621d799586dedb7f3b5f3589ca6be5cb555
 DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf165961d4706feaa5c8482235f5afb69f4257bfb4f8a9b8423213661de0da2d56ebf43cc7ba138a4bbf9462f367ebd5adf2620f7 SHA512 7c51b0c29c182c4da3265824a1b6e44c943bd41dfa89199cded963d0182a8ade678a560ec9ea13f6e8918119fcacf1c90d804cc90368e51cc5d430228448231c
 DIST cryptography_vectors-2.4.2.tar.gz 35087269 BLAKE2B 2a8df1e98b6bba127bb8634ed27b43d4d99c77115d0206b4730feeaf6179d31e0b54eb38ad809e828c2ac6db2ecaa5cbc47f6ab2f99a888eb7e738380cc3b8ee SHA512 cddd46916b6e5c9101589e6aaeaae0da61eabce9df21a196e09ed0c12bfa7da6e3afcddbb75c657f3370b2a3bc67ca862b22d6c7750301a867b6b03cb9bc83a3
+DIST cryptography_vectors-2.5.tar.gz 35094063 BLAKE2B 93b97e5483892a43e69c3bc8d408e0e831246e530b2665fe372f1caa6284a2701c119a85113a85f86128f71e8be0148328f623c6a48f7d4cafc774ea3eb42da5 SHA512 cdd066c597731eb782a3288ddd83ab97b13097360399e8368c7c7c8ba16ff3e6269405885c2ad81aeb0f79d8ff84395aa00639b3453576ac0b57d37d8d36dbf7
 EBUILD cryptography-vectors-2.2.2.ebuild 688 BLAKE2B f541d6ae0657e44a47fb274943ee32ff63e56b26eb45fbf37fd725e5166fac8e895f0a07e7519262204f48bbf2f62d2ed282d2269cd9dc26368dc794080d37e5 SHA512 a4fdb4a05c6976fd990715eba29b3bd799645ecd72e73b546ebe57ecf2488e2c62daff9c7ee45774a415e6ce63382b42c4d94973543a993cf188eba1973c0fcd
 EBUILD cryptography-vectors-2.3.1.ebuild 710 BLAKE2B be4192446ba9732cadcf590364efd79e4323cfad01d9293367eeb819cd2fa6f7bb2fa77feca7065d3498891b36d2c53db106e99429f0ab09cfba77d29c80f49a SHA512 e38cfcd1ab2fdf6717627753d6ca9c1761b86e48d7cc9977f06d31c14175885406db6fa5d9cc082bd94eb0b5a5d97d2a08dfb5b83b852c65fa210e50cebb1035
 EBUILD cryptography-vectors-2.3.ebuild 711 BLAKE2B 3882a384c11fd2cf36f4fa4b69ff7bcecbc3ea91451e5f4ec9f6f2b7d0af99829ec2e566301dbd4ac6f9aefd883cd473e35fa9f1bbfcdbe91e045a32265f8b45 SHA512 f1a5b96e1664c4011237e8466a5ba03e7adda8839973a6314ea6274bcccc86ff0da42f58c11eccacd1a49510f9ca68ceef04526ba0abe27b9252ebe29e9a18c0
 EBUILD cryptography-vectors-2.4.2.ebuild 708 BLAKE2B c96063e74394c31038cfc1db33551c55056811f4f5f36a35d5457a6ebb2ba0d292eab68e3a79e2b145ebb1bfb516ec41f220eb3b51133956752d975263699b5a SHA512 78f575fd4718445cf054852d791458746b67cb4f57bed38a5a1cc245199cdeafd301947c115fe93fa5eecdd3c400d4763952fe0287def6e6d609933cf236f5af
+EBUILD cryptography-vectors-2.5.ebuild 708 BLAKE2B 8fae43c5a6647674ab5b34e2d892e252908ec1b4c4008ac1e109beccd980e1fc94c72c78b41f891c765dca993110acb02aa0455662e0e59d1ee8528420fffd4b SHA512 d1e4d41fec8d5483f5a1af9be93805408e3d6464071a5f212285fc84b0f3bdd17afffb8bbc91b3a00c5a3be07f1f43e17ea08c2d02f8b095ed416921cc734372
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
new file mode 100644
index 000000000000..89d99dcbf889
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_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 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 93b71414d941..cdb367c52642 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -5,8 +5,10 @@ DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0e
 DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
 DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
+DIST cryptography-2.5.tar.gz 487694 BLAKE2B 9502e7b7987ee0101ad8e5fcd09208034222a7f20b6b3bc3126c8b59081c9d8ecf872985d5fca191fc132dd6759afd4d11c0e0d39268627f35990c005a2095d3 SHA512 5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f
 EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
 EBUILD cryptography-2.3.1.ebuild 2204 BLAKE2B 4cf0c0fb964cf00b57b078c568780e2fd41460c22b878158e9195ffb113f72783e9fa5a88c06c0f2b7f6f185990acc004ba331abaff481bac375cd90a10bfa91 SHA512 9b53819c9827a046b710bd520c45b922913633587db29436bf40eedc5a7c9408dc3ab8f39de34de632503d6955eaa0a2673de67f63ae6fb6a9efa42b211a0b59
 EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
 EBUILD cryptography-2.4.2.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
-MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
+EBUILD cryptography-2.5.ebuild 2174 BLAKE2B 166efea0f2d4447a73b0f9528eb1dc2e238c2cbc7cf9f19b180f05e02d218397cef8dc9c0c19499fa231c3921fe360089b7963389b94798d39652baee2c60127 SHA512 d5d17d90bac76c028e30fe550d5ac7782efd89b23bed560eb86cafc2715f85ad74bc89250133af27d785189bd67f3ff86973b605566f9ee942a9016b80f1cde2
+MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.5.ebuild b/dev-python/cryptography/cryptography-2.5.ebuild
new file mode 100644
index 000000000000..c6cccef62a59
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+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"
+IUSE="libressl idna test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+PATCHES=(
+)
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index 2dfa57bc0fb6..ff02c2b32ae2 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -5,6 +5,9 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <use>
+    <flag name="idna">enable support for the old, deprecated IDNA specification (RFC 3490)</flag>
+  </use>
   <upstream>
     <remote-id type="pypi">cryptography</remote-id>
     <remote-id type="github">pyca/cryptography</remote-id>
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 8a9f6a31bfd3..3c1371b5f39b 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,3 +1,3 @@
 DIST defcon-0.5.3.tar.gz 439149 BLAKE2B 5407eeb8c9bb8e63056d0d42e653eb3bad793b17139fc31f153b12f7ae604aa6615442556f5360f84cc29dfd9674b8117a9022a1e4bdc62324c31378b4c075f1 SHA512 5975c2c0054a1c5d067414b5fe02dc4546fffd12d316c6773ce48425276d7ca7b4e132b772fab2ebc4e683170d02592e1917a67f0dbad64a4c2f2a6a3bfae9ce
-EBUILD defcon-0.5.3.ebuild 576 BLAKE2B 89f6beffdc27454d2e09a110e0fdef48ba3c3443d622db27032ac56a8b316a88e6c03ba5942dc7b430e2e9cae793624750da7cb02a4116265d01c6dfcc436580 SHA512 15c083854d7e5cfcb7d2c3869cab40ca0f152fdb4078fe505c4bb01d599018653afdb2a9ef9ab68d217984a8d2666271cb2eec7d8d0aa8860c112c9ada7397a7
+EBUILD defcon-0.5.3.ebuild 575 BLAKE2B b51d8f3d6b8866a5e2958629278dc5be1b8e0d0ee812ea6fb1bbfc80c2de737dfd19883f3b8a89ab60d8e6f32b171d0cfc4cdb15b3dfda9f8c12ca54d128071c SHA512 053c0968a56fac3eb15994b3359b45ab0da48002d5d77faf89e9c1d6c0f65c7d46c047245b9101a890a93a6ff24582ec219c224adac9e9eeee85d76a7e95a454
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.5.3.ebuild b/dev-python/defcon/defcon-0.5.3.ebuild
index 08be7e8bd1fb..8f8ee06aa949 100644
--- a/dev-python/defcon/defcon-0.5.3.ebuild
+++ b/dev-python/defcon/defcon-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/dexml/Manifest b/dev-python/dexml/Manifest
index 7a6c490f0465..c1ba1f8b6366 100644
--- a/dev-python/dexml/Manifest
+++ b/dev-python/dexml/Manifest
@@ -1,3 +1,3 @@
 DIST dexml-0.5.1.tar.gz 24359 BLAKE2B 98f315a331fc1d2b69250a088bc491d6e425106dea0025a26c044951b164f61880cd772a88eaee688ccb550050981c5fe489dd9e8d74bda2c351e183b15bb5e9 SHA512 b8ac2b9f875ac7cf699eb9ee17adb8678ed8d4a796130bbb60f05431207adb68f490b7a7a41600acbc16a3cc08d55f22d91a13e53fe3d835a322709ee3446c9f
-EBUILD dexml-0.5.1.ebuild 574 BLAKE2B 1d9d7258b45880c94e074d77bbaad8bedd6c42a4cc8caae9dc15788424fb97ca08b1b8518fe0ab907dc89f8f122ed27c66232cfb9049024aee9077dea702b805 SHA512 bfa0788cd8e3c06e066c57a8e33f629abaf3548ddf6a4721c8622526f7a878e39d1d1335ddc7554525703850f9dd5503496a31083914b05a19e0e5cee8cb4020
+EBUILD dexml-0.5.1.ebuild 570 BLAKE2B e77e8300eaec35df3b91aa69f14acf10c14c741a7bee2a1919fddf7d3980278c879e4f07c36aded5d07a26e78b30ac95b0b4f4b0d5c4577c3996280b9f4d5fd1 SHA512 2dd8af9f3d00ba6782cb5608ba4d4506274b50ac243806b8b2f400619c6822fa6015a03cf84742e7d66ea0013304ac1d222229022eff30b12d0d6f9af787f952
 MISC metadata.xml 482 BLAKE2B 723601ff5198bd9c34e3e4500e49ea082618c341e217d1fe845123d38b80992620d0e3c1a4c113bd25a2105f7dd12b865f0a9f1201886a954ea43c66b743755d SHA512 ab731eeb859d2eda21fc492a4c63c39001e49011e6d2b9fa661aa2b1b3a03874d0219b81e614ef371a42b6695847376c6880b349bb40862d3e23f6646be0096a
diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild
index 44f4d7b70904..56623b8634db 100644
--- a/dev-python/dexml/dexml-0.5.1.ebuild
+++ b/dev-python/dexml/dexml-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 9cd6e42c549d..1c73d5de3876 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 787 BLAKE2B be754d7b76ee6011bf5401066ae9fab36778cb98526f2e3f754e1366e11794c134e93055c4af6dd50c4013600e9927bb517cd7b683cd0e4fc2a413f9451f8e9e SHA512 566eee5cd47e331c021ccfb1f36c0ec035bb71803a67df271c8e91ff60359f100686f403e220d25c980e9084a2f27b9b70651a4c29b8bca58409edf29830dffe
+EBUILD docopt-0.6.2-r2.ebuild 792 BLAKE2B 89b71592d986f9926cba647e52a496376bbcd16b4f4c6b65e6a275bce498559494933328b646f4d7bf2c717a400132f23ec1052b26a828f798c34e1355263330 SHA512 bda4d00d135d05aebac2d7a102cec471811525e4337c9cf2e6c2d9342d644cb0608854fec0eef0c7ac88f6b3c597ca0fe26bee7246aaa198bb5ae2300eb47c27
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 151938bc847d..2e05eba8082f 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 2297754c2ced..35ab323ad76a 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -10,6 +10,6 @@ EBUILD fonttools-3.20.1.ebuild 801 BLAKE2B 111c4345dc971f388aacfafb8fe10e57ac2cc
 EBUILD fonttools-3.21.1.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.0.ebuild 813 BLAKE2B 7d50f4981fec9c2b725ae11989cb808f7b8ec2b0d5f93a67181cf7196f0c90e08582088e6e8a5ddd77fd1ee396a09e368cadbde5f6d6d47a871f0da3794c203e SHA512 97978de7990b309cea4026e22b5ac2731b4240e66c6fb358ef4a66326a31d691314c269bba341896fca8c621cc49d9042e5f1e126c44e5ee8379babec3564607
 EBUILD fonttools-3.24.1.ebuild 819 BLAKE2B 3327bdd4ab04453596301759775fd0c67d4eb7b05369f3d285f37ae27b31563dbee1dc95fd435d94c9e2e0d214ca814f9caf08e0af5e19e1686ac453c70348f3 SHA512 07a3a4c6ed81a66923e1b7dc60cdd71d9350d910efeb8b60b0ac905899d5904336d7a16196239b94dcf3b8398e93da1f1953750f0256bbf69dec7963b62c62e0
-EBUILD fonttools-3.24.2.ebuild 819 BLAKE2B 3327bdd4ab04453596301759775fd0c67d4eb7b05369f3d285f37ae27b31563dbee1dc95fd435d94c9e2e0d214ca814f9caf08e0af5e19e1686ac453c70348f3 SHA512 07a3a4c6ed81a66923e1b7dc60cdd71d9350d910efeb8b60b0ac905899d5904336d7a16196239b94dcf3b8398e93da1f1953750f0256bbf69dec7963b62c62e0
+EBUILD fonttools-3.24.2.ebuild 812 BLAKE2B 0191a387b1aa786fa43ffa453fee7cb8ef05afa58111086db93bb2421c85b5a0a6b83ee4dbbfcf10b38a78b97db11c531b6650f4673ee094d24edc8d8e9b463d SHA512 44892752e39d2f5059cd39935ae9b1d1ecd2984cc83dcebee81dd562a9cb3dbb6712033878f253c98554e366fd338c45b05c978b55b1339ef7e6a97ce42d3620
 EBUILD fonttools-3.28.0.ebuild 913 BLAKE2B a142a5199cfe3d2d7e37cb543be1e87f45300a14b34291230db3cd0123c4628eba4cdbd62f9c798a214527c01afe25ac8a8731ccc29665352a144ba18c778daa SHA512 56a731db469587f1b48be4f7e812dba389000ef0daccef18e9618e7d55d835d2ffc2c350787d83a92be83dd581c2bf2f2e5d5918e09badc3bd0ab508164f1798
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.2.ebuild b/dev-python/fonttools/fonttools-3.24.2.ebuild
index 84eddb375232..9c2b45b1c331 100644
--- a/dev-python/fonttools/fonttools-3.24.2.ebuild
+++ b/dev-python/fonttools/fonttools-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 5af9096d5cc6..a9e9538dcaf1 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -3,5 +3,5 @@ DIST fs-2.0.21.tar.gz 115844 BLAKE2B 0f7b3fa087c89a68c27d350233e3e73fa54b761bad7
 DIST fs-2.0.26.tar.gz 118831 BLAKE2B ce9be9d52882916cd73262556936d55c78fd245f20bea7e7cfbe314d6b1e7a43970ed3758bbd781736b344b65ca03c53ef7b3b5957e93c390b733b7e6ad5bc70 SHA512 2efd77ed968a6d711f6020c84a4418aee32f2273dc246fc4cdbf5daed9d4b5ff86b1c22d2726b637031c398bd1d3b03216c70a47248c793fa3b72c678c007d6f
 EBUILD fs-0.5.4.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
 EBUILD fs-2.0.21.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
-EBUILD fs-2.0.26.ebuild 992 BLAKE2B 28cc40563f00489241fe57230b279e6ef02ff694e08351b89e01ac986eddeea2c1c12f829878f2d7333ff0f1661bb1fe80f65589bb485028aee5868c836c6f99 SHA512 543331f3bf18257f197b60d548c5e6a1a579a596bc61bde093ac5f1393eb525fbb78ac603249dc5f360e826964b4c25ca194bf3b5e75a28d21425d5d5a40ef22
+EBUILD fs-2.0.26.ebuild 988 BLAKE2B a99719e85f4ad87ca9113df7a2128ab875962af51c397d7c5c6daa2375a9753ee778370296298fa03c629cabca777d31b5831755c708c56f8a2440928952a03a SHA512 ecb24ea7c6154379882c3368e696f410a8335050f3eb03ff556b998e89f80459549e9f294e24dfa2fc4f1f0bdb460f5dc13d1430c86c7842301e97b7f5a2e058
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.0.26.ebuild b/dev-python/fs/fs-2.0.26.ebuild
index c657c5f97cf5..944ce4bb0c8c 100644
--- a/dev-python/fs/fs-2.0.26.ebuild
+++ b/dev-python/fs/fs-2.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index aa10d06ee907..bab19ffa0cd1 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,5 @@
 DIST gast-0.2.0.tar.gz 9400 BLAKE2B 1392b9ef3a007d89b6b7af5ca49f3dcaa0689e166845ea25c2e544578f65915114d763b54503825dc2b6958a71ac284ec7ae2cc2cfa861494da28df786d679b4 SHA512 651719c3035d21e02e39cd83fd54212a12c39addf69f7c9e8810ccb7bb9aae7828e176ad0adf55182f0628f18d76cb1e286e498a9665ddb12e91a51dc2303381
+DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
 EBUILD gast-0.2.0.ebuild 487 BLAKE2B 94780b7ee17c6d91403e0e0e22e79c4bb878256280dd4d2d29c2c2c1a26dd52d8f70f538a68b5b791d9d1b526c7455cc48769cd07b862ed859cf5f9f77f1fc72 SHA512 60176d331514b66ce4bfb9abcffe3e9edc819f74ab729a70e06239f525c9379bf94985774ae06dea9d08c785a314165a75ef2520a9f449768f81486f59e253c4
+EBUILD gast-0.2.2.ebuild 473 BLAKE2B a3d7d00976abdf25cd3d7faf135c00009054d198e0bb2dd563ede51099e99f35202e31ce55050125dc4f1aa233ab32e2b51a060063bc8afa05240bc680da6ec4 SHA512 6a69fcfdf04e4fe68b15a27faef7d95d345863647af0da9dea2fb16e137765e02e02d12a04fd13836a2e7874156139ec4089ebd55c4583db6a78a6c5d2211982
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
new file mode 100644
index 000000000000..ee257e642860
--- /dev/null
+++ b/dev-python/gast/gast-0.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index faa6102c4371..d11c5a9558c1 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,3 +1,3 @@
 DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
-EBUILD google-pasta-0.1.1.ebuild 493 BLAKE2B f88568ef689ac10dbd03594de9af15862b1f74280ca6cc219b5c9206acd5db00910c7f3e07f911437bbcfeab01843e474e862b89c0716e9d2ea4434ffff48bce SHA512 dd94c0acbeba54126f2b6fa713211001e479ed913788250c7b100151c6e8ba0a6ea4171a4e0486b8ce09c7a1452c068342d1e72bb257e74927473700abfb62a7
+EBUILD google-pasta-0.1.1.ebuild 497 BLAKE2B b8183fd2909429ca824cc798ddcfd861ffd82988453c744898eec77374048a1af1ffff0890950dd54e1da3e45083787b706704ff4859c9764c6a756ad37eca5e SHA512 ddab5bfb96f67ca15c478caf63691bfdce29be7fe926ef0b52208ceb29c2c46ea6828809af5bc1c6ba7241ef7b69ce3f10e8d36d9508c21a432e590c5d47d666
 MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.1.1.ebuild b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
index d361a804c7de..6baf55a5779d 100644
--- a/dev-python/google-pasta/google-pasta-0.1.1.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="AST-based Python refactoring library"
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 58faf54019fc..97a279b5364a 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,5 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 EBUILD isodate-0.5.4.ebuild 630 BLAKE2B 5f12ca373da3e06151745d616e2f9d589a2ecdb11839b57c1e077eb529d500be49f449c7f76ac302d464a14448bbd7b8905f5d05d32af240fac7ad70bced044a SHA512 0b1daddb8937b7ab8184b9fd806e9ed1eaf30275c7ed4526247c74f89df6a92c180b26d92c5ac15902d0b11ea276682dbe28d0f589d37e1bb77ac17dc373ff54
-EBUILD isodate-0.6.0.ebuild 714 BLAKE2B 0f4c0e1dadd392bb2fa1629e2cecc4a23d1d7208810649e83773ea9ede939f07fc5208be712c7f95621a151406ede4c18dcb058a63b4c3da3a14b882f5e37c32 SHA512 a5f7ea353932d749bab6bc33384747cd9079a40163c77588b013ecf4d63f4ded74750f4edd3942c72cdde011a3076c5cd30f8f3275369f45f17eb0ee71b523f3
+EBUILD isodate-0.6.0.ebuild 718 BLAKE2B 67d2e86b40121f590f4f3095238fed98fb61d72e8d8603a7d551346c0e2106e681f6a3eef7de50801a883a9027fc9c590fc93df8f27fda29cff0ccf8cf769ed7 SHA512 75ccdf0caae1af285e991343298f1006224459a39f9446087e59377425cb0f9c96695727aad7bc27145ae199ebcbae7aa4f2c32914cd135476d3b3db35d7e2dc
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.6.0.ebuild b/dev-python/isodate/isodate-0.6.0.ebuild
index 7d48aa9edc43..064b4d221ae7 100644
--- a/dev-python/isodate/isodate-0.6.0.ebuild
+++ b/dev-python/isodate/isodate-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 95b21b621e2e..352854749ba2 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,3 +1,4 @@
+AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 AUX m2crypto-libressl-version-check.patch 5125 BLAKE2B 969595234bc845f5a5c31f0fbe8bfb69f9eb41dd99f4053757ddcb0fcbd3a9a6e3b725dc1eb3d73108a69c496cbfc66bd52a3eefe0763e27e2f7b82b9f8c9a38 SHA512 36fc26175591bd731de80bea08887d76d3cedd2049d17c838001eb75bea2762d5b93eaa6fe7aa45d3d156dc93ddfd73c1a58a548d6325408960e08dc54bf233a
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
@@ -5,5 +6,5 @@ DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989f
 EBUILD m2crypto-0.24.0.ebuild 935 BLAKE2B d15257bc6f02af9dce4514f19e7b2e1ba29eb3e1091acb8f03caf2db32164fc87548f5b55e37e8d616b1fb3ddd19a43cd899aa248ef9300a910af644ab6b2e4b SHA512 39c75d9af3ed016a8c3e363350a4f37ef7c31b8867684f66189652127494f4a53aea5edf451005a3c6b901241797556ab237521f80f6ca9860b6b2a4a97b7dcf
 EBUILD m2crypto-0.27.0-r2.ebuild 1361 BLAKE2B 85800c96f50f5f080eee9aa96523dae8f6ace906568b6fbfb1d04bfceedce813bd24eb315364909c0bdae164a4856e369fa64dd4b01f2f2e65eda6e5696b0833 SHA512 777df5b5eddf9cf1e4db99c680b3bf08a3a99c3100b701dc41b1c7943fdc8f6da5b212a9668ae3e3cf820c39cab24b5e034d8546c0a360351a51cefc1b841320
 EBUILD m2crypto-0.27.0.ebuild 1298 BLAKE2B 97104e95a890d7dd30a9ccbbe4328e09e3d99ab86736aa68dbafb3e2334174e9f2a64964351f7cee426b2433bb008b5bd816a454c30714aafc9ef0d8bbd8cb6a SHA512 a4ed82f6f69fa6edb4ac6449c4472f76c7ffd438711376cfe616b0cb0b3a06639d7f1ea31dfbdceef8d17847982997b0ed722df3d53193ad2471553b2bb3bb7a
-EBUILD m2crypto-0.31.0.ebuild 1307 BLAKE2B fc5e832da62001b9af77ef32dc118c820ee640318609a9564f718dea97a50ada617a879f8daa11b40b85ced1da100487528261ab26ac2bac906603c4f5b1166d SHA512 cf86160885ac3f6bc37209895c608c3832ce03e6f65916fd40162a7ae9b48d612f4df4b8f42ab17aa247040785108df2a9c1e422b8f8443ba4fda86ea2d339cc
+EBUILD m2crypto-0.31.0-r1.ebuild 1343 BLAKE2B 3841013b68a17cef27f7f22ad136ad734fe36f76eab57a4ba07c8a15c34b5ec354f3705c3cfa97e0befe357233f858110bf7d95c9bb560cf3bea9f437dcd15a3 SHA512 55950b02e614de392cd458dce92964a2dae8c573f5f4e0b78fc948b7b9d41c92fd3d4e097eb46aa0e81798e0312db05fd2ffc7d62daa4daad45bd417c7e1ea30
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
new file mode 100644
index 000000000000..10ed142b33e4
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-libressl-0.31.0.patch
@@ -0,0 +1,222 @@
+From fa56170c7adf5f124a48cf1074390adfc697272c Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <stefan.strogin@gmail.com>
+Date: Wed, 9 Jan 2019 10:15:08 +0200
+Subject: [PATCH] Fix compilation with LibreSSL
+
+---
+ SWIG/_bio.i           |  8 +++++---
+ SWIG/_evp.i           |  2 +-
+ SWIG/_lib.i           |  2 +-
+ SWIG/_lib11_compat.i  |  5 ++++-
+ SWIG/_m2crypto_wrap.c | 11 ++++++++---
+ SWIG/_ssl.i           |  4 ++--
+ SWIG/_threads.i       | 10 +++++-----
+ 7 files changed, 26 insertions(+), 16 deletions(-)
+
+diff --git a/SWIG/_bio.i b/SWIG/_bio.i
+index e85a275..8eada82 100644
+--- a/SWIG/_bio.i
++++ b/SWIG/_bio.i
+@@ -293,7 +293,7 @@ int bio_should_write(BIO* a) {
+ }
+ 
+ /* Macros for things not defined before 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ static BIO_METHOD *
+ BIO_meth_new( int type, const char *name )
+ {
+@@ -325,11 +325,13 @@ BIO_meth_free( BIO_METHOD *meth )
+ #define BIO_set_shutdown(b, x) (b)->shutdown = x
+ #define BIO_get_shutdown(b) (b)->shutdown
+ #define BIO_set_init(b, x)    b->init = x
+-#define BIO_get_init(b) (b)->init
+ #define BIO_set_data(b, x)    b->ptr = x
+ #define BIO_clear_flags(b, x)    b->flags &= ~(x)
+ #define BIO_get_data(b)    b->ptr
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
+ 
+ /* implment custom BIO_s_pyfd */
+ 
+@@ -515,7 +517,7 @@ static long pyfd_ctrl(BIO *b, int cmd, long num, void *ptr) {
+ }
+ 
+ void pyfd_init(void) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+     methods_fdp = BIO_meth_new(
+         BIO_get_new_index()|BIO_TYPE_DESCRIPTOR|BIO_TYPE_SOURCE_SINK,
+         "python file descriptor");
+diff --git a/SWIG/_evp.i b/SWIG/_evp.i
+index d04e806..6fa9b38 100644
+--- a/SWIG/_evp.i
++++ b/SWIG/_evp.i
+@@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved.
+ #include <openssl/rsa.h>
+ #include <openssl/opensslv.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ 
+ HMAC_CTX *HMAC_CTX_new(void) {
+     HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));
+diff --git a/SWIG/_lib.i b/SWIG/_lib.i
+index c84b800..807d5f6 100644
+--- a/SWIG/_lib.i
++++ b/SWIG/_lib.i
+@@ -512,7 +512,7 @@ int passphrase_callback(char *buf, int num, int v, void *arg) {
+ %inline %{
+ 
+ void lib_init() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+     SSLeay_add_all_algorithms();
+     ERR_load_ERR_strings();
+ #endif
+diff --git a/SWIG/_lib11_compat.i b/SWIG/_lib11_compat.i
+index 1ec42dd..4234004 100644
+--- a/SWIG/_lib11_compat.i
++++ b/SWIG/_lib11_compat.i
+@@ -8,7 +8,7 @@
+  */
+ 
+ %{
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include <string.h>
+ #include <openssl/engine.h>
+@@ -24,6 +24,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
+       return ret;
+ }
+ 
++#endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
++
+ #include <openssl/bn.h>
+ 
+ #ifndef BN_F_BN_GENCB_NEW
+diff --git a/SWIG/_m2crypto_wrap.c b/SWIG/_m2crypto_wrap.c
+index 0f07702..f168822 100644
+--- a/SWIG/_m2crypto_wrap.c
++++ b/SWIG/_m2crypto_wrap.c
+@@ -3838,7 +3838,7 @@ void threading_cleanup(void) {
+ #include <ceval.h>
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #include <string.h>
+ #include <openssl/engine.h>
+@@ -3854,6 +3854,9 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line)
+       return ret;
+ }
+ 
++#endif
++#ifdef OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
++
+ #include <openssl/bn.h>
+ 
+ #ifndef BN_F_BN_GENCB_NEW
+@@ -5315,7 +5318,7 @@ int bio_should_write(BIO* a) {
+ }
+ 
+ /* Macros for things not defined before 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ static BIO_METHOD *
+ BIO_meth_new( int type, const char *name )
+ {
+@@ -5347,11 +5350,13 @@ BIO_meth_free( BIO_METHOD *meth )
+ #define BIO_set_shutdown(b, x) (b)->shutdown = x
+ #define BIO_get_shutdown(b) (b)->shutdown
+ #define BIO_set_init(b, x)    b->init = x
+-#define BIO_get_init(b) (b)->init
+ #define BIO_set_data(b, x)    b->ptr = x
+ #define BIO_clear_flags(b, x)    b->flags &= ~(x)
+ #define BIO_get_data(b)    b->ptr
+ #endif
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#define BIO_get_init(b) (b)->init
++#endif
+ 
+ /* implment custom BIO_s_pyfd */
+ 
+diff --git a/SWIG/_ssl.i b/SWIG/_ssl.i
+index 7257656..40b0582 100644
+--- a/SWIG/_ssl.i
++++ b/SWIG/_ssl.i
+@@ -27,7 +27,7 @@ typedef unsigned __int64 uint64_t;
+ #endif
+ %}
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100005L
++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ %include <openssl/safestack.h>
+ #endif
+ 
+@@ -261,7 +261,7 @@ void ssl_init(PyObject *ssl_err, PyObject *ssl_timeout_err) {
+ }
+ 
+ const SSL_METHOD *tlsv1_method(void) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+     PyErr_WarnEx(PyExc_DeprecationWarning,
+                  "Function TLSv1_method has been deprecated.", 1);
+ #endif
+diff --git a/SWIG/_threads.i b/SWIG/_threads.i
+index 69adb9f..fd2285a 100644
+--- a/SWIG/_threads.i
++++ b/SWIG/_threads.i
+@@ -5,7 +5,7 @@
+ #include <pythread.h>
+ #include <openssl/crypto.h>
+ 
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+ #define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
+ static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
+ static long lock_count[CRYPTO_num_locks()];
+@@ -13,7 +13,7 @@ static int thread_mode = 0;
+ #endif
+ 
+ void threading_locking_callback(int mode, int type, const char *file, int line) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+         if (mode & CRYPTO_LOCK) {
+                 PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
+                 lock_count[type]++;
+@@ -25,7 +25,7 @@ void threading_locking_callback(int mode, int type, const char *file, int line)
+ }
+ 
+ unsigned long threading_id_callback(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+     return (unsigned long)PyThread_get_thread_ident();
+ #else
+     return (unsigned long)0;
+@@ -35,7 +35,7 @@ unsigned long threading_id_callback(void) {
+ 
+ %inline %{
+ void threading_init(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+     int i;
+     if (!thread_mode) {
+         for (i=0; i<CRYPTO_num_locks(); i++) {
+@@ -50,7 +50,7 @@ void threading_init(void) {
+ }
+ 
+ void threading_cleanup(void) {
+-#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
+     int i;
+     if (thread_mode) {
+         CRYPTO_set_locking_callback(NULL);
+-- 
+2.20.1
+
diff --git a/dev-python/m2crypto/m2crypto-0.31.0.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r1.ebuild
index 89114bf03d7f..d39f59a5d400 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,11 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-# NOTE: Apparently nobody cares about libressl support, dropping support
-# IUSE="libressl"
+IUSE="libressl"
 
 RDEPEND="
-	dev-libs/openssl:0=[-bindist(-)]
+	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
+	libressl? ( dev-libs/libressl:0= )
 	virtual/python-typing[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
@@ -35,6 +35,10 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 # Tests access network, and fail randomly. Bug #431458.
 RESTRICT=test
 
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-${PV}.patch"
+)
+
 python_compile() {
 	# setup.py looks at platform.machine() to determine swig options.
 	# For exotic ABIs, we need to give swig a hint.
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 71216f3e9bc5..d704751f28d4 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -17,5 +17,5 @@ EBUILD multidict-2.1.5.ebuild 1049 BLAKE2B c4fb30f7accc1ce25b45f3cc8cfdc6d6bac79
 EBUILD multidict-3.3.2.ebuild 857 BLAKE2B 936db37745d3f4c12a7cfcc4c3b5da68885c52ee88d974cb14e443dd3386dceca6906a66296cfb0be9b6cb004a3cce1eb68614e188c9ffe7560afc0ebc970da0 SHA512 6fd7be5f8772ff2d1a17a25dc38dd161dfe791b36ed19fcfdcebff48960145ddc0d6b6a5d52936e9bd99803725d944d70b9ddf6073e78c46ad84486684b47dbb
 EBUILD multidict-4.1.0.ebuild 1060 BLAKE2B 02260e64b12ff33e543331f6839c7ac4604049617ea9d8fd5c939e319dcf27ce28103b6c528343adafc9d38a58c127943ecbbb481558584b3089779afba24119 SHA512 c02423e3a9a94d0d3413b9f261db7fae888f50ad9befb2ecf2851b24930fae5bd5af7a74402cfbb2f37ed7ef91b07b2d1d6541e5615a52182211d5bc07466862
 EBUILD multidict-4.3.1.ebuild 1062 BLAKE2B 6389ba660f6c1cf57efcfa8ae4fc838fae11618238d95ce9457ceacbae31ded545305793508c8fad00168b956a36dc595c33372fa5de74782afbe9c98fa57e82 SHA512 b0dbae21b6849da1db86d9175dfe2774d2340ed0561f001b20c56fed00941bb556f7a9d1d431fd7bc5991b8e9338a6c9dc4b28dc36786252509950ef17437f5d
-EBUILD multidict-4.5.2.ebuild 1064 BLAKE2B a351d48743f170ebcc6033bd7643e0fdeafc611a6fcd775874918cdcfe0d2a2db5c592d2ee909d1a4e5bb5169b3a229ac3a82f0d8b47835277001d9eab40d772 SHA512 52148b528ede462c62a57dda94f565200ff7c76a9369c0176bb30273655e12b2bd45d597915e7bc02f701892b2439a0b651904979b84f26d2d1811510c390afe
+EBUILD multidict-4.5.2.ebuild 1070 BLAKE2B 99aa17f8adeddc8fa5defcba3a2be31ec32f217cbe47d8e9da7dc9b9e64f20a54aab0a022c0eba368a0a542632913e92014ea27164b3f56f8bf110f60862bec4 SHA512 5e853c7832600e3f5c80cebc5301f55f889a390b8cac70a17c783426a319ebccb41f74711c4cd3d2e4dc31ce1be134e4d06ca232e85105f13ae4095d47d78bbb
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.5.2.ebuild b/dev-python/multidict/multidict-4.5.2.ebuild
index a2f8fb69a3f1..be9001640c62 100644
--- a/dev-python/multidict/multidict-4.5.2.ebuild
+++ b/dev-python/multidict/multidict-4.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="doc test"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 4b44e701a6b5..12a42dfc27dd 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -8,5 +8,5 @@ EBUILD mysqlclient-1.3.14-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d94
 EBUILD mysqlclient-1.3.14.ebuild 832 BLAKE2B 71d30ed916d8f5ce442d26aa7f0ca559c083fdd2e81c8fbb64fa9e42d6c7b4d5d31cc11ae6bfb21769ec19f2aea827b75e655269d90741686ef1b4a14e3b23de SHA512 6339636e0fbf4b2b5ac9731e01153abd9ecd17a4e444c6bd10b7d603d03e77201fbc9d6f8fb02e27da1e0d9920b84c78cdbb97290fe07b6d4ea84ff3469e9991
 EBUILD mysqlclient-1.4.1-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
 EBUILD mysqlclient-1.4.2-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
-EBUILD mysqlclient-1.4.2-r2.ebuild 870 BLAKE2B 8893ad50a95021b8fb92bb817e5291679a2527d6128c4d8613f62badcb501229fb660b79fc741a138f64ecc7c2b9252aff2d8ef90cfd29cbf91f08420b540f94 SHA512 a962508b1c8bd1bbf48ba0c36835181905344698b8aa12cc466281b6a4d2ef277ac9fce30f0b10ecaafda29ccbe7273146f11f4fb8ef5b3ac948b172165b5b11
+EBUILD mysqlclient-1.4.2-r2.ebuild 896 BLAKE2B c809d5b9246de0350899e68b1287e89a7f99e30a18f3f5ea1e301ac8863b64166395b1b1e18c3ffd1fd486ae675a1397eae08a2bf63eeb930a92ff0929f3377e SHA512 97dee89a0cd935fe95244757d3e6d55499d21bc3a68b3bcf5fcad60fd678ace94d75703fd25ff3e773a437aae425f00eb44c4367b71c6ce503228fa54d127658
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
index 20c583caca27..f12d017053f9 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
@@ -10,6 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Fork of MySQL-python"
 HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz -> ${PF}.tar.gz"
+S="${WORKDIR}/${P}.post1"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 7d462a040be2..01233054f0ee 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz 9649749 BLAKE2B 5637373dfb70552f640b728814f3db1f3732b7335e7edac502a553a896e9715a8ef9356502c5d33a09a04ef45b0b27989f5a3602707964c7f91a1eee21e9112d SHA512 b1bfacc69f79b9ff7d40ff9b475a2e5808e57a66fa3bf2c79cdc56999e390cfdd2f92b71fd9e53e0e3571f30f3a54d1dcde2c3d8bf38378c72f79260d8d9d5ba
-EBUILD nototools-20180827.ebuild 904 BLAKE2B 48f7110934037aec586c9c72d0c0e30e67f1c24b791559f04fc8b8ddccf2dd9e8dad372ea4724db2b3ae71d0a5e6e232dddcfbb4f715ad2883bb916a341d5790 SHA512 6eee76ad1058c9f8d1d0a894e53adb8e8ab86d6bc3f2426ae35e2a3dc09204a55d470a0136078bc3b406d8b6c6bf5b1c1fc7abdc972b93b7c13d780f6ef95ba6
+EBUILD nototools-20180827.ebuild 903 BLAKE2B 23d5180b6f23a1cb50a460c5f73900ccf7613cbabe6990c8db84ef5740f42104f687b3d592a06d93c200d58dcd910506ad49b60a5d7b4b4812222bfd40c4f6e5 SHA512 e6a2dc54a303fcb8891760559008d31f311dff732ad2fabbbba1e1582756a61fa106d796c8038c94a7b456a5af90cc1d153469ecb155e43c5e7dcd05b84104de
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-20180827.ebuild b/dev-python/nototools/nototools-20180827.ebuild
index ae273247db2c..3ed57f2d87d0 100644
--- a/dev-python/nototools/nototools-20180827.ebuild
+++ b/dev-python/nototools/nototools-20180827.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/notot
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 2390f9a5e52a..39f1fd438437 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -9,5 +9,5 @@ EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b6
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
 EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
-EBUILD py-1.5.4.ebuild 1448 BLAKE2B a72aa68867378e0e359b3f160e010d72bdf2679ef26fa4035c6f1809a6916569087c6f9e89cf90eb36cba374125da11fd8f5f3c64fae0af9208b1364d2a5c26f SHA512 5236eae702a0191463f2f17a11709a4aad959c701c43aae2a0e015e4a69eb3412167e5ac6f892a6d8e7cdb324d4bb7d9afa497821d73e04363240ea2268d1a91
+EBUILD py-1.5.4.ebuild 1447 BLAKE2B f43cecf11260768017c425d0bf589a9358b1a7cbe8248affa307691e60829b58733eeca62b7b5a078856ea61e74c52c968652031ae1d6afdcc9c392456859590 SHA512 d94f53b9c52701d42d3c8ba73a9a621dce4af722c0022e1d48d8eed076dfcdd6b69bcdc2f318793c7c8ffa58939247ea1526677e2f3e0438ae9922ef9e36ab66
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index 746a50673d80..1f27267853b9 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 9994b995a60a..829cdb46808f 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -3,5 +3,5 @@ AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d8238
 DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 EBUILD pyalsa-1.0.29.ebuild 739 BLAKE2B d933094b659c639a6b794026a3ad7b7ce844375ac28d2e2e565c76510131fe57c5b641bf78c27c4fbeacffe346646e6498c5aa567263e79bedc76f39774a581e SHA512 5052d3ce56c90e2ae3c1a8b45daeaeda872db948fd3a20f2011db75bdb3532c7524e0dae9750300e6822f9893c3b18d914b9811159c9800be44abdda8ac2597c
-EBUILD pyalsa-1.1.6.ebuild 615 BLAKE2B be22f9ea3771cd822a51cae6bea98c8e9df083a6dd7927525d303f570c4d1104d4adc85ce8e1db5316f372504b794b11b1adcf8dff50c25f75ff3e21dd966e31 SHA512 ec41b03202840c3a06a0a7b2e36955a31c77c8e4721ffc4e5d5c05881f95ce280b34c0a052959bca84ba72214fcd553ff6c928f90246285cc6337076aa749159
+EBUILD pyalsa-1.1.6.ebuild 621 BLAKE2B 909cad72348b261060df7ff6a753eaa50c979bff262fe5ee47dd4a7d659e8e006b519d1b423678eba065fc61fe1febe2632961651cfa3e58b8f6b73823fb9a9a SHA512 7a9563e5bebd72799c8d28da336e9f99949324f269ea5d39e19f5368c37d955fdbb5d2429057abd1f0b3846b7ed61d60353c7f0575cfa7796283f440200a05ee
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index 5782b7beb26b..9b2d271abfc4 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 9d98d0bfe4c2..13e15bc65225 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,7 +1,9 @@
 DIST pycryptodome-3.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908c90a4545caf7681d2c13db78ce345858b8565daa26ccd4a328eb944de469b943cdd0bb3f58591de4e2a09e130f7381f SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc
 DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
+DIST pycryptodome-3.7.3.tar.gz 9285823 BLAKE2B 6f215a3bb0337f5b7469d92bd2d5b5a19ab4e2c6a8f119411c3a5bcdcf93307752d99113866268b5066cceda6470bd0fbe81b1b2f9e30b5e5e569c77ede087f3 SHA512 b5e09c08cd252cad4d76249be84ce29e16a9bba4f2c5e81594c24d9a39df0f3fc67822698497eb9daa4cb6a43311c5d5a2543f187a5d5f801288596c2941f08f
 EBUILD pycryptodome-3.4.6.ebuild 813 BLAKE2B 9bcc6e760294c9490cae798015a72991d2bd39a03bae1e434ee72d82ffa77a8f5288fb711bb75b60cef4cd6c0d39224ee37decab7ea8e96235a45d1ca4055f3c SHA512 e6f54194e8da50181526bbf473f217be46c752b5be3cfc89067bcd2700eb99b0b2a2aaa88300cebe90da69c85e137ab637b7043539ae493d132aae5833e06e78
 EBUILD pycryptodome-3.4.7.ebuild 875 BLAKE2B 217bf82415263f799645a93984b525333798082cbca642260b31ce6ca60c2e16d7a2eaf786fce49d8c605828b1f4c71a09e61b17080aaa8e080bee0465c25097 SHA512 faaac2ec5382a1021dd427092146456e5ed45cba08e3ade94293de8fa44b3665ad2cb91be7ff8934378fd0df3bd930b2c6c2486eb9ac898d40786c5e3783eb0c
 EBUILD pycryptodome-3.6.6.ebuild 905 BLAKE2B 017fc75f0213e672b92f5a21f658feaa542e347961edce9c97521d9013c4e57c3f4db59fb6c911cd0289871228362e467e84163ffa7a77de3b4d2b2fdad43cf1 SHA512 978dd5acbb98b84a1aaf33eb02e8c579aa6354d752bc38a404767fbf4ed27a4746e94576c489bd9bfb4dd13dba298f3e3014412312c0f54056b072308c26ab9d
+EBUILD pycryptodome-3.7.3.ebuild 915 BLAKE2B 3bbcfd21e04619594e655ad2a516944e152e65242c85a6a66a2cc2104fa3c9b3194fa8c822ae19eb06c60a302e5c6af71aa72f099e2bbbad00283cff7fa7e586 SHA512 50fe74ce08f78c228d293044de4bc2b9ecba8cb3e5542f0db48bae4f4bb0d111218a1978cee27e2fd4ef62d1fd39334c2e7df830676b120071651c8c9d0c0f5e
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
new file mode 100644
index 000000000000..b90b8c9d59d8
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.7.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/gmp:0
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	!dev-python/pycrypto"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 1c9e466789a9..7ed836d4d4b9 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,5 +3,5 @@ DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef5
 DIST pylint-2.2.2.tar.gz 568313 BLAKE2B a6a3a48a96820bf9412dbd5f3e643d95fe7c9ead9752920d9979debaf5da53a3b5076c39975dd37420c86b71fd2ed2f513c42663fbaf1e6103a0958271773c58 SHA512 29a9bf39413479cb2996b1a2e0d3aaa1845faf3038b17c30948554c359fe8cc858e9bfc0488ed0af204daea22e0ab36d765c447eae66ac7ac6d60d66d9a33fef
 EBUILD pylint-1.6.5-r1.ebuild 1804 BLAKE2B d88b604448f1326055a1b4b4fa3fce7723b8c49c438f771bc323ff0be1fb8bd1498e3c587eceb3274accb603ec128c27320102c2eb383b4df9bde1524f9ad18a SHA512 6b0e624b12f80af0b043e27833381cbc4164c0a20822876954946c7715cd6448e6878811e1f9a7eac32a47b2699eb7b06a1442426dd38920213636a5562052b6
 EBUILD pylint-1.8.4.ebuild 2451 BLAKE2B a76323ce66bbd966c0e10cd70aeffd6454b5c6ed87a8861500466f4e342ebdf21d56176465e5b6502c8010d832895f0cf73c86c259ab63274336b4f3b98b9fdb SHA512 0a2660423ec69a7dda3c1e12f6abd51164baaffac294fa4e30d43bf08e7187d60e513e5b4c6de685b9de934c0e1b81927e527bb4c025122dded0f282183ef5cd
-EBUILD pylint-2.2.2.ebuild 1586 BLAKE2B bb94af9ffd04cb95231d8b09660eb3dd0ee7aec45fda8646ae947872465941e9d9462595ae41b546cfc32e09608b06191eade04568368be112f636adc192daae SHA512 f8e92c8623c2af9db02d19ea046b794d7e610934f1a824326208b28e4c767b49380d2b7cc2d66267886d5e6b17d0596487a41fa805e219f8887824dfefd70bfc
+EBUILD pylint-2.2.2.ebuild 1591 BLAKE2B 82c54e2202f53105abcbc2f882361e178d2bc3009203d671084fa53363d3c5e53c7d901d26361f8e6ec06f274a47807e0b196f9c1d9443c433982bc59aebcab0 SHA512 ab010530513c30ac4216328eecae79d5dd8e57c632c2d7b043458ffa228a0f27282287d91a1825e905abdda5dbc12e7c20fe7c80320ee1059762097dfbbad031
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-2.2.2.ebuild b/dev-python/pylint/pylint-2.2.2.ebuild
index 27e44b3c1c75..a748dde9b802 100644
--- a/dev-python/pylint/pylint-2.2.2.ebuild
+++ b/dev-python/pylint/pylint-2.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 11974a6c8331..84f19fcf2ae8 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,6 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
+AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz 12981891 BLAKE2B b098e2ee15bbdfbeab5b9ab0b2b818f24160badadc8d7e3e8921eca85251a2246a595964ec491e1d23f84150253f2db23642038b476ebe930129d1b9ad170ff8 SHA512 65202d2970e52df83e206068d66079e7fd3254c9d6fa3e410f23f379b3accf324af09fd3da4c13a483c00b9de523485b8f3008f4160f134b5935948f05028c80
@@ -43,5 +44,5 @@ DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6
 EBUILD pypy-bin-6.0.0-r100.ebuild 6329 BLAKE2B c2533c30797562a60c8db615279cbf110c3b7756a8ea772da095936fd6125da948d4fe625fb9edccd5c255610287b09280059d3b3c5a324de6030f4dab1b0dab SHA512 644af55ab278e7b4d5441f5dc8adc1b0b91e9b5a901aa32c2eb0979ad290ea5164844e78bb073aa303d9c90847352f158aa9b53da6fac7e39fefbebb79a84356
 EBUILD pypy-bin-6.0.0-r200.ebuild 6493 BLAKE2B 2b6bbfd1ec9f0828ef30765a6e8b1c5f3ac59a296f1b3174136ba74b3010a1727a5032f9ab27d282e453dbdfa9ff8d377d26f7248a1e1b6204dcce43538a58ee SHA512 69d360de30278f0d4048ccd66c604b005a1174b8d46d98c5ebc6782cdc5cc65ece9ee913046230e58ed85f9433a8fd6a8c152f30190bd40f85bf7c3339e25cc6
 EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
-EBUILD pypy-bin-7.0.0.ebuild 6132 BLAKE2B 44163b8adee7131a76680dd1fdf2b89b0d81eaff8f79454140f26899ab8fa2ff482edd5e95fa906ef5a7c81531dff5322517808312e4c6ea7e0fba7196d2e9c4 SHA512 29db83d245bf9dcc8598998d50c0395758f8d178ae7baf644e5cafc79826bd2bb12e6c67bb35c606117b862d8ade20dff803ac5360b9fe8344c90ee9b9869d4e
+EBUILD pypy-bin-7.0.0-r1.ebuild 6282 BLAKE2B 0f476e3f5011de66e0b783c0d0af329940e5874dedbf2fbc278f1ba580dfd1bfe3a590b0b25f26c9df4ff94fb98a58b8dd0fba9cfce052c3cb1f863f089d328a SHA512 e5642c50817bb249bac279e40ed195eba6f3def312a334256b3ad7a02e9d35fdcc410f05492d5c9479b23a572f6bfbb19985e963fd4499e209debe2155e29d51
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..9be52cd0b753
--- /dev/null
+++ b/dev-python/pypy-bin/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+
+[updated for 7.0.0]
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951da0..c2564188cb 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.21.0.rc1
+
diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
index 3793bd49daa5..53daf3ce27be 100644
--- a/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-7.0.0-r1.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/7
 	sys-devel/gcc:*
-	sys-libs/glibc
+	>=sys-libs/glibc-2.28
 	sys-libs/ncurses:0/6
 	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
@@ -78,12 +78,16 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}-src
 
 QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
+	usr/lib/pypy2.7/pypy-c
+	usr/lib/pypy2.7/libpypy-c.so"
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 9a1bb6c05831..a619af83a7b9 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -2,11 +2,12 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
+AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
-EBUILD pypy-7.0.0.ebuild 8032 BLAKE2B efe1f0405e7c67120ccd136b0e80d3ac9a70c0b896a6e28c7e315b4d06505bbd27d4d0334589f19f20341b50bd5e18098b6575de778d9e2ad339a7661977d45d SHA512 1d58b112c831778a7e06c38c8c7eab1138175c39e6e4f8edf6058f4fcb3645ebb6d738480dcb0e7bc1e1a16f915e8f00a94c0be7d60a0fc9220925450c013d27
-EBUILD pypy-9999.ebuild 8042 BLAKE2B bf2dc9a1a2ddc21c649449ceb88d263c3f736f73ac1c04db93914368dabac444ec04e095ac2961e146ea268f3076d939139e618ca00a853e1381ef7c519215b5 SHA512 0b5c6b869a67b0878c7d394d05792f33e0616bb642d1eee6db6deceb00cd4ef1d800e5a5d5e7a725a6db4a6e4a16fbec56c2d4640fd24844d17dc6d384f61361
+EBUILD pypy-7.0.0-r1.ebuild 8171 BLAKE2B c9e84ac1b80219632d68e0f43fda967f29ca0a737810baca1f112acccb4f92e8977fe2a34717c45cfb89b38cb8bcaa026a9b611a428e873fe850d8603c312e0e SHA512 815c3aa66c6a84506f1226f075e4b28b3278816ed3b818aaa507b63a446daabb67b7ef011715d6b72fe35732b78b6eb5d366ceb334e95160dd4d31e31d3c9312
+EBUILD pypy-9999.ebuild 8181 BLAKE2B 65fa3643a8875871015f6878898cbe57c9f2f1f7568140ea74fa6b28dfac8bb07939ce50d22e623b43f43a9d1aadcc28a586f8a6b1ad21488d3b72405566724c SHA512 bb089f9837f9b2e4a0cc501c337f7b837a5900d4aee414a83c9b0cff027c8190ec7ba22d344c98cdc17f22e20831bec40299b811ed1240e0833a8fefcb91c1a1
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/files/7.0.0-gentoo-path.patch b/dev-python/pypy/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..9be52cd0b753
--- /dev/null
+++ b/dev-python/pypy/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 959e2aafbe6cabd4e6860f842bce9b8644f627ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+
+[updated for 7.0.0]
+---
+ lib-python/2.7/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/2.7/distutils/command/install.py b/lib-python/2.7/distutils/command/install.py
+index fc43951da0..c2564188cb 100644
+--- a/lib-python/2.7/distutils/command/install.py
++++ b/lib-python/2.7/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy2.7'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.21.0.rc1
+
diff --git a/dev-python/pypy/pypy-7.0.0.ebuild b/dev-python/pypy/pypy-7.0.0-r1.ebuild
index b3575616959f..7a956b9f4a0d 100644
--- a/dev-python/pypy/pypy-7.0.0.ebuild
+++ b/dev-python/pypy/pypy-7.0.0-r1.ebuild
@@ -99,9 +99,13 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 762e9c5e7e90..708273fc4d5b 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -105,9 +105,13 @@ src_unpack() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index c063a0553231..164fc2e72ba3 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,6 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
+AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
@@ -22,5 +23,5 @@ DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a
 DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
 EBUILD pypy3-bin-6.0.0-r100.ebuild 5574 BLAKE2B 8cfade201d213feccfd71ba3ea86afe43c7a659a9fc3a2fab7f584f5e05052a4bf07ba8539484bf135daa96623a816ec704420aa305fafcf803655ef07eaa425 SHA512 7b5fb47a68cf3b9c64ae0cc6ae5309b671dea4d8fce026c16240652d0778ebe0bc76f2fce34686c0a29f9c91f8b3e6aa9c5a864b4d9273a864fbf98805a45894
 EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
-EBUILD pypy3-bin-7.0.0.ebuild 5340 BLAKE2B dda984bfaa5ca268e539034266c13a51d3bd81b26ab2105a641eb025b629938f22e13ebad361fe392616b7c2db2f794f32567d2aff8debd8b65ba74252e7b82a SHA512 d4dc638ce51d931e33d53a66e9b352cc431b0c085ec17f6a96557f4834ff87aac7df80986a9f4ed6c27cf24e8f894343fb09047440dd698b362429a3bf2e8d8b
+EBUILD pypy3-bin-7.0.0-r1.ebuild 5486 BLAKE2B 4536a0fbf064472be4a1ee651f38ccc47fd027aad1e941cbaeef67abb88526646f463b025179825ea719247be07be2370d5658d9f05b5fb2a46ce6066d99e47b SHA512 d0baa35e4a58c89a0309c099edc3a6ccd60b52c263fe9016534fefdffedb1c0acdaaf63d7f0f9d155d8989273576c8a74ce7455661105cb80d915047f8a15475
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..17409fa89a42
--- /dev/null
+++ b/dev-python/pypy3-bin/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+
+[updated for 7.0.0]
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index 77a1827d4b..255603967f 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -50,6 +50,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # user site schemes
+@@ -461,7 +468,11 @@ class install(Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.5'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.21.0.rc1
+
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
index 820cb2321a3a..adbc9b5b3fe2 100644
--- a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-7.0.0-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/7
 	sys-devel/gcc:*
-	sys-libs/glibc
+	>=sys-libs/glibc-2.28
 	sys-libs/ncurses:0/6
 	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
@@ -61,13 +61,17 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}-src
 
 QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
+	usr/lib/pypy3.5/pypy3-c
+	usr/lib/pypy3.5/libpypy3-c.so"
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/3 > /dev/null || die
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 9d6831e55786..4b90ccc3abfe 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,11 +2,12 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
+AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d8a70ece28eeccc646aaf659b8ae6f425089380b908a588e2a0ca2ed521995ef3f3aa3bfeb58ecfb0083b3584b SHA512 e67c0bb96d3c66ceecdc11a3984dbeb65a4473020ee2d4e5b093fe987f1540dd7a5cc6982be6303e7e8c49a53e02883277597d00342312a0f8144a84ff132bae
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
 DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
 EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
-EBUILD pypy3-7.0.0.ebuild 6712 BLAKE2B f57125d598cbf08d354b2aa58196868d3cfa20d94d33f85519b5430fb37436a3a58686319d9553744e173bc82b09995f6a6e05842bcf4bb08e863f53d1283ae6 SHA512 2b3e715387bdf7c468791e9367235b00ecf50d45e2d1b20bf203f167b39af8605adc1f5184570db098f80db458a98ef29d3817d70bbb59c88be5d4f7ca7650ae
-EBUILD pypy3-9999.ebuild 6762 BLAKE2B 7113f6af1d63398cc2b989106146d1fa5e0fcf8705badc740e8a304482372d901969cd832ff19b97568acc63cf003e848980c4cbac7f374003f198def348a373 SHA512 e069ac6144fb99f11e38355aedeb46a8140033382de752ec070ad1ed4b36711c62cdbb9e969d1a9eaf21e909a1b6f9ea035a3863c659c2b7d5be885394c10c4b
+EBUILD pypy3-7.0.0-r1.ebuild 6849 BLAKE2B 52cec3fe80dd34950bf94dac99979ce799e878b7cb3f77d43331742e2afcaec7554a852ab225d9449940c83df795142d20cb72572c8d41c0cbdd9679f2f3b43e SHA512 6cfc17e8f0c0d4cf77d3b2b217b434c3b36e662e900a0e2118af8a4cc0be27cd54e1644419862b31381b4dd416d1d5a0cbedd272e43f56a5fc7ba285c0dc81ab
+EBUILD pypy3-9999.ebuild 6899 BLAKE2B deb7ad2878e9774c6f5d7c78ef8c6041849b87bd18cc85be058d1d713331f5988e129072510c84ba90172cdc557366ef57a113890b17a3ef1e502d172a8ee047 SHA512 07ba00e030bdeb26f764d0fc0ba6435c0522054b4e401757c3dc742cb833061a49ca89d19d83c5875749285b1749e54a8c616adad4edd693630bb23be1247cab
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/7.0.0-gentoo-path.patch b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..17409fa89a42
--- /dev/null
+++ b/dev-python/pypy3/files/7.0.0-gentoo-path.patch
@@ -0,0 +1,52 @@
+From 44c16c344f137cc91a145294c4124174fc25ad16 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+
+[updated for 7.0.0]
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index 77a1827d4b..255603967f 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -50,6 +50,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # user site schemes
+@@ -461,7 +468,11 @@ class install(Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/lib/pypy3.5'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.21.0.rc1
+
diff --git a/dev-python/pypy3/pypy3-7.0.0.ebuild b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
index c318a1f521a0..87ce4dbc2489 100644
--- a/dev-python/pypy3/pypy3-7.0.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.0.0-r1.ebuild
@@ -84,10 +84,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
 	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/3 > /dev/null || die
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 3b0362d0252f..236616d1f286 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -92,10 +92,14 @@ src_unpack() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
 	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
 	# apply CPython stdlib patches
 	pushd lib-python/3 > /dev/null || die
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 141dc96b9d8e..ac013ad17c16 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,5 +3,5 @@ DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
 EBUILD pytest-mock-1.10.0.ebuild 1055 BLAKE2B c8f4b3e9c626527e2182a56883a3a6353857e6a441044d4c8b70e027f7abbac2cdce0fb79c76dbc425ad556c00cab28a2c1edb7969bf468be28dfa0eabd0c9ab SHA512 8b1a6eaab12269205fad2e5eb9e8743cea98bcef7c81640661f20befe9eb93a6f172cc4bc492e62d80c437190763affc0454959e6a84cc2e9fc5fdbfd0495960
 EBUILD pytest-mock-1.6.0.ebuild 1084 BLAKE2B bec8d4ea680db36cfc84747e495cbe72ab29dcfe59d9fbba0255fddd993b2bd1fc096bb1e0dfa8c5a3d0a84af7c30f6a3ea2fef13f37f3c99a4df53844185eeb SHA512 1d177ed2bc845b7dc9806b2c2e7028a6225f4fa4ae6a1d6e09b1081a068e8cfa06f31dd723fef4e4f85925818c89c9eaa78c27c699629e1bd28200c018117ae9
-EBUILD pytest-mock-1.6.3.ebuild 1043 BLAKE2B 91c59156450004ad46e3843160a17e46718634d4967cefbd175d75e4c61f0d0b738180dd0ddfda8ddeb852e0fb2708a49db87a624626cacf45cc5273e30156e9 SHA512 b9fa11994191bd41a7b57d80ed0fac7514da6698d08b46934de52d63b615ce8050b1ed0af9ab36e458dbacce63ab8841340a66489a9792eb2ce615dd24be59c0
+EBUILD pytest-mock-1.6.3.ebuild 1048 BLAKE2B 3b127e7335b00a3c77bb47ed461d52933b20ce9292721e6b771aa60dae32f0c136e7129756af731af737e355e632460cdf6f38b2f07ddf8aa82ada3db9bad77f SHA512 4bb9202277dcf33e3700175eaf269ed236c211207670cac70d61ebf8fc839c0138f38433233aa0ce15853fccca317f92e8ca743971754b7bede1d63abf66a46a
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index b52233568a88..f4e6428456c5 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index edbba423f5a3..80d4356e6fd0 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -5,6 +5,6 @@ DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862
 DIST pytest-4.2.1.tar.gz 913065 BLAKE2B cde085627872d601df1c6d91d9620fbb97789b6e176fe104bc991faa800268e5e61651e211a8840743b21f8cd9b57dcee8685143e2f4d56d197afae35a577aed SHA512 e41bf7c685cacd62261df6d356911297a65ba85e13a50f8aed23d382d257c4c1cd3213971a3970fec210b8e97b72bd0034c0c1f87be7f306286d541c5ea57097
 EBUILD pytest-3.10.1.ebuild 2223 BLAKE2B d6bf6267602a7e9f94d28ca14846284ec9834dce2036b2313e999aec57d38c30e18b117e60431babadfe96e955e9c3758dd16ac4e660fc9d2d9db782a11ec7b0 SHA512 aa782c5dc1a4920a036da3ef4d3b7f3706ec0774d840b12539e1bcd16372bedea3b5520b42d75589defcb288efcbea778e00adaf6517b11c16a06a6fca82817f
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
-EBUILD pytest-3.4.2.ebuild 2524 BLAKE2B 3695b3a275622ec4d09d835829a1d59f6c6e3636d133b2586e63117d32b873e45a41409f112eebbb33608b21ce9cc8e05d37924f1e5237b925ba1f38bcbe5035 SHA512 d51dafd6345671662b1fc16e343885284be3a785328852b6b997512c68a34354fde36677e781dc1a7cc2f5f90c0816cebe92e223370d3b95ae08c4b4c3adf4a8
+EBUILD pytest-3.4.2.ebuild 2523 BLAKE2B a3856f909c3cb062c4e8b7488930a4fb0ddbe2c46ed6510c9df0616aa1712aea3e5472d6806273b3fc38d8b20c7fad0dc0be485825b28f73bdb46806b54ffa2c SHA512 fae25af4b7455e4c1c8338c2d5514d1c1794cae5351e64a3a9b76165c3c7562a6572b1545b48a51b23c2d72373e77f96efaedbb26249f50f0ead02481ae6972f
 EBUILD pytest-4.2.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.4.2.ebuild b/dev-python/pytest/pytest-3.4.2.ebuild
index 10dd7e332ab9..906a6a786643 100644
--- a/dev-python/pytest/pytest-3.4.2.ebuild
+++ b/dev-python/pytest/pytest-3.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 26b355d61350..ef1993a711ae 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,5 +1,3 @@
-DIST python3-lxc-3.0.1.tar.gz 27424 BLAKE2B ffdf128e06d7b256652588af7c464045479ce907d2119dfe9780737c7bd5f3008c01d834a79f63932bfa51e3094a9d40af46c4cb6c3be72108205d65a8ee3d11 SHA512 7e6b6cb9a02e5af8b3fc8aeefff2954c68d2d1154751fa97a70bce86131021571e15db86bb0d6900a93dda78247e37b75cdfe250bf4d1b7548dc8383ed3d45f6
 DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
-EBUILD python3-lxc-3.0.1.ebuild 488 BLAKE2B 2647e70a041e8471ba5c319ba18f68bb2633a7314070b43b28f4a1f8a42730175eca28010d807be9128000439f2decb70b5651bf54f265f3b0de018ee44898a3 SHA512 cd2b832892317b2da908180b99d6ba7b231ebf563aee9e963f445dc2793d1cd3d020a40a22d03379e4ea751c2d28b3cac2b77cd9813bc47acc283aabc763db47
-EBUILD python3-lxc-3.0.2.ebuild 488 BLAKE2B 32061ea7684e12b8f3c518be7cd11201b5d442b37b7f49c434da305806244e4db4387bc9fb3aec8c703185d899f60d0d948925b0978fa489f260140ea2770171 SHA512 9d8677de52eba2bb367d244c6fe1b1c9795b9c6575bd32179488ba639d4dfaf99e98e29d45d61c27d93713f66c293b5be1c5cb43e1bc3bc35635af8de1dc526b
+EBUILD python3-lxc-3.0.2.ebuild 487 BLAKE2B bae27e4a694208ca3ebbabc9e7a3defdb4206f534009f2b90e7c7fcf38807fa93f6e16f27ffae94ec6b29e2a3a4dcfebf67b543b39ee4fd36c88a2d19d3eda82 SHA512 f60783dba4066631831e55a31d8aacd51c048a8fd533d263460ea9f504556f36eb898f61e81109bfbdab56dd8527d33aa9991704594e5d775651de6da988759d
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild
deleted file mode 100644
index 4d7d4c4b10d2..000000000000
--- a/dev-python/python3-lxc/python3-lxc-3.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxc/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
index c8a10b5bd63f..f24647ca3608 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-emulation/lxc-3.0"
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 590870d34d4d..1fff916ea4e1 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -2,5 +2,6 @@ AUX sec-patch-CVE-2014-1624.patch 1867 BLAKE2B 7345af45e863876b9c0f11c0dedb2dc12
 DIST pyxdg-0.25.tar.gz 48935 BLAKE2B 8feffefff37da1e560040b36cc1ccb4ffdc57642b4de92f7a937303a02117ffe263a5dfc91bb6e85112ce60bc19509c21e7f8f859ef3ca5fca0e8c87a61cb128 SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
 EBUILD pyxdg-0.25-r1.ebuild 755 BLAKE2B 15a48e50dce7a5e0e35c4f6e4e4c56ab62db05c5d685b067935fcd1f7a9f616945e75ff8fa9945041c50a99bf4a242e5443eca316f499f79df9f0e31a0e3376a SHA512 f4f92b92d43107ea6d2aad282683b001db8b89d5747a9dcd33ac81b1eb908ab755f70d7484094bc455c578b07798fd149875675fda5e380918182d3653df536f
+EBUILD pyxdg-0.26-r1.ebuild 779 BLAKE2B 7c2d80c07709848852b34c777d201c9a8fa120d00879ccd320eb0f2e1d18697f65cddfdc948ccbdb4c120fafed6efdf8e47aff9f54ee431446df3da364d08dec SHA512 2e1d27b2a5af3a3ad95487d1da4dbd2c8b504bfff75643a4a4250b4a9c2a20263fca2de36c83f80b8b537e6eb21bc19156bc15a40b8a9c968050588fac3bb273
 EBUILD pyxdg-0.26.ebuild 778 BLAKE2B 73b062df847ecc66d843f28e1106db6058288c4d5a56283f1f1fcfa150d4692da5cf9b73920e4b1a16a409081c33dd2f25bc9621ae683c660a1729510b75b315 SHA512 ac13b58a958ca4c57b01c019b265b018440f6a05cfe43b347bb0422d3f1b101415fed50104b6b2b313670a1cdcd1a2027fb6f1192acf3c0f32fd96fc87cd4112
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/pyxdg-0.26-r1.ebuild b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
new file mode 100644
index 000000000000..f8810a58d4ea
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.26-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+inherit distutils-r1
+
+MY_P=${PN}-rel-${PV}
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
+# official mirror of the git repo
+SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		x11-themes/hicolor-icon-theme
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	nosetests -v || die
+}
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 84cc3afa7343..8b4d7bd37b10 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.1.ebuild 2684 BLAKE2B 7683c11fcc2cc52eab51ff618131bd334b969e93fec1a5267376a04928187a5348b1c8287939d385d7e74372dbe101d8c1fff0a7ab7d7bcddfbd79c4691aa13d SHA512 8f52696ab3e53ae1367ee75141c0866fac7fab5d9ac4aa87a02c796c206f3d9f3cea2818298a4a3ca4dc2524175bdb3ba34f40726be4d1a51f4d4cac138f0f38
-EBUILD rdflib-4.2.2.ebuild 2714 BLAKE2B 81f918e766311059476025f74194b1ef2f06391c6e1ee3bdbe78060d28ad90cbc8e7c0e9c74c2de944be43f3fec2037d0e706e2e5a68a7a1a485409984ac909b SHA512 ce4c1925b9e87c9717416e64fa5dea45b52cbe501c66a9e64d281081fec6c32b453398b5dfcf9c5615a081ca9aefe6133d9e2647c549833160b55c329303cd7d
+EBUILD rdflib-4.2.2.ebuild 2718 BLAKE2B 30a05912878d79190396d1156a65987bef8c8be73ce3f291453052948fba149f8608c9a0395bfb953643013a4fc59aa1d050c56cbf34f0e1c2f2453596e2ed83 SHA512 982c6d29bc73ac58f7566f2227c2c75d120da86cd342bd5137109c32c7dbd73967f61294b5a95ae4179504cd1107c660e7ddce6354a3c93350149cde8db5aa19
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 7d4375d15c6f..b7f33c5e3d4e 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index 8bcea676196b..a8120b10bbd3 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,4 +1,4 @@
 AUX setup.patch 843 BLAKE2B 80626eb7317e42fc828493d98afb330873040bd0bf3a33c4c4ef225a4f57bea078e3440172509a5442868c565eeaf675c82c47d514bb4a915881d8aec2456a4b SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387
 DIST restkit-4.2.2.tar.gz 1275904 BLAKE2B 4ebfc3ad91265954c28712e4beadcb25a467fe7af8c68bb655016ddb20877ca63275136605400c59b462825526a59f69d69d4b687641816b4704b62623498734 SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b
-EBUILD restkit-4.2.2.ebuild 1303 BLAKE2B f9a2b32813959020ad6d9de32f5215e88cf58d7438d8088f7518999812c21c392d2cba171ebe545c9334292030c6e7101757367a4cba4e63201d5b0901b96526 SHA512 d8672a91230d14fa00199df7ed08a887521a02f46a5e210c3bc86c37e4df49ea2fcc8fe9f4a1970472a9316f89eeff6122032369bf6fa427d9d06112963ce0dd
+EBUILD restkit-4.2.2.ebuild 1299 BLAKE2B 09801239ff794a1ab1d8d22c12f12a96610a738db00a75659fbed912d7ddf2142bd64e13debfb1749f2f220722a755032b6b4a350545db0ed6c70ae3b47d65e8 SHA512 c8d99fb21e04ecb0104ef8a99aa2d8817a4f53fbfb89b1ae84ab0319fc9780257dff3e999e1bcaf1bf210589c8f0f33e878e5f3accebf12e0856211b8303d4f6
 MISC metadata.xml 520 BLAKE2B a4f0485d0276279a820836969654d31173c08f1fb840892a5760cc484f8156bcc88ff2ee371aa1154883be957d9b62dc9ddc6cf242ec02b4e9cc9cfb45c99449 SHA512 6e5652c44b93cb00a07485b337e4be168e0728ee49485692bb6b3cdc5725f78191ca891059197f3665a9f1ac1f65074843b7a2fa7cfc4ef0d92d52033f685acb
diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 044ce7bfa2a4..318b8760818b 100644
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 s390 ~sh x86"
 IUSE="+cli doc examples test"
 
 PY27_USEDEP="$(python_gen_usedep python2_7)"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index f0357a0367e6..b7263e54adbb 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,7 +3,7 @@ DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31
 DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
 DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
-EBUILD setuptools-40.6.3.ebuild 2056 BLAKE2B ca300bf06ffef94c44fb9aa4879a536c3c4319e0b29d8dbed82f223cee111a34c3db42fe82da4a5be1748caca6eb960683d1d0a4c5699058312a834870a01d43 SHA512 c332c72bb1e3cf38a98d5fc7903522c17a1ecdd850d076ea238e34f2638809ac9d1aecbdf9f793c67feac23045f3044298bdee6ce026f508394b2712ef2934f6
+EBUILD setuptools-40.6.3.ebuild 2055 BLAKE2B 8458f8cce4cdcaf3b3c38518f3a9f63773a482954dfb078546cfa5c84db1c50fb0b53f0cc2064c5a231e82b325d9290ba1b3819ad39f40502807c973828a406e SHA512 8eb1e1bfc30dbad6476163c47153789cc6a4fd74f076651dce67fa39d197fb7977c52648819f5932f3d87ff96d99e0dca0940519577bb622571aadf5f2445869
 EBUILD setuptools-40.7.3.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-40.8.0.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
 EBUILD setuptools-9999.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index 2932866d6ee4..1cf98a28380c 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 7afa5b6cda44..9852fad7110c 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,9 +1,5 @@
-DIST simplekv-0.11.10.tar.gz 19711 BLAKE2B 9de8e7be32bf5322a93a49240b4ad99e294d3296af4ba67454805e1a4dcf2dd6c0f5afa092949d7061003c8c877c153502db714de310d06eee10d6530e2485af SHA512 96936bcd6c2717412f5076326a87be1a37bf8cc7cf95adf412bf3a1874edaacb7b3a86759c2729a2fb2d126735fb87cbb569d42a015c0b5c697a09dd362f413b
 DIST simplekv-0.11.11.tar.gz 19708 BLAKE2B 558475867f2a023af9cb6c1cfc7a161107db7ab6550d19bc4f9ab126c586808b15378a11f23966e2026ae142764533d7efa3960c4e929ea87edac48c52635434 SHA512 8b44e817213b90c05979ac0d4b2a7444a415eca6b4a1b565c41826f3c42370ec844ffef6c35d097de4349747b9d669ec7a8e57093685222709e228f1bc083505
-DIST simplekv-0.11.8.tar.gz 19387 BLAKE2B 6df2a6288173e6e0faf4081e0e8f1ff7453bf8348e9a6525729c4f0536b6043047a1743f01a0485f1a893b22888c981ca0bcf859aa1aa6d24456c35ac4ee651f SHA512 df3a02752c796d8567937701b39a3747e042260744d92c985bf84885147800a1a9aed7615c3f29b807717be15f838498a23c730804cd4bcf4ddca56ead57923e
 DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
-EBUILD simplekv-0.11.10.ebuild 465 BLAKE2B b91cf3f94a680d5666bef2a36fb036d79e39ec53a345c5bb43614fedd8f6946bb40a27fdc23bed0ebe58abc383c40f160ba5e44fe932f46167d96b9e9ca247ec SHA512 d4fa14680273e2295b93c0fff18c6f7bae7dd8787641312e94e0b271d52d127855f4ae8e0ebd20ee18032e6f1be2355fb1050fbda1b3d5fa6d7073b0705583b4
-EBUILD simplekv-0.11.11.ebuild 462 BLAKE2B 9b5ca470ca182bbfab9785798b0524f87fe91c5f498048d7d9788ea698c12ac6b4b698cf3c6f672c2ddcd34bbb9933f9427a1aa6abd381bfc99936f0199a4398 SHA512 0b3e58f196df158fca804da4c4588c5da37ba60e8759a3e6c62076980d034486906f4f82c3eaf9080a5f11d1aec7bdb2346f99fc25dc8ea0f9819097047515bf
-EBUILD simplekv-0.11.8.ebuild 467 BLAKE2B fa741bf309b24427588da282869ee676f1f4477e22ccd92441b09e575809af0c8745e22c5569bbfe34cb284072bf627a47f83e45b074774a5369cecac50e67d7 SHA512 b39a83f5105d1b0714ea7653e6f11d880009b1b377b8cc3a253591da01c263e7881352353118e6285e7608053d6bfbf662f4b2887d2245e8ab263734e8e4a97e
+EBUILD simplekv-0.11.11.ebuild 512 BLAKE2B 3671a6113d0862082fc29c622aac8abd9929bdc105b6586027eaed7b2bff1a70176e883f191f7c5fb416af5be580f3fe0294d8f8dfaf18a8725530d3c7eb074b SHA512 bd027824b8f7fcdb27533f36075a503be7f512622ebdb46b9c22c6b685c38091189329e424993e4a646674b48bce6943f78d9f411ccd693c0bef3f5e07d3e1b3
 EBUILD simplekv-0.9.2.ebuild 443 BLAKE2B 59f5f15afcbda168898aacb1ca94b24ac3c7c4585f908c9dd53ba8a97d35371fc206e183689644ee67cf3ee1b82566b0559ef2b761f6378ffe7b5f6345814f32 SHA512 2fa65c4e2bd44404c5b094d7a681077aea5a194e829146b303aef86dc58398580ce6c8f26bb4c05046d9a2421d4201dd8c6b8800b43da5832776cda3df1d4ff1
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.10.ebuild b/dev-python/simplekv/simplekv-0.11.10.ebuild
deleted file mode 100644
index f785f789dc9f..000000000000
--- a/dev-python/simplekv/simplekv-0.11.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.11.11.ebuild b/dev-python/simplekv/simplekv-0.11.11.ebuild
index cf286bf9d6cf..08dc6b3d9e82 100644
--- a/dev-python/simplekv/simplekv-0.11.11.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.11.ebuild
@@ -17,3 +17,4 @@ IUSE=""
 
 DEPEND=""
 RDEPEND=""
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplekv/simplekv-0.11.8.ebuild b/dev-python/simplekv/simplekv-0.11.8.ebuild
deleted file mode 100644
index 70cf86192ba5..000000000000
--- a/dev-python/simplekv/simplekv-0.11.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index b38ab65228b1..5b1bb262cb72 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST SPARQLWrapper-1.7.6.tar.gz 26597 BLAKE2B ef98640257d06e1814d57812864b2fd23ccbf2bb2121e77b84e87b26f4daf9cac576dc005659a023ac318d7da4dfdf4b6f96ea30f159e12f444cbf7f93a7e97b SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 EBUILD sparql-wrapper-1.7.6.ebuild 604 BLAKE2B 33bcc0e93d019ed19e4461d29bcb018cd6b9260d7dddb4364cdc60afe489ab48c3e6a8a407ef690ef07ba863d31c5936f699487830ac8ac15413f7b467645781 SHA512 61307dee5332885e9b1fae58887e4872421346b90d182a96e105499448c0631599828fa9d2614b43367907ec6016ceb05582db2087906a0378a29a214cc2e4b3
-EBUILD sparql-wrapper-1.8.0.ebuild 614 BLAKE2B 87b3e5f5cc8cf926a41f3d5f3f35f0ba97330e5eaf779053e076ecb0fd3af351090ba13b074b7c3c70650c75f8a0ff1e396c89b3e49b715eeb855784529b2c4f SHA512 7181721520203f0d399998054ce7c94f4a95e80265bbe6a8a254fc96f39e23fc09c4eaa5083aaa2c84012dd5ced01eb47d68cb83fe206d636af8ccc1099ad6cf
+EBUILD sparql-wrapper-1.8.0.ebuild 618 BLAKE2B 8b5dc6dcfd2d749430ecbba5d15fc6d759c9943865788bc76c2d36818e6a64a09266fb9ae37acd91f69b718e8e5acef64f310b15c81e2b5a1e90ed6bc97252a7 SHA512 234b0be4c2dd6bfba8eb2c30d1395084170c3bb05cd9c806366d72d65f822da2a7c5668cf35362a903755745931c326b2274804b0b484e8cf76e7a133861a67b
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index d220986852c2..8e3c94f7429d 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 2ddbcc54a2db..d3dbde4c222b 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,5 @@
 DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
-DIST texttable-1.6.0.tar.gz 10733 BLAKE2B 80a9b8a224ebaa37066df6a3aaccda6237224976076755b8f81a27eb20e3ef1c0811a529a877778b5ea7b1345ad16d510a7f3d9b6a1caadc582f34015faabb4e SHA512 df685004f24b8c1e7aa1bd6a44c658599805f1a0c6999a4a3e95ecf3a68499f515bea9cb5ccd54f5ee2563af15e9fcde2a7e1827934e4a1fc83c9ae2f5e88a52
+DIST texttable-1.6.1.tar.gz 11185 BLAKE2B d3fd85de8b6fa14ec6c520c0c0049ee043285fecaf7d31fbc1f361e0c9a27b66a75caf8aa0f85109523143f36ba2da47818ce91c4946c0b4d5391a0a4c5d9028 SHA512 72d4bb5c4f03b1f9dbfc4b1e375ad754e92610f71e65c7e9a0b7bdc88b3753254b143aa607570d49cfca56a3cf889a819e12ea184fdf34594f1f5d118de3c12c
 EBUILD texttable-0.9.1.ebuild 433 BLAKE2B 39f373d4876fc255d750d3be892e9f8b720c9f136ca9d89c6f46a3469860b640158c836fd21af37d3853bbb004e46bece4b4a103189d9f0e94c1dda6dfbb1b9c SHA512 ee3e2d6576e9bc93fcdf81e33d0a05d772397e3f662bf6a1ac0bf25e030a844ac7278bf4e2b8873360f0ad3e1ad0c3210f1bea9ea215416d32868d5e2aa9c552
-EBUILD texttable-1.6.0.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
+EBUILD texttable-1.6.1.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
 MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
diff --git a/dev-python/texttable/texttable-1.6.0.ebuild b/dev-python/texttable/texttable-1.6.1.ebuild
index 7b84c8a238b9..7b84c8a238b9 100644
--- a/dev-python/texttable/texttable-1.6.0.ebuild
+++ b/dev-python/texttable/texttable-1.6.1.ebuild
diff --git a/dev-python/tracing/Manifest b/dev-python/tracing/Manifest
index 1566f13c2a64..cc51dbac7f17 100644
--- a/dev-python/tracing/Manifest
+++ b/dev-python/tracing/Manifest
@@ -1,5 +1,3 @@
-DIST python-tracing_0.8.orig.tar.gz 18796 BLAKE2B d8f8e76c8a37e457be3806e7fc24192756198bda2689c47d60cbc62ad4b43cd53ff18c4cde392a276fd560ccdca316126efd5d7171a3efebd1e2021645e8a307 SHA512 9a5262ce63dbcafff83a75586e90be280ff41f902d9f71f4274dac944db4196c6a5777e290ca5e49aa010fb3129d5352d8c10a554918375557525b9a56ac9096
 DIST tracing-0.10.tar.gz 20364 BLAKE2B 8c37ed178d037c8a3db22955999df3c6716c4cb35b1eca04e53e788aa0219e2eafa77ff489b1b6f77c60c6aba078d8e12f67a191e9a25d22bc112ee5124d85ee SHA512 3e9874d55df3b599cddc817680e49fed2bbaaf510597c4f41984a742b22c0b3596d29875f2fedcb890b3acf43cd5c52faad7de334781d9eec16676e9f10bf5d1
-EBUILD tracing-0.10.ebuild 658 BLAKE2B 49dec3127a3171fcb81c9f8162dbaeeab0ecc7f21add5dfc1dd62f9fcd822452fc6f02e27a6e7ab7eaf207fda6565f512fd76142e4cfad66e80b73669ff95853 SHA512 60be95126a325ed66b21b68969749e6035528ca6f24325d09f307793208027ea7f5c406f7c8316d7ad8ebc57d48731852f52fb41490811cd58d8a37d2cf00433
-EBUILD tracing-0.8.ebuild 709 BLAKE2B 7529d5b57fc74468af068366392b8e5aad9d964dee83c4e03eca6bb67dd2eae88be353d3f429e064cdc2552a1864a2f0887dcecd57026afdbfee20eea8101816 SHA512 e2dd714778c6bca2005e443e58ee55bd4101d4e93247bddcad97cbfa91baec003a9b99ff9f1972b0f08ba422e94bb0dc93bc513b43ee8882f66d9117c3ef7cfc
+EBUILD tracing-0.10.ebuild 657 BLAKE2B 93d4deab39b63e7b9b714b725a0a498c759c6c3cc4cf35dd654cb995cf44b4a59a08c498b529bd9986f1e51a248960b5c6662123231d956313003fcd7cd20386 SHA512 13cf76c2aeee976411875ba39665f589ee3911478c68e7a3522458c1aef9518d2414bc1602a263937f306fa099c8e69bafddaa7cb850a7944286f5b579041d4f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/tracing/tracing-0.10.ebuild b/dev-python/tracing/tracing-0.10.ebuild
index 09b209a18b6f..c09ce44ba558 100644
--- a/dev-python/tracing/tracing-0.10.ebuild
+++ b/dev-python/tracing/tracing-0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 python_compile_all() {
diff --git a/dev-python/tracing/tracing-0.8.ebuild b/dev-python/tracing/tracing-0.8.ebuild
deleted file mode 100644
index e47a675e7f53..000000000000
--- a/dev-python/tracing/tracing-0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-MY_P="python-${P}"
-
-inherit distutils-r1
-
-DESCRIPTION="Debug log/trace messages"
-HOMEPAGE="http://liw.fi/tracing/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	dodoc README
-	use doc && dohtml -r doc/_build/html/
-	if use examples; then
-		docompress -x usr/share/doc/${PF}/examples/
-		insinto usr/share/doc/${PF}/examples/
-		doins example.py
-	fi
-}
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 992e5ab28ad5..415f3355bbeb 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWords-13.2.0.tar.bz2 176411 BLAKE2B a8972dc504fd03a5d3eda5a6c908989ca6561124617b12cca5b1379fb1cf5ee37aa52c798b08023d1e381e4738c784091188c2f07952bb2192ba25d027907b4c SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105
 DIST TwistedWords-15.2.1.tar.bz2 168483 BLAKE2B 55d83e146b83212ad42d25479fe59b88f885e948127ee7f52afe69da9d5513ee709c7ad8bcc564e1e77cdcfd63f3f1592624e7dd7d957bc18a753a94a4ef76aa SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7
 EBUILD twisted-words-13.2.0.ebuild 499 BLAKE2B cb080062e56854f25138376478f3c04839007a3bdc6d22b306f31083add9461216130fe46cfc842f00c8d3e9e855ff26ca784ef29db33d65f8e025fc26527d1f SHA512 bab25a6be4e57772d5d6b3efe34042315c03ec428205c17f9acfa2554cc1396f2c3962774aef6d0585b65df5a2e719528d9653d222caadb5e6b3aad0930ba38a
-EBUILD twisted-words-15.2.1.ebuild 501 BLAKE2B 480f994bf3016ef4cb6754ef36c7d0ca1bf379c47de99841bdd31a8e9e29947d51e8197445b88a953075fc0476ad63e95726624608b829ea3fecd587324ba32f SHA512 8f2cf70ef58c3c115e4e5a696a8dfb17d3602cbc83b8ad813724cc4f987838a152407c12bc906d0b3fb3b4a1d296a687e6abb962e3c6d4c38916c091b89a21cd
+EBUILD twisted-words-15.2.1.ebuild 505 BLAKE2B 594e0685ed44c0956261489557532545dd284459bd426e945e2eb1defdcb682a7cc1876ded9b943c9bf15b801864bbdfbe17819008cb8d2d1f74df377e3d4cdd SHA512 0be3a1b8121cb6aeb821baddf9a156c849ad0f9ae2de6c30139e00915b181f1a69aab61222f6ca879c29dec3f9bf0a91643c4cfb49e64f382bde9132a0de9170
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-words/twisted-words-15.2.1.ebuild b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
index a09ec57c0bb0..df635df64b35 100644
--- a/dev-python/twisted-words/twisted-words-15.2.1.ebuild
+++ b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 3933245b3f51..4789ad555d30 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,5 @@
 DIST typed-ast-1.1.0.tar.gz 200587 BLAKE2B 09dd6d65513a37a57ecb6df2a505100f5fc08a49a244f1cb83af363d20d9b1b76f127ec5da6ef115a56ae6dc560ab40dcaae4740385fdd9e305bfd2ec26fdbaf SHA512 439e949082ee5cb9434fec99021c08401a46ec2ad16d96296c6440aa1fd8158f6605efbdfa55e536c3fddd4018bb0f4c5ee4d5a4a32954242b7902b9ce3463f2
 DIST typed-ast-1.2.0.tar.gz 202702 BLAKE2B 79e919019763f4af0a2f24108cfa418693dc5a1d791a0045a49fb128d715f91ec5bcca6d4bb6812e19b7a5438bcb27d239f2aba7de8b859d4e8e73027c59665f SHA512 801f59cdce48f7be3045c44d207a5a269bc1cd5ca9f0536d3d16f10ce82794a7e5cd5d3c83982927cebc52e1b1dbd47532140bcedca0ca4ace45b726aa0343ee
 EBUILD typed-ast-1.1.0.ebuild 414 BLAKE2B cc41628646ebce7f0ffeb31d99674796854de0a5917ac2df205a38c949930e2d54834419d5c519a899b12670d8027f7fe2105b124ec5a3936f45e28c05c561b1 SHA512 1a3d8f8740b940536c35d173f2faa8ed555efbf018360fc2ee5f1bad5066892e84962c73ff689f0807becbac53d3b16483e34db144c7669a3dbcc9092cc3c8c1
-EBUILD typed-ast-1.2.0.ebuild 448 BLAKE2B bd35636e2531c7c0a257cea116cc8367c139463ef17ac9d73872a1a6a68214a0edd278d4ee92ca90e956c92d14db0c7e37cb871d593f70621a21fe5abdd72aa8 SHA512 8633793601ee9296a5e469dc1042c17ec1c4247c5043e371dd0832e255118fa1b386b80bad4cc848dbe5fdbf6e3e3c95fdb2aec4d0cac45a174b0cec029ace27
+EBUILD typed-ast-1.2.0.ebuild 453 BLAKE2B 39f41610b7521ff2024a3837ebf0f4e6e15e310081d201b84a40d2b9e857461353d2e1f6715ae64c57fbc4e739c22b3a0c1619e5287b66e39ae33aae9574c2b1 SHA512 abd67289ba301dd8fc832ae538d10d071e17238d7360c104dd81de422cb8704ac100810f82fd9fa3e1b328e96ff9d090545ec56429d1a8d330d00f265b2251ac
 MISC metadata.xml 371 BLAKE2B 79a6eb0c3d333193154ed5bb5364c38afe787e0e0a845ed1c77e98e305c4d5f396c0ae10303e94a8bb6c407f937674fa48b9f8dc27c2c41cd36f74bbe05563f7 SHA512 28a6e9c5ac51f6b86cfbb1f5cf06a1dbe524326a74e69ca63ff2440b116a4780d87de84d9de4e070ad3669d0732be5e4ff87681570a57ff22e395d59e19a1c3a
diff --git a/dev-python/typed-ast/typed-ast-1.2.0.ebuild b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
index b04a42088a3e..cdd9b6b66a78 100644
--- a/dev-python/typed-ast/typed-ast-1.2.0.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ufoLib/Manifest b/dev-python/ufoLib/Manifest
index 8eedc868bc1c..330d8bc7fddd 100644
--- a/dev-python/ufoLib/Manifest
+++ b/dev-python/ufoLib/Manifest
@@ -1,3 +1,3 @@
 DIST ufoLib-3.0.0.tar.gz 115234 BLAKE2B 0bf7dff335df312252f3ee19a365f26d43531ac2d9b5d526af24038326e6be9d3b21f631ccc85199baaa827e02380b11efbd845efdbac158ba9ee96b947c3bf6 SHA512 c9d833dc51d0b6760d41832704c502ecf114a03999e449976b15c675fca265d2c4a7b396934c89bd7e4d1c0e893c86c713bab77bb9b14c4aff4edacb0089773e
-EBUILD ufoLib-3.0.0.ebuild 641 BLAKE2B fc2cf5a7e8a4a3665e3da752e870b909429800a1bdacf7a3261f65043aa17f7b19268694664b060b0ab8193d509e8e51d76a32b7a4603392e3ecb192247a3379 SHA512 0e8a6d2b507ba39a22c572591165ef484aadd2619ac83edf8db40f6fdb86bb66984967c02ae9418954db4e29720906139443757aacb4c71bca1d5a6390bba253
+EBUILD ufoLib-3.0.0.ebuild 640 BLAKE2B 052176a787288b76ec2c042a7cd91b511090406afc8cb91380607d3d457429345a0cc325d31651b7d83aed0c6e33ba079b27c2a37fd1e7b36f4ffee2df518a72 SHA512 327355b208a5e35c01279ca7b115f0b3f712dee6a39c0234aa7425de8dcb379f219f040f2fea841a50f9e53a96a5a6b541a7a748804f9e819f62ca63aefd5978
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/ufoLib/ufoLib-3.0.0.ebuild b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
index d521d5550784..65da61081413 100644
--- a/dev-python/ufoLib/ufoLib-3.0.0.ebuild
+++ b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/unified-font-object/ufoLib/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-20 15:11:50 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-20 15:11:50 +0000
commit	16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch)
tree	b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /dev-python
parent	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff)