gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /dev-python
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
298 files changed, 2620 insertions, 1758 deletions
diff --git a/dev-python/Kivy/Kivy-1.10.1.ebuild b/dev-python/Kivy/Kivy-1.10.1.ebuild
index b15a1bcc542f..a52cec8824f4 100644
--- a/dev-python/Kivy/Kivy-1.10.1.ebuild
+++ b/dev-python/Kivy/Kivy-1.10.1.ebuild
@@ -19,6 +19,7 @@ KEYWORDS="amd64 ~x86"
 IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
 
 RDEPEND="
+	media-libs/mesa[gles2]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
 	camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index f0e6def8ac91..dd24014a4d40 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -3,7 +3,7 @@ DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d45989
 DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
 DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989
 EBUILD Kivy-1.10.0.ebuild 1933 BLAKE2B f12180ecb960b700626633350e524aca74ac231c0cbb7fb3dd1ee21b78008f7f9f880e504fcdd0b92def10c2558b19900744aaaf072b13669d202ade9af717bd SHA512 431f6bd4c0c77fc591baa60d9e8791554117e9c38ed8c61e31f8ab1db984157f64c54102f8a1dc7b15d90e1a83aeceab83349b9ae50961c1aba80bcc36e54811
-EBUILD Kivy-1.10.1.ebuild 1890 BLAKE2B 2ccf1f659a7da99cb418d7110462727a39e060ce61e8f8a8e90da9eb43b6f970d6253bbc4e237fefba96980596acbfbf91daf358ffec7261dcb662baa55db4ee SHA512 122d066f49ccb0380e3b58b81443d7c8382e4cf0edcf6ce86ce0b07379eafb4c576769e3bdd9d5deae250b93ec9f6e186fbf8b420f2d8cdc365e96517e0ab54e
+EBUILD Kivy-1.10.1.ebuild 1914 BLAKE2B 96bc8775b3e0259f87b439cc5f9f880cf6b99b948e506c25547fb0df46f6d4f94aff8313c0a8f92dfea928a2fc5d8f913a576f256a26d36cd835fb6833d8fc9d SHA512 9801f808b12f90cc626ee69e54a9f5071bb0db975660600d2815e568d00899bfc939f052033a2245980ea18f1787f0082fa534cb5ca36af6add6174a5175c614
 EBUILD Kivy-1.9.1-r1.ebuild 1879 BLAKE2B 09dbaf8d158d81a92e5427dff6f4026f4b3d71bba9f4266eb1e3b4ec6ac1d4070713b3bb5f23e82757506f9d3da3780a1b123fd795baf967312a597602363f42 SHA512 64520836ec8c7ee0cc06be36902b70474f0e4e34e57c142c0e93df9bcab6ba56fb4d5cebdd4931f8ed4c193876a81f3cb1d385a5b0acb7c95974bafcf8d15b1c
 EBUILD Kivy-1.9.1.ebuild 1795 BLAKE2B eae7c1ac0f30b798a99b0a8157625d24cfe6c0b11b2fc8f13069a9116a402bc2a8cb60a4147c365f1f7095afde91cb311ffcffe2e1c94698038fe72a5cf4cea4 SHA512 4e711555b897e2682a9ffbb047ee358689a8a2fd5584dcc82c4269699059e950adb483ce0b6c93660e8052d0f91b8cb906523ba2bd704f2df82dee335c6fa8c9
 MISC metadata.xml 490 BLAKE2B fca6a6372250ac811cf7520b98a2d26d5951030b56fa7d62ef85c3554025bb57a55371def39747d7597b42bd9dea44104892c75a2ecb58904de423ac4260c40e SHA512 a29aa0e59c1d02423643bf9bcccca5860c981a81f45b2aec030355f566b9690b8e7e8f6339acfbb5c51436e9298b99d4b53b5e3bdb410fa4f030177f9abe2ccb
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 26508f573e01..f6a2b5849134 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/asciimatics/Manifest b/dev-python/asciimatics/Manifest
index 5f7cac660a02..b970a807eeb2 100644
--- a/dev-python/asciimatics/Manifest
+++ b/dev-python/asciimatics/Manifest
@@ -1,3 +1,3 @@
 DIST asciimatics-1.10.0.tar.gz 1536207 BLAKE2B 9a96150d43e4f59932e4a23a9d580698a053b35a6f5ddc9c967e4202ba1e2b0bb181bc88d9382725d2ae4b10241397f421d8e0d9baf1f269cb52977115d47296 SHA512 dbf2d44f5d667e59bbd14db761ad60a482b8afbbc8190248cdd49a8317575194ce9d2127f9275599bca800f1d5bd5e57fed5cd02b28d739c2a203b15ddebce7f
-EBUILD asciimatics-1.10.0.ebuild 1247 BLAKE2B 2d4e9673119cc86726a65915e08db1823e6c4e6c0f517a468571217e9973cadf37e10a4dd6a44591d0356d98b67bdeab7d9ce289468faa9ba08673c0d8b2636d SHA512 290110e9369886fbec9e7fb2373a0d5d02e0814a7f49b9d55f20c5f2616b2b1add0f667a7d6ac4bcdd60a2a69594e5a53eff34c78575e3726d0dd8615b55a987
+EBUILD asciimatics-1.10.0.ebuild 1242 BLAKE2B d7d753fabfbc0584436c33d10b156ea86c074cececd43372849d764a10ab59b1770aca1a0500d5df9241b0b355b2ae3ce57054f6b539c945ed7e6dcf1c2e0181 SHA512 3e82f1b1147a99d7640c59d6f1f3f1cb571c574399b316919035d5ed21f1ab25e10b31e2b2e6646b7ff90b3e193df5ae9edd0d898a779122b0b807053bf65468
 MISC metadata.xml 473 BLAKE2B 2916025fe2913a4628af8501e0c906ec58bae5ee38176bbb9ecae7d2d00b24694db8aa8ec59794a65bcee01f31bfa4eee1a5f8063b7e5c729c83e182665602d2 SHA512 8c5d4633c383b369dbba29d1176bf553b09429493b8d7439b338ed6ce52a6eb2d26a9752b1496a89680b53dd47de1b72028b8857f97bfd23bdb0e19b4b34f3d5
diff --git a/dev-python/asciimatics/asciimatics-1.10.0.ebuild b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
index 7b98702a75ff..f079d7df9cf4 100644
--- a/dev-python/asciimatics/asciimatics-1.10.0.ebuild
+++ b/dev-python/asciimatics/asciimatics-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/peterbrittain/asciimatics/archive/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 27c184b1129a..24e5193f0935 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,6 @@
 DIST bcrypt-3.1.3.tar.gz 40806 BLAKE2B 60b42bd4326ae1285911a79eff43f871366d6db8f1c2eb102f4f4cd3e91d29e58d30906b542d6f04ec0608dd5583550c0c9ddb795d8fd05cd1802396535ba59b SHA512 1fe80a156cd3707c27d4d3b6495caede3404acfdcd238d0461fdd83249601a0b0f2945e0f531dd4422f19e9cd47107245d8e40eb8b47b78e5c679e7e6b37a92c
 DIST bcrypt-3.1.4.tar.gz 42575 BLAKE2B c4521ecfa55e5b857e35c9d9e402b8e911b2546bdb349a4e87f31e6af0a2686ebc9df4fc6268534c65d3bca8facfa2e8ccd549174f8f91a25002e94ba7fb9be4 SHA512 885dadec10aa9c5944a68e73ebc3ba409d41517850fad1bcb61321a8ce4072b95422472b9f7ca76508e9b0d24a86e19f3e415a0713f0a1921b9d3f796089ae71
 EBUILD bcrypt-3.1.3.ebuild 1005 BLAKE2B 39535b4fc8ae7ae025cc10f5ea542afa4576475bd8eec08f1b125384b8b566965804ec4140ceee91fdf3ead444a42a735548c65a60fcb9bfb304769647c6e2d5 SHA512 ab702b59dfe325f959c83949c77233172347c8c66f0de917492a8a7adff7574e39eaae9b2a14e31c1b1168e828cdf1699bc018c02575b4ad4592f84df98000d0
+EBUILD bcrypt-3.1.4-r1.ebuild 1021 BLAKE2B d6ae73da4fa348ce633a71c0aab4b8681fe9f1760c708478aa30adcca1d8e53173f0372a9a2f523a3a797af4db7becbea96f6815f79bdc4d26790d85c735feab SHA512 a31b26cd309b02790e3168f025aeceba5627ed3a0a27ce8339688748c4b2d19c22b4b9594cf2f06addb2cd77abcf06c403b75769fbf1090a9a41b930cb78b423
 EBUILD bcrypt-3.1.4.ebuild 1022 BLAKE2B e5b3b4d0fc70b586eccf85b9014f33a3156d5b50175e690a4ad745e7bf59e2f74cf1def800561cb59d1f741f6894cbcbbefa5fd2f146788680f939829d1bde66 SHA512 52c377fa09ec1649220ca291761b50c6c4dfcabc1256d0825b843c3aade1d43d957830604afcd8170992278b3a1522d7f7b16a622ca54e83b97a9fcf8f747db7
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.4-r1.ebuild b/dev-python/bcrypt/bcrypt-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..e0abe96cbae9
--- /dev/null
+++ b/dev-python/bcrypt/bcrypt-3.1.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Modern password hashing for software and servers"
+HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.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 ~m68k-mint ~sparc-solaris"
+IUSE="test"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/py-bcrypt"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 256433be1b84..5399b10d2902 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -2,6 +2,6 @@ DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aad
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
 DIST bleach-3.0.1.tar.gz 165179 BLAKE2B 261ef2692c8c30e1ce387346aee03e45d46e195d45778485371a4e5d5d754c579853b50633fd5a834038c931cb48dc458771e7a44b7e0726015ea5934b2968bf SHA512 c90fee244d10ae66c30c8bff80e096cf508b2413a7ee082cbe2c5e0f1508d078133c2db6cd09f05ce875e867d4c0fab985659e4fe6d7bd9fe6ad4f823af03736
 EBUILD bleach-1.5.0.ebuild 773 BLAKE2B 6afda52e437aa252b31174f09b7a6f61fa95f4b91f96ec364ac9375e26c2aeec5f5df001b92a8ee6c0f7ffc5a62eaf1830e64d216f3660e43661230000d2f770 SHA512 984382fe1f458fac718dde60f3e6089edb2cafa69296b3e21ef9049907da625ac44af15b87c062801a68a5b15a2fc3a989015cb5ad94c2584f2a8783311dba0f
-EBUILD bleach-2.1.3.ebuild 788 BLAKE2B c1f7de96ec9a25ce8d49e9d0cdc26d77e234a82c64d8679b59d5be53026840beb6f69b934a20bd4a20ab1d1901e0e1e163c2541ebd33507ad91a11cafd19306d SHA512 780660d5ef954a9d921e3713b369657dfacf90d12bde25be87b8d2aac74bcc8889d75927d00286b0b68ea97f90786f94c23a17b4de02ed117829bc5574768033
+EBUILD bleach-2.1.3.ebuild 787 BLAKE2B 3d1c4c3224f04d6fcf4b94a0f8f60b27811da97dec8b823625e29064057f971b64f8a1297c1a64a093293f641a515b8980a979b516e82191a68a82482916c13f SHA512 192e6c3c2d5c23aeb1831346a00a65bc3bff60f0d01426653d8785ddfc4c4f4cfd8f2c8d443d631c2d211188e8e07bb957a8024e11e0bfddb4bfda87cf578e82
 EBUILD bleach-3.0.1.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index 85f6d7836623..23ed3a93ac81 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
new file mode 100644
index 000000000000..b65f94945e72
--- /dev/null
+++ b/dev-python/blurb/Manifest
@@ -0,0 +1,4 @@
+AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
+DIST blurb-1.0.7.tar.gz 21248 BLAKE2B 931a0db30447f5a41c956f15dac2bd967efd8a85d4837782e02af24edc31dec03d3fab27f22db1dafe334dcfc79b133cf99092fc28b59c190b1182d1f897e0bb SHA512 d84fdc0a7ecec1207a58a748f6d33343504d0b090166c91b05e9b3c2eb125fff890194539204386bdc7a1e0a595d2cb80d54d873045941491d26ca85cb55ac98
+EBUILD blurb-1.0.7.ebuild 613 BLAKE2B d75f7fe4058e6c94540030fdfe93e60e82c393d2367d1bfece10bf923fc519b13ad52aecd74ddc9d771bfc56f3ad608d17dbccfc6a7a73159e2dc49e0e6a1e1e SHA512 70cff4ebaf1a12abd118fd12ed0d73ff6bc0fc392db9490ee0ed1b196a20c286c790ffd733cbb3c729e5e680bf3d86b56666406ba4bb241d301fa3b856041db1
+MISC metadata.xml 976 BLAKE2B 0d391aee3be51752f3cdb2406bacbc4a0bb45bfbebc3b2bc67b788af647faf92bf1308fbc9f51426d4c540f8e89edc8bb6f5c967000a56e40b134270ac8336bd SHA512 611315d86b3ccbecfadc3c38be45e0322221a0f1065d5d59d717a33fbf66f510274b6cb772ca3468ec76e21613ddb88cb547dc3a4e7b50d638c3fe811ed61abb
diff --git a/dev-python/blurb/blurb-1.0.7.ebuild b/dev-python/blurb/blurb-1.0.7.ebuild
new file mode 100644
index 000000000000..fe85e9a6768e
--- /dev/null
+++ b/dev-python/blurb/blurb-1.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
+HOMEPAGE="https://github.com/python/core-workflow/tree/master/blurb"
+SRC_URI="https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/blurb-setuptools.patch"
+)
diff --git a/dev-python/blurb/files/blurb-setuptools.patch b/dev-python/blurb/files/blurb-setuptools.patch
new file mode 100644
index 000000000000..4845af98285a
--- /dev/null
+++ b/dev-python/blurb/files/blurb-setuptools.patch
@@ -0,0 +1,14 @@
+diff -u blurb-1.0.7.orig/setup.py blurb-1.0.7/setup.py
+--- blurb-1.0.7.orig/setup.py	1969-12-31 16:00:00.000000000 -0800
++++ blurb-1.0.7/setup.py	2018-11-05 14:58:55.148518033 -0800
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ # setup.py generated by flit for tools that don't yet use PEP 517
+ 
+-from distutils.core import setup
++from setuptools import setup
+ 
+ entry_points = \
+ {'console_scripts': ['blurb = blurb:main']}
+Only in blurb-1.0.7: .setup.py.un~
+Common subdirectories: blurb-1.0.7.orig/tests and blurb-1.0.7/tests
diff --git a/dev-python/blurb/metadata.xml b/dev-python/blurb/metadata.xml
new file mode 100644
index 000000000000..a68165db0ed5
--- /dev/null
+++ b/dev-python/blurb/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <longdescription lang="en">
+    blurb is a tool designed to rid CPython core development of the scourge of
+    Misc/NEWS conflicts.
+
+    The core concept: split Misc/NEWS into many separate files that, when
+    concatenated back together in sorted order, reconstitute the original
+    Misc/NEWS file. After that, Misc/NEWS could be deleted from the CPython
+    repo and thereafter rendered on demand (e.g. when building a release).
+    When checking in a change to CPython, the checkin process will write
+    out a new file that sorts into the correct place, using a filename
+    unlikely to have a merge conflict.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index e9a0169cb8b4..4a732fec27ea 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,7 @@
 DIST cachetools-2.0.1.tar.gz 18790 BLAKE2B 48ce160117086306f5dd7fa7d74b12cd05db76089a1b98e78fa77b81e0f99516523fcef1d43c434137689b45e988ba7471469009049337f8e4a9a8aa6bb2e2b8 SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade
 DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
+DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
 EBUILD cachetools-2.0.1.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
 EBUILD cachetools-2.1.0.ebuild 609 BLAKE2B b33430c1f7562dbef7dcf04fd96b2ef44ad29a0429c5e6b7d3c7225d3c48c464deb0da00806cba7756faa4aaac76de0b9c07adf6f97d8cd8851136ff1ddbee6f SHA512 16c1431358f652a92fe2954bfc69871a5fb5945b4ce58b3f6776be7b622006732bb1cba119e2cb97681f1aff8ea5f99b9ac8a5c2d4773f6413065bc6319a9d47
+EBUILD cachetools-3.0.0.ebuild 608 BLAKE2B 35181eef666be31b8fcb2b1597003ec940bc85b802ef4c01b17375f2cb718cdb6b5cb89157a963475dbf2232796746fc70cd50c89488380d54534cc89fa9b579 SHA512 c6f2868f52088e2d687dbed5af610eb4a2df71b603e27063650eb7dd089dbc3a908495090cce5ea66966afa7538ed9d02cde4fdefde244568a01fb9a13b55e65
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-3.0.0.ebuild b/dev-python/cachetools/cachetools-3.0.0.ebuild
new file mode 100644
index 000000000000..6970aafb795e
--- /dev/null
+++ b/dev-python/cachetools/cachetools-3.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index b3417f790195..9ad6898f9ad2 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,8 +1,7 @@
-AUX cairocffi-0.7.1-test.patch 2041 BLAKE2B 5541ba69e75d5cc0270a27e19a29683bad83db8adbacf4bb4d26b7d25ea89aec1486541ddd91f7880afbff505e64266de6fafed1ba466e0bbf1e1c1abdba895f SHA512 b9191efa17f28becb4bf1f296b80bbd63d024c80d01e4211b334953272bf27e6029bcd113c0adc17d77bf27a31b609fe51b5b9374158d6a10763a9235e57a3a0
 AUX cairocffi-0.8.0-tests.patch 751 BLAKE2B fa20431b8884762f5ebe25a59731743b8c2db1c0183eb8e425137b594fe35aeec095c85e643c35fbb3c41645b168c010dce7e0470d78c2cf07ca63ff2c52a340 SHA512 8e852c5769c726e85e8144c48fa78ba569d5c2e6d499bc92e37f5565dbebe6bcbc6e6a07ef3ecf8bf072a1fa2f83b614d01567ec198cfa86bf40a8b384462501
 AUX mapping.patch 426 BLAKE2B 9c432bd2278bfc1ea996f99f6abb07635223350bb6f1fd305d28adcb9477b0efe880f83f76c3b12cb6e0a4dd14f5e05dc69672a41da33ae89f5836c2fc360e27 SHA512 ba09a19ff80b14275db9bcec51a372779adb6b2d969a9c07c11d9ba23de094460f2a84a837add9cb1f77084e0cfb791437fcf6c9bb67ea3958d2a006969b6d2c
-DIST cairocffi-0.7.2.tar.gz 75337 BLAKE2B 9405eb6bafd0a83be2e2ae566eb9893a87bb8066c24885c955038f27357cc92e89e58998e16b2ec662559eebea6240e2e5c699d00e595fa13952e07f0264c9d2 SHA512 a4b5798ee713a8847ebd21ef328b3e0a94403ce1e80ac108f6d8e4abffbf96551542bb5c848550d82bcebb3d9f645c90ea87fc3eb254bd8e9d57b6a55db76de1
 DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fcc184f7880e86cfae0afc22c1e712ad7e835d76506b4ab0cefab6629abcc5bd86cd95c417dcc64c9374a8629110 SHA512 70179e05ca4a4efeaa39ade1ee1a96d280d198ecff5ae8c8fc634c24d8922ea6a3e1eb6cf5f55c5fc9d3f5b2fc3131a53051690eb86712762d8b6400df8a630a
-EBUILD cairocffi-0.7.2.ebuild 1357 BLAKE2B 9e57404454c2f10d5181436ac3971cef418746f67b162dac182768615713e0c1edaf3da2d9329aa0502f5f296ba3131c953a4da4058249202e41ca9d1a10c315 SHA512 aeb5df8305885f8ef3cdd129da957c5adc8776d113003d5cc248663a971d08f693bd675b3da85c057ae5ad6f54ee9e1498b499a9e6e4bd74da2d7e60300d4949
+DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 EBUILD cairocffi-0.8.0.ebuild 1270 BLAKE2B 5dc63dc5cbf1058ae8556004325a009483e9604194f77be0416e3299dc08b6cc0713b47a23398509fb865c917c3d5cc624406baa125d81b1bc989910b29bd2f9 SHA512 a25d469817a6bec7bafcc1736da49c11d0a226780a7f1630151fc180d539afc70c0d7b0e532628861dd5a874a7c6a90a9104baf7dc82352a73b558bd58dfec9b
+EBUILD cairocffi-0.9.0.ebuild 1238 BLAKE2B ce2828c89a2b9433d4cb83c7fc6a4df6922581b60b5ed702ac885ba861eb9df2e2e06c93b070d152176e899b5997c24a53a1e3a2c61afc5f3b97244e71711376 SHA512 22de34736fec679b1f327af6fa35db32a35516fe3f352701d128e85f1d8f9a42685e28586c93f4da06736306ebb8a919e94299b199da46501f3a8c88f5af9a3e
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
index 25ff30599269..7291340fb126 100644
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 MY_PN="${PN}"
 MY_P="${MY_PN}-${PV}"
@@ -16,13 +16,13 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=
+	x11-libs/cairo:0=[xcb]
 	x11-libs/gdk-pixbuf[jpeg]
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
@@ -35,12 +35,6 @@ DEPEND="
 	)
 	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )"
 
-PATCHES=(
-	# Intersphinx cause the usual d'loading of objects.inv from TWO online sites
-	 "${FILESDIR}"/mapping.patch
-	 "${FILESDIR}"/${PN}-0.7.1-test.patch
-	 )
-
 S="${WORKDIR}/${MY_P}"
 
 python_compile_all() {
@@ -48,7 +42,7 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test -v --pyargs cairocffi || die "testsuite failed under ${EPYTHON}"
+	virtx py.test -v --pyargs cairocffi -o addopts= || die "testsuite failed under ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch b/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
deleted file mode 100644
index b5a2b4530fb8..000000000000
--- a/dev-python/cairocffi/files/cairocffi-0.7.1-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- cairocffi/test_cairo.py |  3 +--
- cairocffi/test_xcb.py   | 13 +++++++------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py
-index 6b19ee1..542103d 100644
---- a/cairocffi/test_cairo.py
-+++ b/cairocffi/test_cairo.py
-@@ -1049,7 +1049,7 @@ def test_font_options():
-     options_1.merge(options_2)
-     assert options_2 == options_1
- 
--
-+#@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
- def test_glyphs():
-     surface = ImageSurface(cairocffi.FORMAT_ARGB32, 100, 20)
-     context = Context(surface)
-@@ -1064,7 +1064,6 @@ def test_glyphs():
-     assert 5 == x1 < x2 < x3
-     assert clusters == [(2, 1), (1, 1), (1, 1)]
-     assert is_backwards == 0
--    assert font.glyph_extents(glyphs) == font.text_extents(text)
-     assert font.glyph_extents(glyphs) == context.glyph_extents(glyphs)
- 
-     assert context.copy_path() == []
-diff --git a/cairocffi/test_xcb.py b/cairocffi/test_xcb.py
-index c8a6e70..0c6bab9 100644
---- a/cairocffi/test_xcb.py
-+++ b/cairocffi/test_xcb.py
-@@ -118,14 +118,14 @@ def test_xcb_pixmap(xcb_conn):
-     gc = create_gc(xcb_conn)
- 
-     # create XCB surface on pixmap
--    root_visual = find_root_visual(xcb_conn)
--    surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
--    assert surface
-+    # root_visual = find_root_visual(xcb_conn)
-+    # surface = XCBSurface(xcb_conn, pixmap, root_visual, width, height)
-+    # assert surface
- 
-     # use xcb surface to create context, draw white
--    ctx = Context(surface)
--    ctx.set_source_rgb(1, 1, 1)
--    ctx.paint()
-+    # ctx = Context(surface)
-+    # ctx.set_source_rgb(1, 1, 1)
-+    # ctx.paint()
- 
-     # map the window and wait for it to appear
-     xcb_conn.core.MapWindow(wid)
-@@ -157,6 +157,7 @@ def test_xcb_pixmap(xcb_conn):
- 
- @pytest.mark.xfail(cairo_version() < 11200,
-                    reason="Cairo version too low")
-+@pytest.skip("https://github.com/SimonSapin/cairocffi/issues/65")
- def test_xcb_window(xcb_conn):
-     width = 10
-     height = 10
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 9034d4e8a257..d7700be9c5ac 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,5 +1,5 @@
 AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b997642ee8bd0d4c84b168f32fd9b6427be3c889af411806d37673853588999d366b549908891491bd6e SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
 DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
-EBUILD celery-4.1.0.ebuild 3548 BLAKE2B d63ef4c0ad389e3fda4129a3aa3585e270576c3fbb188bd18a0ea317e73d56f96fd9bdb7ea222edaf0769d2ce3065643945f07c364fc9f789cf67730b8e23338 SHA512 500a9d935eed669c4b2b20bd64f384d8bedfbdd0bcf9b243c3fa7124484d788c23586ea9ee4ea184cfe33d69590b7533595087daf8820241ecd376830496f43a
+EBUILD celery-4.1.0.ebuild 3474 BLAKE2B 128aea5471d2703a1fa4dd3fbd14d6e7040dc97c835f16160a3282ddd0c40b42147e08d05eec0666fcad442c6fd5ff0632dedd092a09176efec10c5bbff00e12 SHA512 000ee77e927cbe8a3059f298ea56c54d584c0ffb1818b0e95c23834db339f9733507184349e5b4a9748d7b6a0b88e8227337da4657266d5b1c4d8360dec2c7e4
 MISC metadata.xml 528 BLAKE2B e7c57658c1e2d86d4f437649706c340148e6c713e7e1fa8fae06e60afb332562683bcef6f4946555664a1d1a916857addb1e3134c49edd20245fbee58468eab2 SHA512 73fe8a564452f48193e92c3c72368868fb0a6c4ea54e836ac91547f8acd190a4c653b6770f36fb645b4aaad86ed720a4cf4793a8cbfaf3188ac297708508d59d
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index 62a6904ff539..aef09cc0fe2e 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -95,7 +95,6 @@ pkg_postinst() {
 	optfeature "eventlet support" dev-python/eventlet
 	#optfeature "couchbase support" dev-python/couchbase
 	optfeature "redis support" dev-db/redis dev-python/redis-py
-	optfeature "couchdb support" dev-db/couchdb dev-python/couchdb-python
 	optfeature "gevent support" dev-python/gevent
 	optfeature "auth support" dev-python/pyopenssl
 	optfeature "pyro support" dev-python/pyro:4
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index b1cad34e1cde..dd7999d68b0f 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,4 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
 EBUILD characteristic-14.3.0-r1.ebuild 1054 BLAKE2B de5b2c602cc1e85c71a274aafa46faf7672f50aed7aa6c43b465296d3e84a4d5efe86617f8f8cad064aed15f63c99828e1308a6f6252763bd321c4ee9d5de20a SHA512 1399f0ae486977f4abc50b4b0c011bcff8cb69e469d64d7f11c9119a13cb79a9a93a12c7d4697f283c3bd4f73855b6d47edf115424369c456a38bdff3193058f
+EBUILD characteristic-14.3.0-r2.ebuild 1066 BLAKE2B 264d4a0448f1791087f6f782c37ca348c80cb181156b3095ef91d9e79f6533e177c02c20b3223081ee7d9a48182163d7ce4ea4c8c2919741229f638ec00f8a30 SHA512 afdb1d54c922d83cf3fd747b6098acc5948f2354ded324308c73c773e324e846651e5347bb89384d299e8fd27f5135037a4d00e1f2f65750a0bc8c8adaeec3bd
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r2.ebuild b/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
new file mode 100644
index 000000000000..c13a2266947e
--- /dev/null
+++ b/dev-python/characteristic/characteristic-14.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python attributes without the boilerplate"
+HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
+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"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 994095fcfba8..0fc46084f74c 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,4 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
+EBUILD cheroot-6.0.0-r1.ebuild 925 BLAKE2B fc16e44b0f555c2e7e04ebdfa2fdfd9bd3f10f1e1efb23c38e5d8518da40db858d0c27d26126e70c51fd60143917c59fbe40fc45a0068a4aa1327706f79b63b9 SHA512 a8818fbc5af9b63e08a10b731cd11be8bae70282b2245677e3c96d4eeb4f90fb100f903267c33ddbcfb9c07da7631ce954bc84d74d1a33504a10c5ca53600d64
 EBUILD cheroot-6.0.0.ebuild 931 BLAKE2B 53039d511b8884510ee22cb0f3cbf5c16bebcc2b1348deaa87af4b63cbeadd6f51e4110798c9669f286feef48b2bac678e2ca69cee6932f14d2561d655400c3a SHA512 5fe1f6b1eae632109fb51095a0e402acba031ab1ca90ace501d5da0b0ed3b86b6a2d6a7b80e6a776f27f28293f7538aaa3576aa40e683f74773bcb36d4ec0edb
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..8c5c6283880e
--- /dev/null
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
+SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPTYHON}"
+}
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index adcbb396662d..c0c76caae4ab 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,6 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
+EBUILD cherrypy-13.1.0-r1.ebuild 1310 BLAKE2B 1619274c955202e6c22dbba3cbaf3bdd6c3736063b9e4659b393906d24debbbdebf548b9592c719b46c70392f09694a7b0dd4a09b0bacf3b87cdf40966e933c8 SHA512 939e7f71d2cbbd383d0cdcdee07f3fbf1ac8a4c5197985cc4bb5c80cfd7e999cad28682146e1a0ceb858fab1f7188585603521fe7e9d9e9436ff85bfd0b3d029
 EBUILD cherrypy-13.1.0.ebuild 1315 BLAKE2B cda7c4bb1e448d6c3b90f29fdc2b922948f11f95093802a619c7cefa4c2801cbee43c68d84cad05b12df58595980c8ee577828215cc782259ba617f74822886c SHA512 838c526451084177255f3aebc423de00a97daa670b88ab3dc6e69441d05be5757f1211d02a3dbf7c312ddb250815e2fdd9d7f991120b96eba3852d492bf08a7a
 EBUILD cherrypy-3.8.0.ebuild 1658 BLAKE2B 089308d96b63adf0e0563f0d4648290ab16998b0359c6802c803f85e147e604aebbe379884eebfec859035d54a96df57ff96967f73ad41929eb6088373237898 SHA512 04ab8e0a5b192bb61f926e9a0eb1bf1f52444f4899b963c21b6557abd79740766ff60510bc51292e614700893298d7989eb3e05fe85377a090d3651ffa04e3d7
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
new file mode 100644
index 000000000000..e83a1a913f65
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPTYHON}"
+}
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index e6f3af3876c4..5819e83fa929 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,5 +1,5 @@
-DIST chump-1.5.1.tar.gz 9370 BLAKE2B 28c7280aa0fa3fb81a4981ea3892533eb0af6f1655c41bdf8f250ea78806eac7b3d5f21143af83f22b8063913185e77774eb7be2b8ff2bbe5371c690f726acb5 SHA512 778e043e4641b433a03860f1b1b144cdd34d0f79fb20ec0801cea1e1473eade8dd5211ffca391a57eb1f01456ec33cef4db6359839e7e39eab169411d00471e3
 DIST chump-1.5.2.tar.gz 12920 BLAKE2B 5fde4774009ebda37e7a9f9c9cfedea3d4e19a9be1aeb165dd867a8ec8cc69385855c22763bc822d3a65d76c70cfe7ef41e4761319dbfaca9587301570765a8d SHA512 6b836bac1ab38c88084f9d6608a9ed88b305847faabcf5de6c13d587e91dc92b21334877cb9290dd56873de40be92f31f2bab3a345c7a7e62259004f5762cda4
-EBUILD chump-1.5.1.ebuild 419 BLAKE2B 4584adc7eff2f07e83815579dab491a2ea8ae7749d7631a1275f3092eeaae19f173cd36cd3923c8ce66167825846c00e736f3ad3962acc84c2c9805d98aacedf SHA512 8baaa8979f9a129254de02747d06f8300def23aefdeccb1a3c10c68eec07f996ccef683aeeb1ec5006c4b5704208b519dbff4f430430018d07dc322f875f96da
+DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
 EBUILD chump-1.5.2.ebuild 1078 BLAKE2B 383c5d6dddfa8b4c57fb444fba3c67dc0deb11da45b1a3f9ae93908a5cf096d0282c5e917dd0363a756a3d1d26eb837fe06a161b02f98c2b848f830425c75426 SHA512 4f252f7e6f749c3f15d91cf34f10a9ebc7119fe32461cca2d6c27cc34dbd5bb8d32ad094c78e47982fa46088b6b3418a0c8adf05b4ac2f69caa67b52c7190389
+EBUILD chump-1.6.0.ebuild 872 BLAKE2B 2928d175dc32fd7fbd6423b95a201b871fdf29e7dcdbe57e6e07da40f1b9a17706e9321fa931bdcfc147a9ecc976a22fbe1bfa0473e3636d3a21b4051a5669c5 SHA512 2a1bf8bb2d57bf044b069649129167a642502421853ce55db5d142d31126fb663800e33d824d5e31cee2e0b2995fc0503c506d349e1839ef7d6ec8930c799580
 MISC metadata.xml 518 BLAKE2B 126300d60995a32912c84d734b465bdc4ad7f4569aeeae7674325dbd44c177431dffb22e05341cc50e8ac0f294617c64c18c11e3b5f7bfb17eb083f48f06ffdc SHA512 bf56b4200d946208832b539649d18f450da83e2bcc31bff902ad8793fb27f823e2e4207175cc13db3ae49f1862b5889a36fa06d27ec412da647cbdb2c4286604
diff --git a/dev-python/chump/chump-1.5.1.ebuild b/dev-python/chump/chump-1.5.1.ebuild
deleted file mode 100644
index d30f5ec3555d..000000000000
--- a/dev-python/chump/chump-1.5.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="API wrapper for Pushover"
-HOMEPAGE="https://github.com/karanlyons/chump"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/chump/chump-1.6.0.ebuild b/dev-python/chump/chump-1.6.0.ebuild
new file mode 100644
index 000000000000..8ded5413a5ff
--- /dev/null
+++ b/dev-python/chump/chump-1.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# PyPy is not properly supported:
+# https://github.com/karanlyons/chump/issues/17
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="API wrapper for Pushover"
+HOMEPAGE="https://github.com/karanlyons/chump"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		# Force sphinx to use the standard theme
+		READTHEDOCS=True sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index cb1a48924247..2af44b9fa915 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,10 +3,12 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.0.src.tar.xz 12541904 BLAKE2B 92ecfcb37e7efb4f3dde275e7a087a52f1ddc607bee78fd222f87e6391ab7deb9a4e761c05e405126f46170fdff04aeaf9bd1e886a326c92a064ca81be4e6f21 SHA512 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7
+DIST cfe-7.0.1rc2.src.tar.xz 12487728 BLAKE2B bba0f7751106ac0438b5db9cbd0e0c5d2f3fe35255eb49cf4ed6a8efbc7e8be3f8263f0d663a739409232e591ab74e7b0abaf4cc1df0d7605db913eac0a085ba SHA512 2e178f1829edd6a7a0f0919358adfe0a88fc8a83b629bf64411cb33181df43b48bf47057b6c3bba95ab939998f7a8db05717bc1e58f175c8dae5df881c88d48f
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
-EBUILD clang-python-7.0.0.ebuild 1278 BLAKE2B 0a2585c72ea4677a34886063d389fe11b89c27ca458e7b0814e5f181bb716e1385057e7a4a2b01ff337d98d421c64a04f5aaef805c80f1d0e7f36aa3ff29868c SHA512 7c6158ff08a0f46e3b5bf3aa968be8336c28040e51d1f4d88d68ff05bf8941088f5154595b2e889b668f7060643cd2b98d4e25169ed909e59a9e40007985f5a4
-EBUILD clang-python-7.0.9999.ebuild 1236 BLAKE2B 7ef1a49beda02ec169fb0d85606a91cc422485b06b52f4b63599b9b55303749ace19a5b25e1b95e4afc3f15d44c02b211a805077d20cca102cd76ebfad4858ea SHA512 091742af56e14d2ddb284a1d3fdc126c66fa2f309121be5927bd266e185f840ad19e2e07ca077a10c981e1ca3e342f33d9751386e410ae2951e2c8bdad5b7a5a
-EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
+EBUILD clang-python-7.0.0.ebuild 1282 BLAKE2B 1388b1521c6e8d965ea35450e8da412ba51dbca8b8a2f49a52abc748bfe124c88dce8608fcc0d82c1837b6cc648c267705242e207d2ef2d7cb5247d1ecda77cf SHA512 fafa8b51a6b8d953c3abdc589f0e03c0455df1a69222312b012076817738b96db4bdf6311b4fa52c9ef0874257c27547da80e5d7c40541ea87241e266ceb3bb5
+EBUILD clang-python-7.0.1_rc2.ebuild 1285 BLAKE2B 85ea303b42fe5dbee5b4494df3277d32e5ae72038e2417b98f4551fa57abf5c03b42f6a8812e43d1ff24cd97c3b4827a1b3785062c4184801f5a8caa86d2442e SHA512 30510dd9c747fe7ae416d3a9929c05d7e09c38a4504aec92d6b2327e4765db900a451aba2df45c9e8852adaa3d6d0555cd6737ef4c6ade95acc23ed402ecbbea
+EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
+EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-7.0.0.ebuild b/dev-python/clang-python/clang-python-7.0.0.ebuild
index cb4c02ae7491..72bb446b4911 100644
--- a/dev-python/clang-python/clang-python-7.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit python-r1
 
 MY_P=cfe-${PV/_/}.src
diff --git a/dev-python/clang-python/clang-python-7.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-7.0.1_rc2.ebuild
new file mode 100644
index 000000000000..02fc25d374b6
--- /dev/null
+++ b/dev-python/clang-python/clang-python-7.0.1_rc2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+inherit python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+PATCHES=(
+	# update completion test results due to completion changes
+	# https://reviews.llvm.org/D50171
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
+)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-7.0.9999.ebuild b/dev-python/clang-python/clang-python-7.0.9999.ebuild
index ff42c58b9e72..f9c2cc23c665 100644
--- a/dev-python/clang-python/clang-python-7.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit git-r3 python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
@@ -31,12 +31,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
-PATCHES=(
-	# update completion test results due to completion changes
-	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
-)
-
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout '' '' '' bindings/python
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index cf488945799b..de5bd6158d7a 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 inherit git-r3 python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 230a9a9d8af3..b8bba1db941f 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d9
 EBUILD click-6.6.ebuild 1192 BLAKE2B 6506d88b1792f1a1f5107537a8ed73c34bb4b8dd87b27036df1fa6945f0359ec3482d4a7f33f2c78f3bc438bd534d4483079d1eacdc274f9f64bcde43ac8e91e SHA512 9523bcfd4ac931ab76891ed4a7409bc1f9df8a78a5f180aa26e47fdbcf23989f5854534c0440ae1aabfa07f0186236001f3a5c40e997d8582283990369d75272
 EBUILD click-6.7-r1.ebuild 1411 BLAKE2B a3a7ddead3e59990b4816ff70a2b21f54f1365ad8894da5577eb312ecf9f2d187ff6184176064d04d19ffcfda50a36dc850b066ba0c9de91d5d42b3378a5203b SHA512 626698fd9c56d08591dee76d8b5f525e16ae8bc708ec460b1a24782ec7e7442b35a1ed1d4f78a6598829e296fb312535715395991a0c9021b76b75343fd29575
 EBUILD click-6.7.ebuild 1299 BLAKE2B b06ef47d14e3fa73a2392febdfce4b1de139a7c26262122bea89e402e0a4c8a8c861a6190ca852e4b721bc97b772a760a5583c91f4625c2bc40ec7ed1989d429 SHA512 347af3d728b0ae9c766880daf863eb2da95d6c94aa71cb93fc3402aa4e77105cee2841d8f1d5c769379c22dc351238f827c36c3728125515a4194adae474bf0f
-EBUILD click-7.0.ebuild 1087 BLAKE2B 6f003f4f3d8eb4167180bec2ac155b02f0028abbc78ba661b6f220621d6b1aec3e5a638c07ca6e87c9e684e898dd7b39d039de37d522169c30a84d52d582cdba SHA512 2c9468b064cf48504f917531b652606af6a8d4aa2b2a8a3126cdba719c84f41c9ddfc3d983aa64d11eafdc90334d852cca85aaea10fa412f6ea9fc81bf7e92f8
+EBUILD click-7.0.ebuild 1094 BLAKE2B 7c0103fd985d725e49fb892a6e92f0cc0dcca276c16983e1bc9fe31a28377560558ad7155352b9d0de876e678aa0f39f347108b6566358cb3b8935fb2178f06e SHA512 ffe2119d347ac1d3e2d38e287c272d5e0488f3a58c0cdb1bc4f33f3488ccabc4fd5ae9029ff16620865960781dd4556bafe8b241287718cd95179b72189011d5
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 3bd51bbba834..32536a2732dd 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 48777aede425..e61584f6f67d 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -3,5 +3,5 @@ DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 EBUILD commonmark-0.5.4.ebuild 816 BLAKE2B 4623bcdc238c125819bf1abdc13d5784fa38002ff745d295b8570008bb265d60f5958de44ec7afa324af5bb3676fae2288881f1592863fb15a5f994916dbec84 SHA512 53d96ed5ab173d09aafc4a5001704f1bd29d5c3b9d20f8df9712a570504ccf24bdc75526c9f1b988bd7d5b46e7bf936838efecbb92d50c6e132ed1b033ce7879
 EBUILD commonmark-0.7.5.ebuild 1072 BLAKE2B 663fb0549b8dc91e3324db235612c655f28d0edcb50a9af1bb5e0bd8ddb34b3772cd0aa1901efe564cb1175f444a1f2a47c1f529f8af84cae8f5da8c21accd4a SHA512 68857c0969b7be6e7ae489cf63abdc77063b5368760b6aca4149733bf69bc2a3507664ad55642bf13203a0a79346f0a2745505d7eca901a8723b11c9a4be6b12
-EBUILD commonmark-0.8.1.ebuild 1007 BLAKE2B 68c878ef1e905b304632d22d5410646050e6274f5912c40b33b1e4ed6f72d1fef953da0978581687abfa658ee758a8a1982ddc41aa34d73adf46b193463a35fa SHA512 add7c716dde421b719f23ebe881e2833a322be2b50e2490556c50f05a223bec2c2f1e37def7c3442b7fc6c49e5eb982b27d44151fd5c30af81791421843acd50
+EBUILD commonmark-0.8.1.ebuild 1014 BLAKE2B 4656a06c0b161b37800d838fd28b54a846b656364b77e7b7cfefb6a746f72bf5b9b67b9b213c53cb1840ac5c103fd8863d7dd9af858183a184efceb5712f461a SHA512 9096bcf7ff24b7212ef458e25f1e13dd5daf61b94a31f7c17a5aa9808c428ff068302e480737bcea90d4991ce417843e6f4b0d262867e20453660b0fa73a8180
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index 0b4c79bd0b9b..b14fa147b3e4 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index edc0aa08b7f3..dc5c40b5dccb 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,5 +1,6 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
 DIST cov-core-1.7.tar.gz 5972 BLAKE2B 0f1304722ea590ca6331be85413dcf614a9a4584101824e68775a0fbd41e82d92d5dd74115bd525e155937fba710201bd184873caf79c5f88a4bd10cefb5d848 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140
+EBUILD cov-core-1.15.0-r1.ebuild 644 BLAKE2B c0394931cc41f7aea51994660913381fc62e11efc50f4df63417cf253cb148543f93c4dd9f9b1f1af6ecc346fa0a412e8d98ff84b3964a06e915963058246fed SHA512 db2f08deb80a01cce0da89a773c4d8f115f600691a1f251e6ccb5ced1fbf3bdf8f773d6f7fca609aa150b0da700f059454731d3ca1c5d57a2d87b5ed2a47295f
 EBUILD cov-core-1.15.0.ebuild 632 BLAKE2B 8989748c9166d198b934e6900e4d7f4b8324d19aa57b3aeb8e29b1c2c2b103e00512b6f4a0624fee3140021d1ef6794addc5e96cf099d500d76048ff8a6377c9 SHA512 cfac3460dcd29e71c993423fdd7a8d7f3d8cfaffa0427690f6b90baff7700d5bce135890bc331356bcbc93488f1a9aff254a3dc113006f176de2f3c0329dee3c
 EBUILD cov-core-1.7.ebuild 539 BLAKE2B d9ab62eb8ab51d4676588d92fce5245ec500e65b6d07d3159f1aa2c115115158150a2d0839ad5b4c6f7f015fe1b635e6fb9b3a1ec7c1c73d21ff39bf14b70530 SHA512 0eda3e44548bc3124604ecb640f0f5c3c29b89e7d1836c3a5689ba2229803b4ea5dda521033c23b5b134a9d958684e2ef97af6c77e37abdf313a988b0ec0726d
 MISC metadata.xml 393 BLAKE2B 087b56c47500bbecddabad8a768033971f29215be751378ccc272f46dc3aa2b4cd14a6ef101989a12f3b540b792a407dab5f4e65ea5cc619f3fcdfd0b596da8b SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc
diff --git a/dev-python/cov-core/cov-core-1.15.0-r1.ebuild b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..4c56dcdd1924
--- /dev/null
+++ b/dev-python/cov-core/cov-core-1.15.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="plugin core for use by pytest-cov, nose-cov and nose2-cov"
+HOMEPAGE="https://bitbucket.org/memedough/cov-core/overview"
+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 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index e533acaeacef..45e062882076 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,5 +1,7 @@
 DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034ef51699ba9ab7381e5baa28f0f062ecc8d6b7b5849ac4d5426c41768e1a4fb9462f84d7e22476ec64dc0bd0142a799caaf95eafb SHA512 bdaf53c8087d6c44fcd3ab54069d1d45b60ee80d98fd813fe180b9e88272203b5dd2abd5fa6dcd3b4ce9ec3215997fd8e99e63309e2f0ac619a6f72d552afff9
+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
 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
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
new file mode 100644
index 000000000000..a23516e2307c
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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 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 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-linux"
+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 0f77d9d5c95b..9e1a12c60629 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,7 +2,9 @@ AUX CVE-2018-10903.patch 3641 BLAKE2B a426705cfcbc9ba4e3ffd662610b7a27c7afe52dff
 AUX cryptography-2.1.4-libressl-2.7-x509.patch 1005 BLAKE2B 9c01fe0f9c3c8c598388db68f68470b953b4a8e79dba8c1d3c6ce56486a93f340101a58db8771fa1adeaabe430d78acbb6723da597b8b114416d676022b989d4 SHA512 fc58993b3dc86990194e03c7cc4554d83260b243913d77b3743fe1f9fd0d21985ee849c6b7f7fc158c48b75505e8e8a9adf090b9c7ba40e12b09b3c020e50afe
 AUX cryptography-2.1.4-libressl-2.7-x509_vfy.patch 3419 BLAKE2B 89642459484d42958aec818c4196eff35991ba415c76ee1f43c0765b1a9687c6b405f31322227eb132309439aa8d7ee5ed6df7ed07f640e4eea21c6e97fde858 SHA512 e941b89924d68b1d1dfe8e64a4f7ae363ccb53fd232a3853d9ddba0a7aed1dc27fb8d699e9197bdd7ff0b1780c1f12edd2edd4133f08e2f7f13348b170985a4c
 DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
+DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
 EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
+EBUILD cryptography-2.3.1.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
 EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild
new file mode 100644
index 000000000000..4af6a76f62db
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 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 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})
+	>=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.7:=[${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/django-extensions/Manifest b/dev-python/django-extensions/Manifest
deleted file mode 100644
index 6a011a176653..000000000000
--- a/dev-python/django-extensions/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST django-extensions-1.5.6.tar.gz 404366 BLAKE2B f5b9937df31401e6a971ed677df266d187438a778acabdf4d73e68ada1800e23e67bdeaa9bf212b759f7c33bb0d733c7a40dd8acb44ef382d1307cdf480c1287 SHA512 4925f1b3a511e554e160b183bab5f6396d7af4c7a4862c01b805fde296de7380416f578f2dc4cfce03b563ed310ced046a9107a688a0e2df382d559a6b0e3615
-DIST django-extensions-1.5.7.tar.gz 404240 BLAKE2B 5af9a62d59148c0385381f2d8eb2f8ee41b42c9ac39e1ddee3953f7fd8d08f90f0ca3848db4049c2245dac3bde31be39af744f039bdab721b439b26cbb496682 SHA512 5a22fb073d89b4dd04b1fdda83928c9e560511252c13652dbcced0ab678dc0f86482662ac63ec98ab5cd12f443c0aac3debe91ed6cfc139ae030cae64d3948eb
-DIST django-extensions-1.5.9.tar.gz 405401 BLAKE2B c7abe596adf8dfd37103f6460b506d7b0e669883ab8f2170dea1e37b8c39222685de153c608062ab83321b3ed07dea0ae9ca80d30a41c65519ba0ce063b35974 SHA512 6887df5406e74201fec0adc674176810fcbd93ef249b5433a38c9c783f5e23dfd384649901bf7dc8aa8f04accf731024887cf95fd335982ec84b3d4261a9712f
-DIST django-extensions-1.6.1.tar.gz 371907 BLAKE2B 751e2a98fbb2b422687e8cd8fccf381bb21c182046319b5b7ab25bcf491ba04d847969ee982f9d01ce8091bb3320201ccdcb9aa13213a2c92def9a8b91da3e92 SHA512 c16b99e64f4faaa6034ab343a44488d031fcc0e2ec4fe78c7cc426dd810988ebcfa28b8bcce6054188fad3fe2a30851d6df4968aa9518e540208e1af0089c6b5
-EBUILD django-extensions-1.5.6.ebuild 1722 BLAKE2B a1ec4e1251c6ed2655cec43d170390c316e630090a32d0109203b8261dfe331e2d31c6a020db50fd09d764569a80e522858cba5a326c81612596f73ab044b526 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e
-EBUILD django-extensions-1.5.7.ebuild 1722 BLAKE2B a1ec4e1251c6ed2655cec43d170390c316e630090a32d0109203b8261dfe331e2d31c6a020db50fd09d764569a80e522858cba5a326c81612596f73ab044b526 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e
-EBUILD django-extensions-1.5.9.ebuild 1722 BLAKE2B a1ec4e1251c6ed2655cec43d170390c316e630090a32d0109203b8261dfe331e2d31c6a020db50fd09d764569a80e522858cba5a326c81612596f73ab044b526 SHA512 4fc2d2f8551aeb22a2383825c417791434fde3aba2be675d571e2d5006d28ed1340514021ac313aa80c0447499231249a15377382ecde807e734acf6c26c140e
-EBUILD django-extensions-1.6.1.ebuild 1728 BLAKE2B ae5aedf15e74a9330f70eed735467041b50a6966eccf0da1e814813bee04a7eff787cc92b6c0b6bf12e655b945df32cd90125796fd08f5be091c012792627968 SHA512 5ead24b9d28206d9ab965855c5dba08eabe894d7704149b88bda1ea29d11d98f33156da47d77d1e00e928856701c215d02b4755327c05247bc29f75908df8ecf
-MISC metadata.xml 417 BLAKE2B e68c6d98550bde57873b670587eba01e71b153113a96583c9d80c57a39e1f53ef37017a33218dd5582f6dc16db919de40b578721c66928873e170b64ae5ca8b8 SHA512 c1989d806df2e1b9f9e12c7e8817032da3ee208b24bbe3c8c5c09064bd84bddc74433a4998f793a25ba6903ff697bd442a9143a3f460c3df67822b7c19a965a0
diff --git a/dev-python/django-extensions/django-extensions-1.5.6.ebuild b/dev-python/django-extensions/django-extensions-1.5.6.ebuild
deleted file mode 100644
index 28110b301a0f..000000000000
--- a/dev-python/django-extensions/django-extensions-1.5.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Django Command Extensions"
-HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD || ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT=test
-
-RDEPEND="
-	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-		dev-python/shortuuid[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -vv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	echo ""
-	elog "Further enhancements can be achieved by installing the following packages:"
-	echo ""
-	optfeature "Use ipython in shell_plus" dev-python/ipython
-	optfeature "Use ptpython in shell_plus" dev-python/ptpython
-	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
-	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
-	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
-}
diff --git a/dev-python/django-extensions/django-extensions-1.5.7.ebuild b/dev-python/django-extensions/django-extensions-1.5.7.ebuild
deleted file mode 100644
index 28110b301a0f..000000000000
--- a/dev-python/django-extensions/django-extensions-1.5.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Django Command Extensions"
-HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD || ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT=test
-
-RDEPEND="
-	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-		dev-python/shortuuid[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -vv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	echo ""
-	elog "Further enhancements can be achieved by installing the following packages:"
-	echo ""
-	optfeature "Use ipython in shell_plus" dev-python/ipython
-	optfeature "Use ptpython in shell_plus" dev-python/ptpython
-	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
-	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
-	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
-}
diff --git a/dev-python/django-extensions/django-extensions-1.5.9.ebuild b/dev-python/django-extensions/django-extensions-1.5.9.ebuild
deleted file mode 100644
index 28110b301a0f..000000000000
--- a/dev-python/django-extensions/django-extensions-1.5.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Django Command Extensions"
-HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD || ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT=test
-
-RDEPEND="
-	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-		dev-python/shortuuid[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -vv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	echo ""
-	elog "Further enhancements can be achieved by installing the following packages:"
-	echo ""
-	optfeature "Use ipython in shell_plus" dev-python/ipython
-	optfeature "Use ptpython in shell_plus" dev-python/ptpython
-	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
-	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
-	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
-}
diff --git a/dev-python/django-extensions/django-extensions-1.6.1.ebuild b/dev-python/django-extensions/django-extensions-1.6.1.ebuild
deleted file mode 100644
index ba406de0a4a0..000000000000
--- a/dev-python/django-extensions/django-extensions-1.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Django Command Extensions"
-HOMEPAGE="https://github.com/django-extensions/django-extensions http://django-extensions.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD || ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Req'd for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RESTRICT=test
-
-RDEPEND="
-	>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/django-1.5.4[${PYTHON_USEDEP}]
-		dev-python/shortuuid[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -vv || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	echo ""
-	elog "Further enhancements can be achieved by installing the following packages:"
-	echo ""
-	optfeature "Use ipython in shell_plus" dev-python/ipython
-	optfeature "Use ptpython in shell_plus" dev-python/ptpython
-	optfeature "Renders a graphical overview of your project or specified apps." dev-python/pygraphviz
-	optfeature "sync your MEDIA_ROOT and STATIC_ROOT folders to S3" dev-python/boto
-	optfeature "RunServerPlus-typical runserver with Werkzeug debugger baked in" dev-python/werkzeug dev-python/watchdog
-}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index dc5895f8fd44..5a65d33b40b7 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,7 +3,9 @@ AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fb
 DIST Django-1.11.16.tar.gz 7852514 BLAKE2B a881caa6c31c80d6b0146cb49a08ba63ebfba21637747328adb8ec3afada2182b72c46576a79cc9e163546e5b980a2be516d842492517319deb0a4f5512ad605 SHA512 bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455
 DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
 DIST Django-2.1.2.tar.gz 8611286 BLAKE2B 5107fd04ee11ae4ded3d8914d840e323e26617b526ab877654de08caa6ce1cb6f053d3afbdbdbda17ab26b1ed1bcb158ef092a63ef14393b87ed98e612cf43aa SHA512 3510f872762e75c7e66987857616d958d15bef91ce2d9e1656abcf4e0221b1c6ff72c59fd29643aa0b0288118db76d58023cffe48f401e7cdcd03d71822a282d
+DIST Django-2.1.3.tar.gz 8611851 BLAKE2B dc0c2bf994ef883d34d66d3d0f4e77d20f5a25671053831e4138e5431ec7ec8c89ba64d7ae4a58e034e01093276cd61a2d833319d28283cbd9ad8d6ae4b9b2d4 SHA512 b83732d8c0230bda0a29db92acd3e4e7531f9adb3a0d10f37c40288c08ccaa5d7d49184bd5ea000b991eaf8a196b317648c200c147a6e8f503ce42189344cee9
 EBUILD django-1.11.16.ebuild 3223 BLAKE2B b5354d00a4818503a709876413d4c7e5c0314d21cf702785538fb94fe8b3e0fb74abaafcbba00f3ddfebe6b533e25d6dc95eb3589c89dca4864127b080a4e8d0 SHA512 b68e22449b008c8ad9f40bdf3d7aab31fa48b533b055bd2c6d59b603b82905e032f44e00eeec7907d6b566aa350efd6a4816504e4ade5f5998a8d6f42304291f
 EBUILD django-2.0.9.ebuild 3054 BLAKE2B df9058fcbf257e52709db580b2000fe5189432745582c782574ad562993c2848f33a7d15fcaf79487281509c6c20a1e903acdded0b7bd4e2aef0061759532b46 SHA512 0367e645c71e7dfc51308b3c7a9e4d211f8591bd82557a5fa61715219ab5573e804a046b212d7c89d3848a574823c1de16d7d08bbc77264d4bcfc967ae4e95fc
 EBUILD django-2.1.2.ebuild 2489 BLAKE2B a5fa9e5c8b327c68ec8d5cc2a254e265f0d25ac2e58e5148d6c2e4a4d88c96797afefba176afedf404667ed35cb11f1f7a05b8f0d0c1f918ad5eadb014cd537b SHA512 d31eb055c10c1441be1ac99bc2f29e4e2bbd3340285fea7559e247a0d7ce01d95b38cc2507e956760668a503ebbf9721419c9243cbf5c1d431060acc4f2e2f58
+EBUILD django-2.1.3.ebuild 2491 BLAKE2B 231d4a75de6fa479473deee6a8158117a57c6da608fa4e0d6aced990aacea8e058db901a0dcd246b27485894a2af054015bb885329596987600f9c3a032c0c6e SHA512 ac600d1d5b70822b5a39cbaffe742417cc28afccd9f619d1e2011e4bd86f5c7c1eca1eb977053ad4093db25ab5c189ec4ecf02e09d037bf5ad73d15a7cf19547
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-2.1.3.ebuild b/dev-python/django/django-2.1.3.ebuild
new file mode 100644
index 000000000000..89d87db8de42
--- /dev/null
+++ b/dev-python/django/django-2.1.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 27b083e99bf3..05ccf2c902ac 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,9 +1,3 @@
-DIST django-polymorphic-1.2.tar.gz 100149 BLAKE2B ac7e92e113b595009d350282504845b6ba179549f555c523446ecf8a69a6915e2eedacc35e30333ac3579581b33528d0b7d5bf8ab6a900180c7f209cd1277fd8 SHA512 71d7293b5eb49ae49801d5d3e60af7c9bcb8729237fb92016dc14800c1955cac1ae5a9029a1d37048cdfd7200e1ee38d15e13859345b1032f202ff90f75fd325
-DIST django-polymorphic-2.0.2.tar.gz 99541 BLAKE2B f785eb0d63b79521c5dd1df1dd61ef5b5b560a67337e2d647bf56bea4524129074ab9766231c516397763152ab88c15fa35ec1386fd64bb725e93cfe11418cd3 SHA512 5790526debf68ea39b2cd578d33b0a5d715e7a5f20f83108a0fb26df956ba7b3bcbb10f67608f60df13d62f86efefe0152af7d069ca404b1b92fc9fdf71ffbd0
-DIST django_polymorphic-0.7.2.tar.gz 36041 BLAKE2B b878ad08b6ce85efb7801e4c7506e75fcae47f439c130c0457d65c60ae265803d4dd588061430ae64e0e51f9de4b4422f60417024ffdba25606cb66c253f12c4 SHA512 afe391f635fcde0490a4bfd64d373794134a2e56066e07236299c07669eaa8afbef6f6d1a6116061716edb95ef1db0c0e4da91a7e8516f517206499d41051250
-DIST django_polymorphic-0.9.2.tar.gz 39400 BLAKE2B 5c8d5c336e31891e05c12b43f8ed87d693182d9cbce41008624d6072b84eb2fa9882356642269e36cf04eed0b326dff1b57ef5007df40984159bec2649b5c904 SHA512 db22b880e042bf70ae215c95ce2cc5bca5f8622e7554af7c9e4b15daf10f45e70b255d9db2280a5de3a0c7a07dee3eb2b8cea5552b28c24ec8c301713165d993
-EBUILD django_polymorphic-0.7.2.ebuild 482 BLAKE2B 5018bfda035972850054fb659fb23f6db6821fff26e4f9627b244142251b5113517d7bd42a1ab2ccb2f6302b9724b310a4990cd38c20fb4ff8a8606b0a6eca34 SHA512 4e2dcc9a99594089ee6b96a978e7b796195bfe9761df411b8ea73c96ae6590b8328c67748dada3782945ecc15044f1d7329f5fbbd6a28e89839618c7cbdceb90
-EBUILD django_polymorphic-0.9.2.ebuild 482 BLAKE2B 716a6e25787e92885537aaebc57e22fb548ec73c4cfec8566aa09f48eb16a84749dad00c02abe20a94149d2eb42269ffd890fa7349f61c7b8b16a3ecea6c37cc SHA512 e31b6b14a02a8632bf5ebb15000f9dd04d4ebc593b50d0977bfc92b92bd348533eae6393512e28bcc5d475d481fd8242733149a6d0560b913fc127afc66b0774
-EBUILD django_polymorphic-1.2.ebuild 569 BLAKE2B 8fa9801c4096fef19be374a530614cd71a506c1adc90db0ceec593ec8cb10bb560520561860eca45bd88a348b7c2d18374206dc346376fb59b462b43b39c6731 SHA512 dae202af59e50445920b9ba808c9b77584e588f10bf7ba4e4960aebb829f3b18a6a8319e5a68e06154a27937650bd9180587d9d092a5fecc6f14375622dbba3f
-EBUILD django_polymorphic-2.0.2.ebuild 566 BLAKE2B bd9fee114a2ef346529fba923f572008aca0171cafcbee2f9d557d83027a3c64fca567e9bcaccc3c675dbb25c165e63d93d9b217e9cdb5216603ae6ef445d1a2 SHA512 ca999ac57b5fe8255b3d710b5fb8d236a01bdf74b31e51796b177f23b274d2adf7363bd45dc21f54e0d2a5be28e268e6997f3aff346b778b10216d7ed4f2d09c
+DIST django_polymorphic-2.0.3.tar.gz 100447 BLAKE2B 0a86212810d5a51637faa5b431355fcbe66ac7a14fbdf09952edde8895c7d53f46de8dd00d0e778eec8c141a9020b7775577489d94f4eff6d129ecbebcbf5e5a SHA512 0ef4877820d7761bf603506d81fe7fe9121e8de9db7e0ef225f87f43a3c32b1b51fffbe4cd246fa94fac95c99b8a36f844c0109e1770eeca9e5051fe529e6f1a
+EBUILD django_polymorphic-2.0.3.ebuild 920 BLAKE2B 4b2ef244cf68b734f36e1ff0a98531625bf67db7a6946fa59fc82eea163fc91e24919696726840612c5b10af2eb537b0d83ff0e5d2b6050b7c3067008dd8260a SHA512 411029bf7872aa179138185152a0f33d076f73b2d90b79c4261d34dcdf317b0efdfa102321c701ea42a6e9642c778621b72650e14e81a92c69ae49634ba1b4f1
 MISC metadata.xml 304 BLAKE2B e00d35195ae0451a93db9cddb09227e3e063027176a0fcae3abc0bb0cd7f3759277772fb4ea7996c51e3354ecbf7a486a83a6f45a8ef4141801fbadbf8231828 SHA512 81aeecce6bddd294dd7d7e212af8f8d1942f88aa9cd0c89b040e7c43fdfc028ab6d86e0ce3d7a8766ccc361eb00ef1e067effd1607532a64100d085c2374a836
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
deleted file mode 100644
index 1958ce30ff78..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
deleted file mode 100644
index 213f2695e98e..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
deleted file mode 100644
index d382d84bef5b..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P//_/-}"
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
deleted file mode 100644
index 198f9cd61a48..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +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_{2,3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P//_/-}"
diff --git a/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild b/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild
new file mode 100644
index 000000000000..adfb754266c8
--- /dev/null
+++ b/dev-python/django_polymorphic/django_polymorphic-2.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
+
+# pypi tarball does not include 'models.py' and 'admintestcase.py' from test directory
+SRC_URI="https://github.com/django-polymorphic/django-polymorphic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[$PYTHON_USEDEP]
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/django-setuptest-0.2.1[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${P//_/-}"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 5b1b1589372d..ff2bd7382fe9 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -2,8 +2,10 @@ DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908a
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
 DIST docker-py-3.4.1.tar.gz 207885 BLAKE2B 472f5dde4761b02a2b55c64762a0529dbaecc8aa9f0e24c67770f533341a5ca9c7322bfacba81f99f9305f09d4e5f7d7ccf37201f5e987777c33c6f81552a807 SHA512 447dccb9129d549886882e6cf0a8ac56d91f7ed57b6aa1dca1942c62d70dc78b92184cbdd9ac5f3445be04cfaadf0b4fba191fb70e223e93c6d1cfbfd334a397
 DIST docker-py-3.5.0.tar.gz 209142 BLAKE2B 56e4400e1f67c870274eb2fdaf84edeac966a1486366355f2697f0fc4e5f37c5e4f3f8163e9187219a4fa27cd43be2bc19370a99755fa880c9e089d6af9bcc9e SHA512 c5ebc99df66d49f53c39ff897bd95afcbb92ced3ec6fd61148b6775cddf9e830454b1da5ac79ea0bba76f143f35f29dec66e7db5c6df33ca5157d3fe40cd4e93
+DIST docker-py-3.5.1.tar.gz 209381 BLAKE2B de0992aff9af240eeb79b66f0f7ca11aca4132cbef0ca9796cfa778b0f44e2ebf83858d0e4df2b9dd813caa83e1c301829152362a6983e5ee96dd5806815ee6f SHA512 8e927794cd308e17fc75f3c6569026c9b9c9f44eb2aa1c191dcfc6d1aabc36bdd341795ba9a2243ae2a27c428868c9f45e8bfabd7c1c798f3f4c85b7855eda6d
 EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
 EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
 EBUILD docker-py-3.4.1.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
 EBUILD docker-py-3.5.0.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
+EBUILD docker-py-3.5.1.ebuild 1398 BLAKE2B 15f94c2229d04c34e23a6087fcee5f8ab777d46e32590ee6b11a8f1e22d81ccabd9ece88c09b491e4c2f3ef63202da3ff9a7f81a895ba424dbbe95f1b2f7f7bd SHA512 577558768c06210caa882ebdc4a26220d01bd33c3b916423c9af6f7d9201fe38a7ad50c1b9317c6aa016a0b31be153a5c36b564b820e18ba905b12af9642133b
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.5.1.ebuild b/dev-python/docker-py/docker-py-3.5.1.ebuild
new file mode 100644
index 000000000000..2f675a4b7d0f
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.3.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index a7e33e747e42..071f2a101938 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -3,5 +3,5 @@ DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705bed
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 EBUILD elasticsearch-curator-5.4.1.ebuild 3229 BLAKE2B b43563ab3e0cde11ce7823a0dfc5ac2dfe6d3ebfe726859734153a63007a872d4b6ca74a8988aeb59cb8e502a8c479b4fb4e212b4eb711ee100f99cd8cb4741d SHA512 35f0749472eb1117d6086b2f0733f4d5c191ecc5e0270ddc6a3b03f9ab1955592d2417b1fbd29f546b231cd718049a782b2ba86aef0869d99d64702e20c5ea5a
-EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3670 BLAKE2B 6a4895ac1f709e3a700a489de3f9cfc73fa20a53013bdc9a5bbc8af4a91d6507702096d7f1bf148f3cf614564e3c597951b4eaa2bc98cbcbd31dd8bbd8e90214 SHA512 9d8cce68c940ebfb8d91dced1e408a0d22c2314171f80c9d03319e26abccc4a7d81b8e6428c78a046340bc049fabf16d10af0eeba1979df65376d4a5f77a4a64
+EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3668 BLAKE2B 7837b30184aab7429a5ffbb2ce5c6f44fa8337d40a6bc5f5c9589660931971c30b02d381963be36c096c515187e6225342b048a07aa6473b4770e0b010cb7d32 SHA512 1d34151f0f4829fa7ef28c527ff5c4d3c5d8db5acb45bdc134eedadb21db11be6a46748cdb83617fc19d484519a0e1021a586ff4a14da9efaa244545d70b6498
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
index 2c9e4be06f93..eb738179fb1c 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
 RESTRICT="test"
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index f8ffbf0a564e..33bf3e8c0656 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -21,5 +21,5 @@ EBUILD elasticsearch-py-6.0.0.ebuild 2756 BLAKE2B 6dac845f2db9b7204fcbf17e70a357
 EBUILD elasticsearch-py-6.1.1.ebuild 2756 BLAKE2B 4ea4b1ed0c26ac25915a281e755dc21f803b75c60798326c6e5a46b7a6277dcc32e35ff3164eaae2fd67c28ff978a7a8733fa49c5b71a099630cd180ad42b770 SHA512 37321c3206723abbeea13904bed0ce8c03524c2a404c7d6101df2b8485cc787231fb6fe67a5491dd5997f74a154a7b5fd267d873aac0e6ee7202c9b941f27b98
 EBUILD elasticsearch-py-6.2.0.ebuild 2756 BLAKE2B 147ab4eb3756cc532174e822f6aebad1e7d4824997da278e74faf02535d29a8a3323fd7c309f8ecbc1765df982865c0be7516381e774f707f7bc4ff71fdf2ddc SHA512 b7bcb4598b4b2e5f20d65bbe3cbfe0893415fd74d92cc781f6d4832da18e74cfcb7a4257459fbe4f42278fc34e2b6487fd2cf3d1047f44f34532f20e7c3a85d7
 EBUILD elasticsearch-py-6.3.0.ebuild 2760 BLAKE2B f344a6e99d2752fa105e741a4383947c7d3aa24fa6219ef71d4e3d145c0cb8fbdadc6e3bfbf075acad762e02c28753344b67fc69d70d8d8c41013a0b1315b4c2 SHA512 ffa6695b48a93be8c5afd39efdaac4dc3644a70a9ab8899884a798a49b7a6c211f6e4397f01c45cb05481d06caf60d3edbfd6b4fcc80ddd4ed5568750745489a
-EBUILD elasticsearch-py-6.3.1-r1.ebuild 2608 BLAKE2B 0fecc0931bcc26d1b5bb074fa63f1ba45c3360af2c418dd24334b6515a8758223ed6ed1cd01ecd4aaeb9afb098e0e530249833b4aa49070514b01a19879c78a1 SHA512 c5db1747e09bc27e494c048caa56be4c034b8664a409c7cd0883a7c949d52a09e4c6e2795bcaf37a0a2a6838ed9c3f50ee5860ecca21add1523ca9adcfc6ff2b
+EBUILD elasticsearch-py-6.3.1-r1.ebuild 2603 BLAKE2B 8290ebd97edf8ecb2d914c06967968cf8e76e29196d246a0b629a276627aefcb9db894ff67b1d4174f2fd35cef29d8bc7967b6dc990a17b3160fb86ea91e1e48 SHA512 55752d7b379785b6e50aca0ed98d6392908d3d3644014bcdc821a87e36a8f3ca556074f27566c07e8b5036c9771b33640d4c3531adbdaec12f1e46cb84b92ce7
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
index 9b3ffe1e36b0..02af853d157d 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples doc test"
 
 # tests fail in chroot
diff --git a/dev-python/elib-intl/Manifest b/dev-python/elib-intl/Manifest
index ad86cf366c3b..a300f0521f2b 100644
--- a/dev-python/elib-intl/Manifest
+++ b/dev-python/elib-intl/Manifest
@@ -1,3 +1,3 @@
 DIST elib-intl-0_pre20110711.tar.gz 29362 BLAKE2B b0e877085e88d8ef606019dfeb989ec4760b2b049ec4f96255b7051a526e9ea5daff4bc53b6be255c699de10220b8ebefb07486375231fbe5d4fa0adbc472e52 SHA512 f44388761bc1c371c0cba5ec8b3513b073eba1d620e1ebd696008999d748f8c2473d5100d625036436157c92283b29d700ad6672d7909ca284703e3146d02abf
 EBUILD elib-intl-0_pre20110711.ebuild 471 BLAKE2B 0d518694d2f65924019bd35be6cb1970bb14cb98c3251784ce56a89d6fdba3dfb6631e0205adb19e6f5620924cbd8e75c2aa5f709aa2f11062e3a6d2d1c2bc7e SHA512 06608a405d2dea03ae0e2db9aedf7ca7a1f2a367ee0edea150a0e588c22c1254044d5909a4f00b4275ec347f8dac10c1b00bd9d32918b9618b83070f668997ce
-MISC metadata.xml 762 BLAKE2B 70182a636b862f8c2a8eb7e073e18ae0e39a8f4f8527e89f2cb08585114b6498b07ca7cda3e0f3d85fa8761a171fbd8c682dc60e09e006af2ce36269f5315b8a SHA512 54fafa517717e672887181e50e0a6cc4e75d38f3624dde4be29df0d4269e9a46e5ea1348a9fe8b39baa01453195d0e3334b047ec2da8473cad72bc782696b14d
+MISC metadata.xml 582 BLAKE2B c435fc1cd9f76113785ba88c21b37039a390798c21abc6cb4138ea924c18450db3d0d92777a04704689adc3e9f28db4e4b9181ca2f3906091ffb8fe7eefbce2e SHA512 0bcf6cb0e2f3d9d80c9f245a28d2ee2515fc6294c4ec59fd4e5ac440118a53801f474120afc3b9df26bead73505ea07e39b85506f1c01e8d7a245a952ec72c95
diff --git a/dev-python/elib-intl/metadata.xml b/dev-python/elib-intl/metadata.xml
index b0cdfd619792..da93a457fa9b 100644
--- a/dev-python/elib-intl/metadata.xml
+++ b/dev-python/elib-intl/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nixphoeni@gentoo.org</email>
-		<name>Joe Sapp</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>
 		The elib.intl module provides enhanced internationalization
 		(I18N) services for your Python modules and applications.
diff --git a/dev-python/fexpect/Manifest b/dev-python/fexpect/Manifest
deleted file mode 100644
index 568a8d4c330d..000000000000
--- a/dev-python/fexpect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fexpect-0.2.tar.gz 6260 BLAKE2B df2e0b66e248ae2b87eb7635aa51a4492da0533acb3ae16b806458b16a7c4b82587f22354dd5902e766850ca664a3ffeb20b4984b1e4a2fc71d6aea993066540 SHA512 45b14bfc50f5e2a5dca45594b024a213c270196a89b1ee51c6a8107d6f8b46ab1ca1362331372492307a2e42adef60be444465d33248788ae2ba2728e42cf580
-EBUILD fexpect-0.2.ebuild 663 BLAKE2B 570501b19eefd26f550821327b0a77c1474c8c771f8d23ca4df0151f1063422254a473f2d7cd4eac7a05871925dea863087fe5611b5eefb3a4e7fedc99df8918 SHA512 da95e15a38474a3dfd9423d99b8fa6182782ef040334f0bac78ddf035658454b65cc24fcfdd216070200bae72444e2be8b1ea62fec37c33c091d4089081c88bd
-MISC metadata.xml 329 BLAKE2B 6247c176b053a5c8f60ff48d214e7dd9864d1533a60049311a0aebb90fc0f89c6d987fb38d15d8db6199f495353a6ce9f7779724eb67bbcbcdce98e48a646ae6 SHA512 237bae522b25ae3af8dc8b0220aa52c09b69434e08d2399c4aa800bdf68c49bb9137fa164900c8227dfcfa7d37c6ea7cfb88c519d4c1db7ffdbf73c5cad4a2ef
diff --git a/dev-python/fexpect/fexpect-0.2.ebuild b/dev-python/fexpect/fexpect-0.2.ebuild
deleted file mode 100644
index 5743bb97265f..000000000000
--- a/dev-python/fexpect/fexpect-0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension for fabric to handle prompts through pexpect"
-HOMEPAGE="https://github.com/ilogue/fexpect"
-SRC_URI="https://github.com/ilogue/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/fabric[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/shortuuid[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 9ddc945c86dc..07a0e10633e9 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,5 @@
 DIST fido2-0.3.0.tar.gz 125907 BLAKE2B 95054f258c775ac3b4f65608fd3b62ec4165a568c237064ebb66da1ca6ae899a3d88b5613e9dd4be87c05068ebd698be452dd3467800317e5894092216196e12 SHA512 c6ea83e104d77350413156eba4c1aa2635b77ae00d157dce61e5a8539c65aca4dd1dfc5303f9d408359582eeb98ae558aa1e2043a9b1dfcb23415eb8bc9c6a09
+DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb5951515560b43655a48bb0816c4e05ef39314b13b6bad84509e09145aeab5727a9fc6cba65ddf42f588b007 SHA512 4eb95a95e1f5b8b49267bc0a11e5501bd041a211ac8a6249ff9cc26ebb0b155b9d16494c18391a14feecb197d61dc50c8530b2ab38ba7e9dc600276abd6f8bcf
 EBUILD fido2-0.3.0.ebuild 820 BLAKE2B 5a50bac620a129267b34b051c0a4d310ea57829fa8b3dd7273e6e2a1309c6e773aa452184d12d7cbd7ff4351a4cabc0327e49eb55744479ba142acac5157e3b6 SHA512 f0a4f6967e6e88178b9aae95de79153b037bca6766ea89e9f6ab36eb6cb2fc4364f716eec4793637f96a045faecaf02fc7c97684b901d9012d56b576cc43e88f
+EBUILD fido2-0.4.0.ebuild 1107 BLAKE2B bb336bfa532dc089e7360b95db4a0b773bff7e1d1072ab1feeae983493c44adb9a7e4edeeeb36e603618c21b3530bbef71f21da1af061508c1caed04152c8f53 SHA512 8fb6bb025ae73ce657a7bde95b751ca97fef4da4e2eeaa37a6e2d3313cf64084c54ecebb7f62fcd4b6d065bdf3819eacf31cb85bb727969667c8283111443920
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.4.0.ebuild b/dev-python/fido2/fido2-0.4.0.ebuild
new file mode 100644
index 000000000000..e3b1dae4364b
--- /dev/null
+++ b/dev-python/fido2/fido2-0.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	touch "${S}"/test/__init__.py || die
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 4952bd5cf0ae..527c20d73ab7 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,4 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
+EBUILD fields-5.0.0-r1.ebuild 789 BLAKE2B 03651a4767f3a091c2822bb375c28d1e1207f9263089b7d94e0e5edfc03798290dca16ce90d6ee8a6a11588fd74b9c2f53902e72f58a6b50c2b73454d0893833 SHA512 775344189fa58bd2db2bcab55d937be34deabee019a18d1d5858b6919ecd01273fc5b3e0ac6617eed47fcb182cf446a4a452224dc1dabdf2a2d60c76effd2166
 EBUILD fields-5.0.0.ebuild 792 BLAKE2B 7f5cefaf972f5749e9619a333fd10e00a2a143d94b02a439daa2748f2bf40a35de594129d886f478a27af5707f8fedf3b80f982e4838afd589ecd15768c5e7ce SHA512 48951e1675dcc27b20f80f0de40fb8b06bc6bfd5c84a74e2a47531f3e0e7560702d4c6bb9671b3f83d02820c2b57a0b1a3c38239a116720fbe8fbad28196f824
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0-r1.ebuild b/dev-python/fields/fields-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..c761bf9a163a
--- /dev/null
+++ b/dev-python/fields/fields-5.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Container class boilerplate killer"
+HOMEPAGE="https://github.com/ionelmc/python-fields"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/characteristic[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -i -e "/--benchmark-disable/d" setup.cfg || die
+	rm -rf tests/test_perf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -vv || die
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index bf00aa08e68f..ac7efdcd516d 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -7,5 +7,5 @@ EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2
 EBUILD flake8-2.2.5.ebuild 1099 BLAKE2B 95b243ac6b57a1876810d4189dfc2b70aecc993194b62e95a17d6e410cf1e3378adae7eaa7a4027ac55b0528e0315d74149d0e2512c55450801fa382715b46f1 SHA512 552e6145ec0ad5a64055722fd6c93019e4a3169e80ac57eccad3838fb9b9b32cb1a111307fa6e6f5e1e5331b10d958b9d269ccdb5a791d75588eb8f15777e571
 EBUILD flake8-2.5.4.ebuild 1605 BLAKE2B 050d4a5fe950252e89f9913c375bee3e73dce9b99eacf6722c72035ed4bc60e349e1184d1afe2fa54652a19b2ca612e56d786642d7aef4646621aca078729a3f SHA512 7e0ba75cc91d90a2f68082cc6ac0d41388529271f7bb42f9088a9f10033405b980864f4db136fe640ea8a0201a45b4056b49179f9747ac051ace2e344ce7f301
 EBUILD flake8-3.5.0.ebuild 1637 BLAKE2B 250dba56f400fc9761907c2d70bfb251a2abdd820ea698d48f4898b405022c4f811da90336df9f81a5534ca82cb3bd19301cbc979780b720528ccee9c9a88c9a SHA512 1e0467aab3fb0738bf798f915cf6c4a024c0895998a4c27043a30161068d85b4adcbd33ad13fde458288f5439c3839444fb2122b3dbd6dc2348df71984abdb26
-EBUILD flake8-3.6.0.ebuild 1644 BLAKE2B 4d90f1881e8b1a4f4b59a0a5b6190a2aec2a75e164ca06e278669933b645fe3582876166763b1451610c0be4112902fd0266151ad69c14e6bb7df4a5462ca799 SHA512 46dc86d634d86abd9ed8ac5a13cfad83b0ec1a429d861734850cbe9a894eea67282af0d48c7c2da5cdad5dd0b25ed48798ce319d1a3d37cb6757251be7106f4e
+EBUILD flake8-3.6.0.ebuild 1646 BLAKE2B b61ce7b2376c3abe6177c4f8dbf4b3658141720d05415e55f9f87fae374e2c434c610253a4d17b0d5ffa6b35708d245dc78d786d6baa9cf25f29b500caa87bcc SHA512 8e4203361704b7878d615cd8182eb743a9527aa7f6fa7566ada7207ffb08b6124b44c8162451a1105b0f68586347291427a19a1e5a403da1db8fa13b1e359b1e
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
index 5e7f69a1d642..7cda3bb34738 100644
--- a/dev-python/flake8/flake8-3.6.0.ebuild
+++ b/dev-python/flake8/flake8-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
index d5fdb71db855..1b4917037e5e 100644
--- a/dev-python/flask-nav/Manifest
+++ b/dev-python/flask-nav/Manifest
@@ -1,5 +1,5 @@
 DIST flask-nav-0.5.tar.gz 11579 BLAKE2B e643a7b49214ae164da390ca6c2b6b00fde6fc0848b4ff2c74749034d0e225bd8a5388e64db69a88e8edba91af9635ef843b133ab7bfabb33f92eec562930133 SHA512 94ebd858754c0ac936b43762cf427c381faa40de86e73b487d6b415d099696e6216b96ad9fefa62516cefd8e51e7ef282e01e1a492783ab696a9fd3602de7e78
 DIST flask-nav-0.6.tar.gz 12270 BLAKE2B eff90b6fc08629139012e2d920b4d464ed06954040a5e97636a7aa4d59d11654839460ef52477cfcec967bd774d942028a53675d682e850f08f6359c5cfbb54e SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c
 EBUILD flask-nav-0.5.ebuild 1008 BLAKE2B 5196ffd8324e84a7b515ff5d984abffe004d50f53e0e3b87b3d460d7e68f146b1c0f439080ab1319facc1720cde9a9c3829013258ebf08ada2dbe053ba6e2058 SHA512 8afbc43d220ee67d07f66bb0e1ae316c80a8d6136a1fb2215609c3e59162964f014b2425c8571a3b2e3b49dd66626f1b1d5e6ba2b6337ba87a8eb3c067ad0956
-EBUILD flask-nav-0.6.ebuild 1154 BLAKE2B 053b9197d172173d7db06e15c67ca7bfee8cd385a208e286208d1cba71f3f2df8a839e1804149126e9a07f505be29689ffdbece24c6e0d0f4277d4848ece4bde SHA512 b8555b3e987be5b1b4253c9c8def5d82d4db36c3406f2d7ae4dd3f03231fb49fcffb4b951caab789651ab32e30517fbea9c0dfda47dc941bd40931c7248d26a4
+EBUILD flask-nav-0.6-r1.ebuild 1200 BLAKE2B ce90f0e841a269cae2275353b786cad55a80b35e485ea5a683b570637fa931426f219d331bc8cba78d8d743ba61e54a26643427f8586902f05ee5acfc61d5738 SHA512 6d5f7913689e3f793812bd8725fbb0faab7c8c77925c61882deb594339768a7bed554c444abc843f5833278515078cd8a73b60e8b76994e7982fe69be49ed383
 MISC metadata.xml 431 BLAKE2B 949791299994b108e48e5bfc9076726ffac5a530783464f54b44deb95646492078e3cb608e99382c04b2ae825336e644433fa5ce7775e7f44d39f6e2840565b5 SHA512 aeae5220fab0583fb7b5f4a0e694791edbaf6b9f5f61fdb04d48b4a91f12726b3101e41097e26980404a19e8b6c5e43723dfc0b61f8d4cfea0f6a5924f8b67f4
diff --git a/dev-python/flask-nav/flask-nav-0.6.ebuild b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
index e954296d7bf4..b9a7ed2d9cea 100644
--- a/dev-python/flask-nav/flask-nav-0.6.ebuild
+++ b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -25,7 +25,10 @@ RDEPEND="
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -45,5 +48,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
new file mode 100644
index 000000000000..8be4e0285bf4
--- /dev/null
+++ b/dev-python/flask-paginate/Manifest
@@ -0,0 +1,3 @@
+DIST flask-paginate-0.5.1.tar.gz 5397 BLAKE2B 819740f6d1ff55331932dfb1a588fb0a92b2a6ffbf66c0ffcedddb2014c42c10f76ce50306fb9e389c66fdeba98fbf0d476915e935530bfeecc853ec25c1f9d4 SHA512 f17610cc3861d587e1940a69957a9266459270453d8f7c15ae6b6e5fa91633194e01384b1cec98647db70f38090d18fd44bf2fc4cbbd8d1d64cf541a5bd620c2
+EBUILD flask-paginate-0.5.1.ebuild 521 BLAKE2B e1d088e5fd3b8d770d19c7c0342e0303fece5bde6db575aaa745b82ba5f2dfe9e280f33a296befc43fe876fc237a217fa440848baa150a86d24124f26f146404 SHA512 4df48b2a24ea3d55fbd373d87425f76dd056d42103b87375ce18bf7f26c4fec4e0b90c82674070a50e739c0a913dc96a78a8f0f1f5c3a78672c1786d9ea98f27
+MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
new file mode 100644
index 000000000000..7b73a8c8fbef
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask-paginate/metadata.xml b/dev-python/flask-paginate/metadata.xml
new file mode 100644
index 000000000000..35a30be0a275
--- /dev/null
+++ b/dev-python/flask-paginate/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <maintainer type="person">
+        <email>davidroman96@gmail.com</email>
+        <name>David Roman</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>python@gentoo.org</email>
+        <name>Python</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">lixxu/flask-paginate</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-restless/Manifest b/dev-python/flask-restless/Manifest
deleted file mode 100644
index d09367b58a6e..000000000000
--- a/dev-python/flask-restless/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mapping.patch 609 BLAKE2B 5770fb8bf0f68f65ca2bfaa989ad22147dd2d650c96c69273393f286c830ae17ccd6e9a86d4b91593466133219cf3be512473381508dc437029203a4b51efe4b SHA512 eea22ff633fc5cdfc0349c27876dc8eee11a0be5d76a2fc423010ab2622b219745a1bf89f4fb4dcb9199d8bd98f3bc7ea3b12b2603458c4c640b3643a47134bd
-DIST flask-restless-0.17.0.tar.gz 527502 BLAKE2B 6c82d78fd6c6cc1df43e6858668108abcf862a916c3caf814e0c40a8cd9a9e93a057774d3626c54e47a965d35f8b03408bbe231af01cc7dcf561e0ca02dc4ff3 SHA512 96183a8bb285a916e6ad680089c70b4c00fcc72ea26a6862537314f6b588b597ff78f2f1c3de0ae24f7dfc7af53a3412c8179801afa9eaeaeb3505695d44076e
-EBUILD flask-restless-0.17.0.ebuild 1864 BLAKE2B 579e75b6b75f607cb250d0efc1b4d5703fc769a5cacc24c4222d3f97946b0b95008a01359fd65b242ea5280f2c53a07d39452be4920c29e92a77fe8b68f9b3ef SHA512 e9ed6424e3ffc7dec185e8b25ab8eda056605738e6ea02dfa615b20eecf0a3b59fc86b39df5556b0933c139ad875df00f4c2c9423533a4dd5990ad62b563d28f
-MISC metadata.xml 338 BLAKE2B 622f65b047d01b5617f96543692bba1d4566ed25db269d1d0f26b06637138f968f04cc8d44c1b608b1cd7c60782e4150966e79240d71fa75b7a367b19bf118e5 SHA512 cc6bd6a5626d3c650d3937ed2c0a6bc04fe62929d8177b75684eae56e36a63ae89d4e26d37f27d2db40b0673be7c674b92427f25c308f5b866d6eeea80921964
diff --git a/dev-python/flask-restless/files/mapping.patch b/dev-python/flask-restless/files/mapping.patch
deleted file mode 100644
index 725a20d828f6..000000000000
--- a/dev-python/flask-restless/files/mapping.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-A number of these settings are simply unworkable in gentoo
-diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf.py
---- docs/conf.py	2013-05-19 01:50:21.000000000 +0800
-+++ docs/conf.py	2013-06-10 23:39:05.741199580 +0800
-@@ -26,7 +26,7 @@
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.autodoc']
- extensions += ['sphinxcontrib.httpdomain']
- extensions += ['sphinxcontrib.issuetracker']
- 
diff --git a/dev-python/flask-restless/flask-restless-0.17.0.ebuild b/dev-python/flask-restless/flask-restless-0.17.0.ebuild
deleted file mode 100644
index b80b28d63d96..000000000000
--- a/dev-python/flask-restless/flask-restless-0.17.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 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 )
-
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="Flask extension for easy ReSTful API generation"
-HOMEPAGE="https://flask-restless.readthedocs.io/ https://github.com/jfinkels/flask-restless"
-SRC_URI="https://github.com/jfinkels/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( AGPL-3 BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]
-	dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/mimerender[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-httpdomain-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}]
-		dev-python/flask-themes[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/mapping.patch )
-
-python_compile_all() {
-	if use doc; then
-		if ! "${PYTHON}" -c "import flask_restless"; then
-			eerror "flask-restless is not installed. Building of the docs"
-			eerror "requires flask-restless to be installed."
-			eerror "emerge with USE=-doc followed bu USE=doc"
-			die
-		fi
-		# Changes connect to read issues @ github
-		rm -f docs/changelog.rst
-		einfo "Generating html docs for ${PN}"
-		PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \
-			|| die "Generating html docs for ${PN} failed"
-	fi
-}
-
-python_test() {
-	nosetests -w tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-restless/metadata.xml b/dev-python/flask-restless/metadata.xml
deleted file mode 100644
index 3cc6a720c0ba..000000000000
--- a/dev-python/flask-restless/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jfinkels/flask-restless</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-testing/Manifest b/dev-python/flask-testing/Manifest
deleted file mode 100644
index 852e8d03bc52..000000000000
--- a/dev-python/flask-testing/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.4.2-test-fix.patch 652 BLAKE2B 3cdc05532702a4f154bea09246e3de2b0ac2f351fdea24ed5df5029b29218a9f2fa5b176853be1d8c8eaedb3ee9c2e5cc552a4defcde3d350b196bc0f05f31db SHA512 f6ae344e20cc707f4894fb5005f3aee4f903ddf9df604e8178b8b25ac6fada35d8d1150815ee573a84219349ded6762a92ba174b38a2e6479b4bc97a44299a19
-DIST Flask-Testing-0.4.2.tar.gz 40994 BLAKE2B a3d5d5d50598586afde1d4b0f6452919db5c84ed1615ca2b83312f24d04835abd8552bb0d7b3f8c6e03a8664bbd49cf157bc7c2ec935bd6143bfab4584dd4981 SHA512 57f1a58f352637b6c1d4dc5aa8b3cac215eae334f355d40b6c777f9c5a769c745ce11f2a98818669ec2c29fc170fd86fe4670bb66bd4e4607174b21c5c2067e3
-DIST Flask-Testing-0.6.2.tar.gz 129078 BLAKE2B 099444b21d68a23816edcb7ad55d03080017839ea57334f6a4fc63ab3c3ed9b09ef5989b112fdd41a3180f37a70a3481986068d6e7c8304c1bf8fa01ecd6c277 SHA512 1ce6a32f2c4e2d6d39c0bd2f01b8d20e2ee8faa5cb31d308bbcda2159f8307cc42f445e328a3752c3c3c66f4fffef75b400c70954b1aeb1aabab8a54c565b5ce
-EBUILD flask-testing-0.4.2.ebuild 819 BLAKE2B 43397cf45912af65ced094934bd3b57c1ba8b7241b0719c0a8a51a8fe13c3bf3f7fec6f5c990323d57d020fcb2ba7ccbba53a4db31359a48d819e984fbf2d5cc SHA512 c77b4c1a8830fa8e226022d8be916fdaec909e0a493a8215cafb8221d926e96818393647cbda4322f91e6dbd6985fe28a76f932cbfb6379a7b66a74e794c8fc2
-EBUILD flask-testing-0.6.2.ebuild 1045 BLAKE2B ac7bd377e16e420a8ba5fc8a8ba650536c8de7cf088923440c73de152de74d5172fe5e0b401e98da8173568f6d1907e74ec677bba03183ab5b29ac352c1caa60 SHA512 0fcf8605c1577f4503ffdfb08ec42defb53af44dc75f3a7133d5eb108dce3f9978bb2162e405d8b96a26b7994ad35f7e1bfde44f5871b7a37348e0bfedd979a7
-MISC metadata.xml 442 BLAKE2B a09743fe6c0f63ed6ff51edeae9e4d3a5ba9d0c8333b85d26b7c8e7e6dd3fb37e49d8897c89345917e73e3ee90fc07316f32560839e0ee9d1b1999631903d783 SHA512 158bf4f1f2b1eae39a24a460f7d3343c2a8c044a125bb7052075ba6cf1a27310de9a20f647decccd5923c31f415dd957e99ab4c0f88a274d26ef7e07991d0ecc
diff --git a/dev-python/flask-testing/files/0.4.2-test-fix.patch b/dev-python/flask-testing/files/0.4.2-test-fix.patch
deleted file mode 100644
index a0933e475afc..000000000000
--- a/dev-python/flask-testing/files/0.4.2-test-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/jarus/flask-testing/commit/c969b41b31f60a5a8bacd44b3eb63d1642f2d8bf
-diff --git a/flask_testing/utils.py b/flask_testing/utils.py
-index add12ef..9b479df 100644
---- a/flask_testing/utils.py
-+++ b/flask_testing/utils.py
-@@ -143,8 +143,8 @@ def _post_teardown(self):
- 
-         if _is_signals:
-             template_rendered.disconnect(self._add_template)
--        if hasattr(self, '_true_render'):
--            templating._render = self._true_render
-+        if hasattr(self, '_original_template_render'):
-+            templating._render = self._original_template_render
- 
-         if self.run_gc_after_test:
-             gc.collect()
-
diff --git a/dev-python/flask-testing/flask-testing-0.4.2.ebuild b/dev-python/flask-testing/flask-testing-0.4.2.ebuild
deleted file mode 100644
index 87258db25a41..000000000000
--- a/dev-python/flask-testing/flask-testing-0.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Testing"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unit testing for Flask"
-HOMEPAGE="https://pythonhosted.org/Flask-Testing/ https://pypi.org/project/Flask-Testing/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' python2_7)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/blinker[${PYTHON_USEDEP}]
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PV}-test-fix.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flask-testing/flask-testing-0.6.2.ebuild b/dev-python/flask-testing/flask-testing-0.6.2.ebuild
deleted file mode 100644
index a171d4354470..000000000000
--- a/dev-python/flask-testing/flask-testing-0.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-Testing"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Unit testing for Flask"
-HOMEPAGE="https://pythonhosted.org/Flask-Testing/ https://pypi.org/project/Flask-Testing/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/twill[${PYTHON_USEDEP}]' 'python2*')"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	local exclude
-	if $(python_is_python3); then
-		# Twill is not available on python-3
-		exclude="-e twill"
-	fi
-	# test phase appears to run only py2.7 but if it passes for py2.7 is passes for pypy
-	nosetests ${exclude} || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-testing/metadata.xml b/dev-python/flask-testing/metadata.xml
deleted file mode 100644
index 186145be8e10..000000000000
--- a/dev-python/flask-testing/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">Flask-Testing</remote-id>
-		<remote-id type="github">jarus/flask-testing</remote-id>
-		<bugs-to>https://github.com/jarus/flask-testing/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index ad0724b3026d..110e38b4d3d4 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-testing-1.16.0.tar.gz 12533 BLAKE2B 98238dc7aee745b210356e999c6048b028ceed8ee2f356557808b4567fc4cf2f90a111e6cce36122cf3294fa5f4b3be1c5ac6659ad6fa97d26e1bfecf4d9b5e6 SHA512 88d33629ccd6c4d4865a9d643c44f074246d01c0c84d57b06bc011e22d4d735261e4a959720512ca03e699a6e1d26eb0c19997a65f52b5cdd199b22072c2d020
+DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97ff2528a6a10b661527b3a306adad3828e835c903c0fb4abf4e829ccfb4481b5334c87d021fb83d12a0f308dfc09d39da SHA512 2e1026569b694e555cc84bcbf0389e50d35955bade2ca5614289de0994cbf9d128b649ecd1813e45f8ab79ee4efd77382ed669cba5bcfe8317aa9f774e0e54b2
 EBUILD grpcio-testing-1.16.0.ebuild 515 BLAKE2B bc5660b9b881543b45138e3d0803c96bd37787f8defece62ede3bba2d93490ed0e77a9df59d2a881523af96e57cdd72f96be18197c0fc0f026f8806125c15cf4 SHA512 2eb83dd4a73f6f51708bcaddafb702c580d20c674fbccc8c8bc959f7f2b530a67bf4700a4e2545c94ba405f5e0b3a07ffd97a9eedf876988e6c26c14a16f94ea
+EBUILD grpcio-testing-1.16.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
new file mode 100644
index 000000000000..85f8ae2dfefd
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 764f81f46567..73178928faed 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-tools-1.16.0.tar.gz 1893006 BLAKE2B 01224d6af05a87e23609d47e5fefeb4784b0ac63cc1198e9f81de03b0b0fed5b2e2d706a486627c1d0e770ba66fe7be00dd98b866fb98e1d14299302a080e3b7 SHA512 86b66242d17d52d08ebb0861d08bcda4dc90fc142d2777bf99d0e4bce72049f88edd5d2ea52c2b33b9a77d94ca8961d877a97ed614766a3061528d41c96e6e96
+DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa7066ca1c940ec7b73f2978b2360bc3f4076a72b4bea44fd808e59713d06879beeb43ae38e176ceeee204e0159ef2540324f SHA512 73652b3b317f216a1b3e6d94499888ba9410dcf44ed11771b359fc363eef6878f466385800cfb856fdf956b275a5356f4984e68a16a7ce8b29ea5c278f17d9fc
 EBUILD grpcio-tools-1.16.0.ebuild 673 BLAKE2B e78528704ddd3ee06b2ba4db44e77aad89d55110078ee6e02d337262e1fc74f59f8eeaa22ef0c9404f7131db8d42491ceb35d9fb7c35ee16bc714724b5ab63f0 SHA512 53072ae2af6fa9e63a827a4e580678ccc7de489d7cded9ba3980440abb8a148d4e55941b295d7b9a5bdba591367956fcf50241467a5f3b54f2c7f86226a43191
+EBUILD grpcio-tools-1.16.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
new file mode 100644
index 000000000000..e7664411391f
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 5219c8da880b..cf7c75a498f8 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-1.16.0.tar.gz 14519470 BLAKE2B 872ef15a7994303ce7ac0a573e49c94260eb8480d8ee94e25471ec9395827fafd3f5e3bd6f4793eb15091827e6d780b8dd6d01f38eef85db80fb234a710f370b SHA512 37d5940f1543cebdabf2b1340a042f98e5f321c42d92d05c88631c0eae42d94d3fe86893a21704a22b70c1fbd70bf091c1af2b51cd5c1d316dd8f0a586fb0eb7
+DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
 EBUILD grpcio-1.16.0.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
+EBUILD grpcio-1.16.1.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.16.1.ebuild b/dev-python/grpcio/grpcio-1.16.1.ebuild
new file mode 100644
index 000000000000..312146bd5e1a
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.16.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ff155c7c5a02..418039c99dfe 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,7 +2,7 @@ AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba07
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
-EBUILD hypothesis-3.59.1.ebuild 1163 BLAKE2B f30da4126bd5425f2ab50b20b58d84b6db254056e395f7a2ece73520f08c1a9251470d5066b49eaf36d64b5f6ac611797539309390ce3df56b8e666578732036 SHA512 5ab202dfa8d12efa1388b2e4b9b3826b88d83f92d93f6ac5f5fd49c68e87bf0e3dec41c708d20f1c6a048bfe0d35d1cdaabdfb2e94c51bfff34a46618a6b79dd
+EBUILD hypothesis-3.59.1.ebuild 1162 BLAKE2B c9e00f97c46290791969baef01f524fd15e93e8825fae3a7eda7844aac3b56b21c6ac4b4df298f8ecbd48bb2bfddb6ba791049d4f59a75fecb1d59e81c76d99c SHA512 97942ab095c3a853b80f75a0b2759aec58b49337db8d3a89e46cf10cb876016e640b703b16090cd08a034853b17fdd622a17e6c40ab65640f38ea477c4eafc30
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 EBUILD hypothesis-3.74.3.ebuild 1587 BLAKE2B 054b13c44587d63e9e82aa54832201e8eba16bd0c00c37595636ecc3a119c5ec6e18586d8612344fe7a840abe9e2bbbb9a52c5d8b1eb29da3402afee13c676f5 SHA512 b3d646c35ec68c74dd315df5e1db85c47580aa7370868a1ae8eb5d4015c2c3bbd79216194e6fb0ce265d4f400551804682250bf97f3baf94e9d3feee7ccbfa38
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index 532449a1d265..591c48ee5826 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index ed8eca1b0e91..0e2b5a658efd 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,3 +1,5 @@
 DIST iminuit-1.2.tar.gz 931630 BLAKE2B 77719b00ba2356ad51577308a470d17e22ac898fe49fe15a31cdf1a4e8e9e4ca023e7d255e87f62f43d895c6ee18892f46e8a5ca7a70ef3d6335e28bdd369b64 SHA512 b9836abf57a3c33bfdf044655e3b8f465cf5252a10a50c17a70f382b8283754095f083e523060fd6d33c7e4c345b8c9923255408120e8bcfcedf1eee8de2dbca
+DIST iminuit-1.3.3.tar.gz 498456 BLAKE2B 3e10ed6d9166c05810e1ec8a2efda3743a3fcf01a738c08312f178dfa9d463792f77fb7e9f6ed6b07c0f98d618d168b32b8269a0542b3ec066f4696710282cff SHA512 8da6c6383bdb24caba0b346f4e0ce1ea027b460dd8ff8f1dd349f678ef55e4d9a693eca143045eea632a5cf7b5f2c10627b41bad208aa128b717777557b2c306
 EBUILD iminuit-1.2.ebuild 725 BLAKE2B b90e1bf9102628c01e42de01858e5e1c4a4a3e89fbb5d996ce8021fc51dd6165a115407327f071a48219dd57d84e921ae4357fe59bf680f71e872210779b4321 SHA512 33793c7d62c7fe55f31852cbd776c6009a6bb2ac43e42ed6e9dee86196e254b7da754a35794beb5827eccf5135ff0180cd7d9e75cbe268edc7ca7c64821c919c
+EBUILD iminuit-1.3.3.ebuild 725 BLAKE2B 4c30d0db794e170a43995154ff946ee6a6604bd130f565ba9e13fce2d698359dc3ba7e78a050abc2d8ae353062d772d62a45540da09f28035e233f85e46555bb SHA512 a4bb85fc0c9293eb9c64a20ad249bb4b14c1468a619b80f73d0e04129dd8782d9732d3ee9198ecbdd2ae0359bb6f21aa7b1b2b0ca193f377a418857cf852cd2d
 MISC metadata.xml 383 BLAKE2B 93614e2da85970259b8fc57ac6768553c070f90e0e97997f8d043c6ccc25d2f3daf62afb02043266ce4294e1450311be62ea9635e54d282ea2963d65d8b9f96b SHA512 8a2f70c08231e482c3121380f52f405d5606aff28379d7b306a95b1cf6c092594e1713554409245e870352911e610de977288c58570c57a8d1546653fd7deb62
diff --git a/dev-python/iminuit/iminuit-1.3.3.ebuild b/dev-python/iminuit/iminuit-1.3.3.ebuild
new file mode 100644
index 000000000000..ae5ee415b38d
--- /dev/null
+++ b/dev-python/iminuit/iminuit-1.3.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/iminuit/iminuit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+	  dev-python/ipython[${PYTHON_USEDEP}]
+	  dev-python/matplotlib[${PYTHON_USEDEP}]
+	  dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	virtx esetup.py test
+}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 1db15b67ade6..37abfec60a77 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,7 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
-DIST inflect-1.0.0.tar.gz 110186 BLAKE2B c9a47237e7fabfbbf512c3c88632e910e1bdc2f6b370f0224f1ae775a63de75c0c5ab25385b44786e349fb7243ef5d22f22d9001dec3c1a6adde3112551bdcb5 SHA512 7a82789ebd3db279589844752ab4e6c99a664ad5058778a9049d484c63a391c7e6623e80c07ca6a4845971062a496cb3062e7fc94607c5843b99a92860708b90
 DIST inflect-1.0.1.tar.gz 110413 BLAKE2B 4c7a5801fde8e0825c7a18612d7d4b6e92534c742ca9021e31c77ffb346e4e5b83f2ca1336d4a4116b721c14d1d6d7387838eff5a52b198c6490a1d00fa8d1a0 SHA512 000cd0e16d16b67cd36914c11d2230268e49be524f184f247d5cea29cc6b69d7b7259b9a67174efd570a2fb9eb6c392a7a6e223d48fd04d824a625fb7fc7f2a7
+DIST inflect-2.1.0.tar.gz 98767 BLAKE2B 2cddbeb7d4ca5e150435e42b75e0eff2e2b20a8cf38c89fe6e8958bc52d69aa070f7ba5c6c73bfdd2dab585ceb32006542f31abbeccc2375760742c70e0c6c50 SHA512 c5230ad6f224a6e9667ce3c135bf43d09939bf457f68fb3d52a4278b110df10c9ddddd05e68d94f04a6902319ad71440440bad019c081d0d781a2dbde9ab98bc
 EBUILD inflect-0.2.5.ebuild 559 BLAKE2B 7a4e165bc85aa92047d6e3560e9afb29749a75148ed254797f146405c43c8a408a5c5c01535092b04edeb313bb0ed4dd53312258651a9f88a3fc63ada7843c29 SHA512 6cd5a2a1ebe78a6449262017643e61b6353d08a9b20a582f20e92405a7d457bfb4916f0b2920925be985f0cc83d2b0472db1fbbe637b102088f6e28f7e4e282c
-EBUILD inflect-1.0.0.ebuild 660 BLAKE2B bdff3a54d5ee33ed564201704c79a24fbf4d66c9c417a54b208852537fc808f37a8c9aec7601f2741b0e0b5abf602255e99150adfa5cdae719e97727011290c4 SHA512 739039a1416ad9386c6d0ccc0479dd32218cea1841e6543968642695c98f74322f9f078f03eea88ccdcd41b28450a12354f225f921b1bc7b35c3356fa815cf78
 EBUILD inflect-1.0.1.ebuild 657 BLAKE2B 1cfc08f33003e00f3e5280c7a7444a9c8e1793e86b471b4f1e48f080708328e66321a279c6e8ef18f2da2377a3867570aee2877d3bc6757a37b6b8eb5c2846bf SHA512 c59aff2256f0f9b1b6cc59905cb24a23b1bb6566b481bf3a29e1a999f75436cacab1d83f34ad95b43e5606daaf8229a1ec7072df3139836fd80c1d457e456034
+EBUILD inflect-2.1.0.ebuild 654 BLAKE2B 569bff7ec0b9b7889135780a0bfe11ac0067384f148d92a343a8bee423ab53ca1c70cc97de61253278f0e84b879e99ff047315dde72aa6788a152218020d3b5a SHA512 23b63eadfa54604ae4a745ce2ca26aac6f80cf7b0a967d40da509c360d3088a2c8c5cccdbee2f061eb8221d321f6e7c0b16be219f2940af3c1e499318833daaa
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-1.0.0.ebuild b/dev-python/inflect/inflect-2.1.0.ebuild
index bf150255a033..259154f23de5 100644
--- a/dev-python/inflect/inflect-1.0.0.ebuild
+++ b/dev-python/inflect/inflect-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Correctly inflect words and numbers"
 HOMEPAGE="https://github.com/jazzband/inflect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="AGPL-3"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 44e8a507e9c1..847b4dd5afbc 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,7 +2,7 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132f569799916a8794f1af733f3e40649fea763595b58dd8a10f31869d280338b81d15c3d059707a66ff7dab889f5 SHA512 946afb8f1623c8a7564ba2d782e05f5c961577dfb1e4a0f27e4a10e2932d5d041035c12aea7eb3e1d61af87867fab85a29919499822f93f638634bc343084b3e
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
-EBUILD ipython-5.4.1-r1.ebuild 3663 BLAKE2B 776285cc3a7df3aa10b06c01a5b203a4032593f1857902d239bc7d78a15fb431588c36a3a2128789cbf47c747c1557aaf1f07ce9a1092427ec538e6be4f82945 SHA512 5f2c6c92683cd39ff85e09974d9992f24dd32b9a9651cfd56f7492a12155d251b21a3c3330f9766edf538968a211c6b924faf1dccb79b070a53847c71b3709f8
-EBUILD ipython-5.8.0.ebuild 3747 BLAKE2B cc6b62f3857ae210ae8f406c62129c05c2e460253dc6ed2aa92757860bbffd0b042cece5c7c0863d299bfe53e5cdc6430010904f4b6fe53d7a843f1eca60f55b SHA512 a846dabb6579144bcbaf14b48a6d14d101f8a3a58d005214cd9ea9c0abe6c42856be0aa7a90b5de9b24b1fd01e86a0c61909c7420185c121959ee550559bb216
+EBUILD ipython-5.4.1-r2.ebuild 3708 BLAKE2B 47ab2288916b066abcd1b2c11360f1764f182cb4462720b033e0c3f06081e8df0f819e01ccaffef729f05f2354b9d2f48c16a1fb2c8ad15be5bae60725ef2be7 SHA512 11f99d893f5bd8082e485e149b1b02266a311bc2526e9db522cb1056731eb49efb88e7f379c526f151c0bece4c0c7b7a8e893fc3c3eb6f3bbd6094d5699d5616
+EBUILD ipython-5.8.0-r1.ebuild 3792 BLAKE2B 42e9d5314694221cdd5aef1ca86bd860799ebd5d87d197631777365f4d87a1925f8a63f7160d40531c2df193935f52a3c7aba2df502687bfd68c1f7c6abcea2a SHA512 41934ced17636c27de6214ef2bfd1797e808135521681ac22617f65468546ee1a20c30a1069037e3af55e7c9de144653a6ce3693c4a973d8a9920919f7cd6670
 EBUILD ipython-6.1.0-r1.ebuild 3396 BLAKE2B fb8641c29897a48e799601cf2509ca182835588de1e693393d7ee0a5063aa6ef717aef163ed23d0fba93d919eddc62526f6ecaabef252598809db0d1ab2a1384 SHA512 2de0470c9547819b58e7fbe5a8e030fe83b7a4c18923a711ffca048f37e9efe09b996d9794503b31cfb6e456e6337deb2dd8c1fe3040cc0d6ddec8541ad6e86a
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-5.4.1-r1.ebuild b/dev-python/ipython/ipython-5.4.1-r2.ebuild
index 787088fd8d66..39d2a6d696d5 100644
--- a/dev-python/ipython/ipython-5.4.1-r1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ CDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/ipython-5.8.0.ebuild b/dev-python/ipython/ipython-5.8.0-r1.ebuild
index 8f191191e87d..7d8b1e5a7f17 100644
--- a/dev-python/ipython/ipython-5.8.0.ebuild
+++ b/dev-python/ipython/ipython-5.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ CDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 30f28eeb588b..44e4fd7d4e45 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,5 @@
 DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
 DIST isort-4.3.4.tar.gz 56070 BLAKE2B c0f7c3d744fcd54b0507d3e7d5963c5d9fb810552ad284206031aa979766cd2e7e1418860000f29130a000bf827696477a46c33ed5cafe4be6571a243bd6dc97 SHA512 ffe679b96223f5f41d14c61051a875233857f7ccab33211c195ed62b85cc1e9bef0af67f9960e94322fff216c1bfaaa583fbd2ef20e258f90a184a25d011213a
 EBUILD isort-4.2.5.ebuild 474 BLAKE2B 19a5fb280538866fb6767c3ba19625402dff275d32c882b0904c6cac07efe12d350384daa498d835dcfebe54b965092feaf4215fd44623fe36f24c436ec4ac9e SHA512 7d6948d6a5db96578138c2bce4953c8d4df0493d6de33830060e57eed9a0eb64e895e36341d7c7c29d918add90a5384dc2799a8b6921f53e4f9e49de511bf35c
-EBUILD isort-4.3.4.ebuild 474 BLAKE2B ad6dd4cdf7530aba34a39cea0d1eb17f303283489f395698b87eabaf35752392ece50257e7fdd29c3232c2ab2312f4baa81f1fa03c60ab867fb4c5c9af6846bf SHA512 a4f9408a1c99e54fa353d67ec8cc2bb3374c5a6eb4ded2edbff85e7e341b7b28d2631c1435df8065fb982025dba24939e8f7eca2a4c831646b20565dfc1a16c6
+EBUILD isort-4.3.4.ebuild 473 BLAKE2B ba258ac1935881cb26a1b0e684d6b832edc50deb768dcbc42387d5dabc1bf45053d81bc03f2ce7264c1920e0cc79c861cc98a6fa203522d9be70dca43002bf87 SHA512 3042676be3c7820a0ee085bf170b2da7844997382a4442880b7111f9fa57e3bd1fca8aed4cdcddd5d0ea7ccc79eec09ec82abb5966c8fdb71ec07cbda9eeab50
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.4.ebuild b/dev-python/isort/isort-4.3.4.ebuild
index acd1bcfe3fbc..c324d362dac6 100644
--- a/dev-python/isort/isort-4.3.4.ebuild
+++ b/dev-python/isort/isort-4.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A python utility/library to sort imports"
diff --git a/dev-python/jenkinsapi/Manifest b/dev-python/jenkinsapi/Manifest
deleted file mode 100644
index a61cc1d180b6..000000000000
--- a/dev-python/jenkinsapi/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX local_jenkins_war.patch 565 BLAKE2B aaa8ac328b3c9dadc91c8125a03be7f566e05c9a6d94148bc7f1836ec27a5343a861e80b5fe0a3efc9bfa478c672e583d115f9c3fc98f9a6cfcf3d8b89bb571b SHA512 80a191e858d4ba63fa11421ddbb87d8979630e894e4c162e986f82d59faf09b9b8e305d7fbf51299f93b3c69b7be39dabb7bca6eb2af3278ec9d4cbf08dee2a9
-DIST jenkins-1.596.3.war 68396864 BLAKE2B e391ffd919544f49570ba5bf76d61c91155f193e575b5ff11870153d9bdc3f997560f41de00dda8d1ffec5c5fec544c187442e8a5ff64d249dd8277257339641 SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe
-DIST jenkinsapi-0.2.26.tar.gz 76598 BLAKE2B b29bf63e6d0b2ad231af9a2b89bb4150efb8de4b3536473232910cfc7c7ec61dc86730850dae59eb074c310a0bd07e3f0f8a965eb682b5fc31f6b13b57a133c9 SHA512 5c04450bd285e2f576bcdd933ec8bd9df840f3fdcae9999305f96ea3f2e85bced4dfc5f961c763cd9137c2bfc2c9b79e032dc451978b6fc04a2fe8cb6e98d030
-DIST jenkinsapi-0.2.29.tar.gz 87447 BLAKE2B ab526d0be6efd617bb1908794cf4803609d70642f93cd631e82d32fff7c73bf2642ea9631284548d0a120a07f48a3c916b43999944c2dc1bd042503d00506349 SHA512 9f80f3a9afe210aba7b67247775249e11c53bdbb3a6cc62e009fe7c6dea1bbc0c95cf4eb20b44a68e3a9978478bb3f8459b6404eeca64587139d68a9ad458802
-EBUILD jenkinsapi-0.2.26.ebuild 991 BLAKE2B df0ac0443e50e147547dabb4f4bd31aaf20e3017b3765d0c65e96236278725fa49d7c9ee74dc254a6a3c838cb722b032ea14707ef070e52c954e6b9637246eca SHA512 32f4d94a2f8b32bf8fefd95f1d042afa9c6b9edbb3a54c86a2259012a2cd193e0a8ab481b2f2460df348524b55e80e6babaf9b11827b0b3ef8a6ef626787620e
-EBUILD jenkinsapi-0.2.29.ebuild 1255 BLAKE2B edbd98485957a0da88d4a84524a118fb6e8c36b4cbf8c8bc85f47c34c6bda8836d0fba6ce4bf7212a50413abbd5071f307d80721943d50a76a78a8af182f97d1 SHA512 15dc412e8c682949dc7edf1fa6425ea71eff2b751dcde57ac93ddc5045e7f6b50b3cb65ebe45335a18efc8a4d454e23561e2ece98a7e31297b411024d1ae4a81
-MISC metadata.xml 255 BLAKE2B c874261c4dcda5204865004447ab87271ee45638b149aa11bfd3d0d118d58f17992cbcbc92c58206f145bdaa2a651204ee1bfc5c13b8e63aa8db81503ea42298 SHA512 789af9afddc908080b99f6354943ca03aeec052a129a19ad22584ae1604ea9d39aff748e4f23e70ca898c8aa5d2645ec6d1f4c0f5447697052797533abda6144
diff --git a/dev-python/jenkinsapi/files/local_jenkins_war.patch b/dev-python/jenkinsapi/files/local_jenkins_war.patch
deleted file mode 100644
index 811ca4cb9c22..000000000000
--- a/dev-python/jenkinsapi/files/local_jenkins_war.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/jenkinsapi_tests/systests/__init__.py        2015-01-27 14:14:43.632779039 +0100
-+++ b/jenkinsapi_tests/systests/__init__.py      2015-01-27 15:08:52.521438293 +0100
-@@ -11,7 +11,7 @@
- 
- def setUpPackage():
-     systests_dir, _ = os.path.split(__file__)
--    war_path = os.path.join(systests_dir, 'jenkins.war')
-+    war_path = os.path.join('/opt/jenkins', 'jenkins.war')
-     state['launcher'] = JenkinsLancher(war_path, PLUGIN_DEPENDENCIES,
-                                        jenkins_url=os.getenv('JENKINS_URL', None))
-     state['launcher'].start()
-
diff --git a/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild b/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild
deleted file mode 100644
index f01b0f9cf5de..000000000000
--- a/dev-python/jenkinsapi/jenkinsapi-0.2.26.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="API to access resources on a Jenkins continuous-integration server"
-HOMEPAGE="https://github.com/salimfadhley/jenkinsapi"
-SRC_URI="https://github.com/salimfadhley/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pytz-2014.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-util/jenkins-bin
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-# use jenkins.war from jenkins-bin instead of downloading
-PATCHES=( "${FILESDIR}"/local_jenkins_war.patch )
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild b/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
deleted file mode 100644
index 7fc6032e7eb9..000000000000
--- a/dev-python/jenkinsapi/jenkinsapi-0.2.29.ebuild
+++ /dev/null
@@ -1,44 +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 )
-
-inherit distutils-r1
-
-JENKINS_VERSION="1.596.3"
-
-DESCRIPTION="API to access resources on a Jenkins continuous-integration server"
-HOMEPAGE="https://github.com/salimfadhley/jenkinsapi"
-SRC_URI="https://github.com/salimfadhley/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/pytz-2014.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}] )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if use test; then
-		cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/jenkinsapi_tests/systests/jenkins.war"
-	fi
-}
-
-python_test() {
-	# tests fail with jenkins 1.6x
-	# https://github.com/salimfadhley/jenkinsapi/issues/406
-	esetup.py test
-}
diff --git a/dev-python/jenkinsapi/metadata.xml b/dev-python/jenkinsapi/metadata.xml
deleted file mode 100644
index eb4470a6275a..000000000000
--- a/dev-python/jenkinsapi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">salimfadhley/jenkinsapi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index e617e282f486..78c52d71b850 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,5 @@
 DIST libarchive-c-2.7.tar.gz 42299 BLAKE2B 6e7930f4e403e23a989ad7c519143ae81cec62e40ad77f36d8491d8d36b07419d77815bf719e5782c1bb0b68692798df90c532947ddc5adec96f0077da755b25 SHA512 809319cffc250130c1414885d4e2de399a8ba92f6025848f1423bde79eadc6f686f934f4b17fc0a90ea84379b94c5c38d4849b2b28e2e03f8d16548152dbc856
+DIST libarchive-c-2.8.tar.gz 45182 BLAKE2B 8282c46f1e2bd4c9e83809743953fd8f11408e7c7b0849735cb1c4afda35387cfd6889a0443ecda26bd411a7dcab384e42c685650d62be591fc72bdb151770a8 SHA512 533b23081996f2bfbd558e379d69e0c02ecfc7e62d39f4ae2ecf5b639511ecffc073422e78d7357cc58daa260b956a6399b42db5d26d6e3933622c622fa8dc5f
 EBUILD libarchive-c-2.7.ebuild 436 BLAKE2B e25035bb4c3d00ca418ee3826a85175f5247f4022899bcd41b16951caf2c34543c663fe96287dc7a9780d77fe46566ece0c6180b5143a40b70406bb57f319b14 SHA512 c1b2cbad865a975907bb9b0607a5a3d2c7def88c2c5c7a775c43895e85a250b85ab6db7d1eefd9954f8dc2eaf0e5f3fcc89ad8e349d6bf7aeaa9236c1ba0ce8e
+EBUILD libarchive-c-2.8.ebuild 438 BLAKE2B 0f5565431db274fa6cac85706d3a0a4d40639ca9d6a3dfc5ded63c044f01ae9316628fc159e25501448bb8d10575b94c0d8d9ee197ed12d8062cca6cfb84e3f6 SHA512 c5dbcb8b952bb7851ade95596e9dfb2e60c1a703c9c13c7ddc318f4faeccb449717382c75ed42e191ec0da91e767cebfbfeefc0acde53f4adfb47e0926a696b1
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/python-cjson/python-cjson-1.2.1.ebuild b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
index 3e69886a4c10..b7d282caeaa9 100644
--- a/dev-python/python-cjson/python-cjson-1.2.1.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
@@ -1,22 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1
-
-DESCRIPTION="Fast JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/AGProjects/python-cjson"
+DESCRIPTION="A Python interface to libarchive"
+HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
+LICENSE="CC0-1.0"
 SLOT="0"
-IUSE=""
-
 KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${PYTHON}" jsontest.py || die
-}
+IUSE=""
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index ba1300e406e4..d23edd962e17 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,10 +1,6 @@
-DIST libvirt-python-4.3.0.tar.gz 187111 BLAKE2B 7266ca1b5836429e13a03dab0e2f5085521c72e2d6952d7a9de514eace286477ad7b237c5d70f86fac49ab2201c8724149af72d4c1f688ac8736257045babc6f SHA512 4b2b4a2590e968ff4401d8429319c94b1b9c08a40b089f461af5a4912acf2c504f60652c80b161c253c00e41d22c100c2e180159e45d84c352c59dca69172cfc
-DIST libvirt-python-4.4.0.tar.gz 188431 BLAKE2B dc2dfc64139c3bb2a80516c345b1256311b1b2ceaa832de2ef60afe5422adabee626b25dffa96a1bd8428f4d0bd54ed5264d887522700a941aa646b4b43a7f8c SHA512 b4e740895c22aca20d8fc1cfadc9276e91e0a74aa7bad75d15de14be6704be8386055b700ea65045acfaabf3bfe8fa51e5d814e625e46d01b3ac0221419d25da
 DIST libvirt-python-4.5.0.tar.gz 190016 BLAKE2B ba3aa68b2de6179cfddaff54bf96fa876959d97e72245ccdad8f9f681641166f5827d5244ae4c18b7a7b90a3201b3a797d30c2436a6ab5fcdbcfd56462348ba4 SHA512 14572225c2f5233aa8cb7257cff94d38effc4d988aac36108ca510dcd442d8c5194d6b25bddb2603bb1e1bc4dcb284f103899ce81063dc6a7994d78beea355ac
-DIST libvirt-python-4.6.0.tar.gz 190306 BLAKE2B ed3659e69408e7b8b5f0ea3404a2e72c6e9c1fbc5c13352c535a3c30980e7d50f5cd1a2c4aea4438665ea3e9e506a91787b5ce43d5199f7c5d4bd25f22186033 SHA512 15c71820ea3c3f71cfa127b82374f05cc99d4ed5189ad9ec0e471b3491fc4050f7f938590a46f0eb9d9efcbf45971881ed4f40376619a9f6b3796459626d645c
-EBUILD libvirt-python-4.3.0-r1.ebuild 973 BLAKE2B 69b9e18ba411ed4d4085bc4b761c2b8fb4e674fe32994ad8187f72365b42924bc33e54d198c0760b45e4efc04dc8b36c1a6c7ae16aac949839ac9f6a57a96e54 SHA512 c5f53f9dee7ac39c6b0927d2fa0a7926227a013c27091fd36865101fe4ed549870ec3dd6104dd97faa2088b5df5aae42c47192a54fd41b6db1ab92a9b05b9aca
-EBUILD libvirt-python-4.4.0.ebuild 975 BLAKE2B 0f1b8f5fdc1b5b0746a183be50785ff9fae9ff8490a0c5320f30c9f964c764ed224e01fdb57badab4e46ad562d57a8571c79f5fc0d7aa6700921dd4c996571a5 SHA512 9312e564ad65170fdc81d786291c18c8f5f773ecdc734ba40dce5f0d0e4dd8e69f342933ed7b879efe865e1cc52bfd37555dea082643ed50f8a5fc268d908f34
+DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 EBUILD libvirt-python-4.5.0.ebuild 982 BLAKE2B 4becbf00df8460246d3e933df6b701c95a616ac6f26878acd29200e5d12101fa94edf59ccfd9847d2ee03e94aacc1df78cfcf2da66973021a181962c885a84fb SHA512 c1c53e1a5d7fe3e71a7d5f99d943c1da3e118151fe158ecd0c50f8f0d40a9ddad370759cd65bd32453d0ba2d4a2f31b7b4a25718f530e784e56b39919345f574
-EBUILD libvirt-python-4.6.0.ebuild 975 BLAKE2B 0f1b8f5fdc1b5b0746a183be50785ff9fae9ff8490a0c5320f30c9f964c764ed224e01fdb57badab4e46ad562d57a8571c79f5fc0d7aa6700921dd4c996571a5 SHA512 9312e564ad65170fdc81d786291c18c8f5f773ecdc734ba40dce5f0d0e4dd8e69f342933ed7b879efe865e1cc52bfd37555dea082643ed50f8a5fc268d908f34
+EBUILD libvirt-python-4.9.0.ebuild 972 BLAKE2B 277c4eab93dd6b60050d60cf500521d620a7fe8ccd24e872c6ac4de94d842b26c569e81ea3d9cb33fee3bdf351640f682a877d2a47998d0c7e7509570bf19e6e SHA512 7cf7d70ea6717282c09f8ecbd267c22bfe0c07b1d649f39b13903ceb3f527ed2763faad494d4276ccaa4c4a34bfaeb0e3974f325118fb1b45a498769b62363f9
 EBUILD libvirt-python-9999.ebuild 975 BLAKE2B 0f1b8f5fdc1b5b0746a183be50785ff9fae9ff8490a0c5320f30c9f964c764ed224e01fdb57badab4e46ad562d57a8571c79f5fc0d7aa6700921dd4c996571a5 SHA512 9312e564ad65170fdc81d786291c18c8f5f773ecdc734ba40dce5f0d0e4dd8e69f342933ed7b879efe865e1cc52bfd37555dea082643ed50f8a5fc268d908f34
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild b/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild
deleted file mode 100644
index 87e0302348dc..000000000000
--- a/dev-python/libvirt-python/libvirt-python-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-4.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.6.0.ebuild
deleted file mode 100644
index 42d117b59bcb..000000000000
--- a/dev-python/libvirt-python/libvirt-python-4.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
-	SRC_URI=""
-	KEYWORDS=""
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-4.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
index 42d117b59bcb..968deb8ce73c 100644
--- a/dev-python/libvirt-python/libvirt-python-4.4.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 0536a61e145f..e50ec6d3afce 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,11 +3,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.0.src.tar.xz 28324368 BLAKE2B 10168ff9be8f68536db3b2263c85c1c98213ef03dc542b83628ff176542452582bc496bab236fdf40d4a6463a33f04b27f1458c072ad8b66b641f8df8d494046 SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
+DIST llvm-7.0.1rc2.src.tar.xz 28304444 BLAKE2B 245e45f77a2ec2d94b237d1015ccc1e409f0dc149dba3192c15293bc2d45ec40989081a930a5e55a4b0ebf906397c62afd910bc25c5c1eef7ea5e310d4172acb SHA512 cfc4d1926bae75f6f22350273ab76811f0b78ddad81717c9201d7814ebe7b902c5a9c6caa0232e2bdc14e819b008f914d055b23723e0ec4a5309809dc06c6bf4
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-7.0.0.ebuild 1020 BLAKE2B 7a15942d41e7ef2bc5a739d12a8dba1c1a2788c900638950469b47ad44b324f15b5495a87e55b8d3567c072ad3af4575ff3a89d7ac8a59c377ec839c28ac83b1 SHA512 c4a0838f38dbe922eb10bb6d06a3ab4513d70c50bcd49d066cbde006a7228a9b896029560f76e15ddd2bff6a88c01c2934c6e70f6da0746fa2e1c83f2474669b
+EBUILD lit-7.0.1_rc2.ebuild 1023 BLAKE2B 0f0bc45bdad2c4328ec57aa73a6500ff8a6dc772c35af082500080249a90d385ff42d504b3adf6a7d69afe68434b5acb955540694b2e528ad6f1bb2f5d3b0f57 SHA512 c1c14d0771f718f2650c06e87927194fa2210ce94d5e091a1d206d6044861b9ac5db1e8bd92ffaa71fe63dfb932bb4e81f3cbc5211df6084d448fd121fafb2c1
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-7.0.1_rc2.ebuild b/dev-python/lit/lit-7.0.1_rc2.ebuild
new file mode 100644
index 000000000000..439337c6f5e5
--- /dev/null
+++ b/dev-python/lit/lit-7.0.1_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1 multiprocessing
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index 53c26e4d6a51..0dea0f9c6b20 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,3 +1,4 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
+EBUILD logutils-0.3.3-r1.ebuild 497 BLAKE2B 3a660f03c0ffba28215287b7ad3a9677dfe2a461a6b3eccaa73324410190f04571390ce44c9b693d498cf02492739a68298e536f527333a6d43dd554ea625e49 SHA512 ddfa602eb9bce3e91287059ee22242e299814a28e8c6d199a3b817b48577100e9efa1fcbaadf65e11b414a69b7d8e7ee945e5ac1bc49da468176b779f7418c95
 EBUILD logutils-0.3.3.ebuild 493 BLAKE2B 408c0b250fd881dfc0c53812b9895681bf6b55108900e97ecdbd7e6fb238e35e23f1343517a278c1b2701b73a87b19eea9712e1cd196c80d0c7a9a8412eff0ee SHA512 aca70166dbc23fb2053dd8641434d2553ee827b87d5c2f46de1d60f701742573923333f6a8bb65a60f90d2fd4ed6be8d4b6f0c16c1e163c79ea8a496c129c518
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.3-r1.ebuild b/dev-python/logutils/logutils-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..e49bf8b1c2eb
--- /dev/null
+++ b/dev-python/logutils/logutils-0.3.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="The logutils package provides a set of handlers for the Python standard"
+HOMEPAGE="https://bitbucket.org/vinay.sajip/logutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 16b048b53bd2..9ec41a053b97 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,5 +1,5 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B ab9defb8f678c26edfe4abedd8cad4b6603d6fb40ae874c267d24e4f550e7fe8276604996f40cc7b62faf65bf1e8186a2d37425ce3e65e0d5f65a514f299d562 SHA512 5ac2247052ee959a29a582884d4d8d10df032925ed6eeaf0c950081dbf05e091975952fb2394e6abb7e0f5f3ed93b4201bc90029e8c84aa34165bda8bfeefda5
-EBUILD mccabe-0.6.1.ebuild 883 BLAKE2B d7e01ca1a38e6c4c42ca9441a9a534dceb7d883f9174941c4725286bf0b505e4475ca8b3d0bf89e3a35c457a768d159a9bf2f42f3a0768d8def5188bc97da924 SHA512 08b923ab8466528f1d3de0e29ed83ec79267824ce514e7f84ca8bfc13c8c4ec0835d58f188b034348c1d47d7ec779ad6815a05509f7166735edb21f7e0c7e7eb
+EBUILD mccabe-0.6.1.ebuild 882 BLAKE2B 7eb22af00a590330a3031394382693e917709633ebe4ed5d9bbdb7c857472fd7e6da9eb9e6d01a2325f5897869bac69918cc2864325fb1701c918dd4134491c5 SHA512 3799b98043bd91276e73f0e33d35969d7281557ac0110c52441ff694165ec6169c9c58a87d885bc2efde687321579a0c5f0d83fac4830150f58cf85b2281c1e6
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index 5d0d2f7ff242..b49e728c2bac 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 408381d3da75..e2fa7435c116 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,5 +1,5 @@
 DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
 DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
 EBUILD memory_profiler-0.47.ebuild 1235 BLAKE2B 9a10cb80fb9381a1e01d323ac993f6345188dadcfbbaa5d5e44ea480bafb23443260e8c47dd14383c96c8060baf6c7ae3cc5eb8eff1fa39252c5b1915190b514 SHA512 aa3fe3d37492689b2b349c81e2e3a64d6fcf2aca4c0955ded24ae01b5eedce55f4dd9f7c5ec380e8e7362b53d0f1649806b5468637bb6f4c1640b9626ccfa4ba
-EBUILD memory_profiler-0.54.0.ebuild 1223 BLAKE2B 3b1b9f9e051389140418fc23bbbb82e01711fb09cf0efee8ca116ae12a892287849e044bc5e9291540a49fbb3a0f81b1200fd663cce943a3c59901e533826d1f SHA512 a0552bc2490c0167e8a396d4ef235949b7d3cdb4cc8716c3ec43cb567c7cb60e4304a6112074a18a2cfd3e311cbd037d41c2d81c0a0368b0901b89c4a1f474c8
+EBUILD memory_profiler-0.54.0.ebuild 1316 BLAKE2B 2191ada8dd9febcd86b7a424c4bc2879b4ae89d109a67887d904ede8e3f79ce1db46b2f9f8fd62a26f722729362ad8487f57cc4c311f77e784478e81f432b348 SHA512 9b8bea1007c0095f460e10fa5e8980860e576402065fd2d93e231f6adb6d6b48da72ac198a886b7a1a10bb8e79263955fd13be50c78464854f63df96243fd794
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
index 905633999611..c04c067d81f3 100644
--- a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
@@ -15,8 +15,11 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+# dev-lang/mercury: collision on 'mprof'
+# https://bugs.gentoo.org/571176
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
+	!dev-lang/mercury
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index e550ee926474..f7f9936f964d 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,4 +1,7 @@
+AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 AUX tests.patch 1727 BLAKE2B 4715320acd97346342aed76f41b684469043e04ffbb6c6516da4b9df14b78369aafd38eb167358113cbfd673041ca93b00890af64a0a64a08658fe2b4eaf3ed5 SHA512 dfd7f07575cf0816ac1072757e5ee64d696fda020ec7baaa492f97309a55f8c8758f87b1aa75752550beb2fc83a953b2937b746f8672ecd1370d283c20a4c21e
 DIST mygpoclient-1.7.tar.gz 36423 BLAKE2B 6331eff9d095a705cb805a8984f530b418d8f8f61dcb239fd3dba4236c8f376dcb329747887c4f22f66ca657525c3333ea260d5e2d2093a37d33dea43d2ca93d SHA512 618c94cea37f427fbef333a7cecade12fadda33bd727814b4ce904e74aae65d4ba85d7d09578b9e5b6b9fb0b2f6fe0f73abbd7f60d66b3d9b51dabb554169e9f
+DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
 EBUILD mygpoclient-1.7-r1.ebuild 1116 BLAKE2B 0f4b9eb116f842dc63b6d2f6bbf43b06ade103ec326770dce078cebc77234dc68b4125f190d6808ac302cfc72ba2a29a716d12625025ebbd0ac47f2ea6964b6f SHA512 b8e022f08d66dd44be870791ec9eb357aea89208913cd923d582d1f934eb9e449328e038550df53ca3f43356cbe1ab8856e003127b2a390d71a7348d58569373
+EBUILD mygpoclient-1.8.ebuild 1148 BLAKE2B b8b96d6b625d6fa443d567b5547c01626d51335086630f3d9f04530c0d09c797b35ca164c7ce5d7fae0426b5a385144ef1574da0c18ce11f19f9872078e5da1d SHA512 5a078ca7817c3b97db9a1d657a66788792b656fa825d64994b399f82ad55fbe96db62af14a6239a9f1024d81d72783f519f06c3c94cf026c9a864dc69f3539de
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
new file mode 100644
index 000000000000..94a37be8232f
--- /dev/null
+++ b/dev-python/mygpoclient/files/mygpoclient-1.8-tests.patch
@@ -0,0 +1,34 @@
+diff -Naur a/mygpoclient/locator_test.py b/mygpoclient/locator_test.py
+--- a/mygpoclient/locator_test.py	2018-03-27 02:18:57.711105496 -0300
++++ b/mygpoclient/locator_test.py	2018-03-27 02:22:02.201109125 -0300
+@@ -16,7 +16,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ from mygpoclient import locator
+-import unittest
++import unittest, sys
+ 
+ class Test_Exceptions(unittest.TestCase):
+     def setUp(self):
+@@ -54,18 +54,21 @@
+                 podcast='http://example.org/episodes.rss',
+                 device_id='gpodder')
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+     def test_device_settings_uri_exception(self):
+         """Test if using no parameter for a device Setting raises a ValueError"""
+         self.assertRaises(ValueError,
+                           self.locator.settings_uri, type='device',
+                           scope_param1=None, scope_param2=None)
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+     def test_podcast_settings_uri_exception(self):
+         """Test if using no parameter for a podcast Setting raises a ValueError"""
+         self.assertRaises(ValueError,
+                           self.locator.settings_uri, type='podcast',
+                           scope_param1=None, scope_param2=None)
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "pypy doesn't raise ValueError")
+     def test_episode_settings_uri_exception(self):
+         """Test if only using one parameter for a episode Setting raises a ValueError"""
+         self.assertRaises(ValueError,
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
new file mode 100644
index 000000000000..aeb31ddbad67
--- /dev/null
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A gpodder.net client library"
+HOMEPAGE="https://github.com/gpodder/mygpoclient
+	https://mygpoclient.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/minimock
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# Disable tests requring network connection.
+	rm -f mygpoclient/http_test.py
+}
+
+python_test() {
+	if [[ "${EPYTHON:0:4}" == "pypy" ]]; then
+		nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
+	else
+		nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	rm -f $(find "${D}" -name "*_test.py")
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 6ac8a4f5a0f8..95b93b629fdb 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,5 @@
 DIST mysqlclient-1.3.12.tar.gz 89793 BLAKE2B 7dbd582b72b27a71a4fa7a6fd9f051eee7f1d820d447cd5463d4060725f3f779e5bb91500aeaf9d11460f0d72c76732fc610dbd1555c6eb5a0ba55ca3e870c03 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee
 DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
 EBUILD mysqlclient-1.3.12.ebuild 833 BLAKE2B ee12396fa34929fca62f8fe1d02529290e92e7e5c0ab7b9e78ced3880c5c60a159a2c2e758b57939acc1b20f9b7c08e817892fbd325d5a3eb2ec78e26fec46e4 SHA512 3356f451c6da3cbea73616333ee40756068f9d5eb310f152ee4f17f5939d24c0f30ab6ef1042744204b51ee4be5b2cab0a3485eaf1b50bc4589ca8eae0bb84bf
-EBUILD mysqlclient-1.3.13.ebuild 833 BLAKE2B 716f89739bad288c8de4b78ed49b69fc42750d8a9cbfabad5717f3bd1d5b505b4ce3a73cf3e9723569d5068bcabe540d1b3120028865cfcc7cd77882834594fb SHA512 f9db9a939f447353599af8b74f3af4d0a60b59b05ad3e5cd0065a20c4df73cdd4719dd6be53b51bc567073d77ca489464a01a8998ecbeeb8bafbd2acb829983b
+EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
index 26745c6218ac..592ba7d4a9a8 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 72d04f711cbc..2150f638a777 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,3 @@
+EBUILD namespace-paste-1-r1.ebuild 824 BLAKE2B 610e6aedb876dc5b9f60ebea03d3e9a7585f31290b37fa4079f7f153958d10bec7c6e7433a5dcaa144445524a8e180de39a305e1883b6e9a2a1088ec51cf5688 SHA512 1d2dbf017959c0643e1b17394e528de8ee021ac0f72665fedbc4027331a16dfb894705486fbf9ce75267ce94e25813d83bd69888b52d2e4e7b74bd9651b7a06e
 EBUILD namespace-paste-1.ebuild 808 BLAKE2B caea416e6ee2687a9c5841c67b2ded6ceb721d1aee61032aa0030124cd280344d1754ed177f60fc85b63acb7e9bb3d3a7e816f0c82c3d0a89fdd35fe79761792 SHA512 5e7a2bb3985a298745cbf1c37060b076d7857566708a4506a58093dd3ef6b60b84ab956fdd064eda7e576e652b78eab7db91265cc627dc5ca9c86a4c65d02e8f
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
new file mode 100644
index 000000000000..8fe4d7da6cfe
--- /dev/null
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for paste"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/paste || die
+	cat > "${S}"/paste/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule paste
+}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 5d07003724da..503965dbef19 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 617 BLAKE2B a107db042ff163cd718b048c6a3bcc214f68fd4005c203ae9b48a94e30e48a7b45f2eb272ce2fc36776895192374a3b7f1c13659be79be592f8a8eaf5429bdb7 SHA512 f41472dd81122457e9197898ab8bf7927dd19dc8922d33b81857aabfe08ce0f9fd8f976d72679aba7fc54c6417193c7af8c4f55a77d50106587b2b6040f083cd
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 624 BLAKE2B e2b83e834630450d2ae48090a469a9c5275868d6af673424f007a150f4c26f5ca00fb6f65d9cfd97deef18eb9879cf02d9056abcf8c864eb93b9acc6e55f0473 SHA512 159c580001a33ef6ab4f4357eea457871b8cf0e8afde77b28fee2a9fd9b328b2c888195184e9d0beb5d910955fdb8ffbf84b625743f00b0243b1f852ea336cd3
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index a7558053fe73..2315b9311175 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
new file mode 100644
index 000000000000..5f54eff4dda9
--- /dev/null
+++ b/dev-python/parver/Manifest
@@ -0,0 +1,3 @@
+DIST parver-0.1.1.tar.gz 23398 BLAKE2B 2e15ac0c5739ac4d5360cd905d87d0ba1e3831fa975b42c73503f1fdc0952d4a73f36a9eb07cf95a12969637cbfaa902ed46c9a66a85110c17b8ff36c39c87f1 SHA512 d79a4981f3ad77180c5a9c5972410714a1be075308c933bde6af499c25aaa2f82034afb27c0b4c4d7ca269d645285a953a91ea6f945fcac663250ed06ae3accb
+EBUILD parver-0.1.1.ebuild 725 BLAKE2B 82bb068016101264412d3f5678ce2e637ee92187b784b16b75f17918db226b100acda3eb489db7eb5aae20b423bd407390348019f38188f08908c0faf3cf5549 SHA512 55899e3abfdbf9086985dbfdc406a8d11b4d31ae686baef58937da5fa5916d26427bfb2a4642e8b02eb9ad3ba66877ab527b15b849314d363dfcc2ae158b972b
+MISC metadata.xml 574 BLAKE2B 510cd38b3ed8ff1bc35c94dc05b898794d2770d0804e2dc0b86139177e98379c6bb0f8aad5a5c46f4586e24efa84c2eaee7d22a072feea99be98a5faedeeb810 SHA512 bd52224f07bee7d3655766dbaccdedb0ee53367c3b6544fc6641ad9593f005c42d79a862914bc87bd673bb4206d19698784f9bff0135c0a56e156bf2fee12cc7
diff --git a/dev-python/parver/metadata.xml b/dev-python/parver/metadata.xml
new file mode 100644
index 000000000000..f3f1f87ebb33
--- /dev/null
+++ b/dev-python/parver/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">RazerM/parver</remote-id>
+		<doc>https://parver.readthedocs.io/en/latest/</doc>
+		<bugs-to>https://github.com/RazerM/parver/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/parver/parver-0.1.1.ebuild b/dev-python/parver/parver-0.1.1.ebuild
new file mode 100644
index 000000000000..d243ed3c32fc
--- /dev/null
+++ b/dev-python/parver/parver-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/arpeggio[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest -vv || die "Testing failed"
+}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 34975143b213..6267b338865b 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -2,5 +2,6 @@ AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa04097
 DIST PasteDeploy-1.5.2.tar.gz 24006 BLAKE2B 1088d5cdafc80402b44c6c0e62829d1efe666d9ef8c84409125173ce927aecb8ed3ec4283b9821a42cc614d27e74e43e79407554fabfd79f6a913f9742532c72 SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab
 DIST pastedeploy-1.5.2-r1.tar.gz 29528 BLAKE2B 0c36f24e51eb66b9a2176083d42726be5be8e7eb9b7d73972bcb5a2b0094beb1c88f3eea9ce94bfccaf688b6f5fdbf18e43e38694b91107a141ac0acf0576ed6 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce
 EBUILD pastedeploy-1.5.2-r1.ebuild 1025 BLAKE2B 0915391a58705bc63be0943f1a67ad9915d4095824c41d96080ee13400030c318f44ce6cc00faaab5df3e053f11dfc409ef4e2a84fff0308efef4c099dd6c5af SHA512 b02e704c17b05409b3148e18ec61c0655395c151898b04f53fcd0df1be8109416d76b74b49c3a43a292c50044ec3dd74e14c4698230481b42eb392a165351c3c
+EBUILD pastedeploy-1.5.2-r2.ebuild 1037 BLAKE2B 906d8e0cfe46745e2ed2aa60f276bd3c40b89b6546b47a4330befc54fb9dee0d2b49877e2ee4ad12abfbd6ca3b995287e2e21ba2048f645f5e1fe512933452f7 SHA512 e13cea5175181ee329b1827d80bab217195691bc0ad257eacb1cc78959ca1b60febcc3600de53a4c9291bb7f74dc1493402f14e4f61cc681c58b9431fcf727d7
 EBUILD pastedeploy-1.5.2.ebuild 722 BLAKE2B 2526770d694c21d7bfb74e277cf889ce35e1763e6a9e7f8122a48cb849c6a0897ecb6f1768de56c9a9d6b48af7d2cb6df7d25f2e985063fb60a1df19122e1231 SHA512 16e96c1835599ddf9021482b1f6589d5255d5de9dbe607fbf17d04992b23a2d42de0999466dbf2d9727a0a02aa0e028e15647fd7cbd0c7ce2e7bb0c4f845f677
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..a6d81e7f2c27
--- /dev/null
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN="PasteDeploy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Load, configure, and compose WSGI applications and servers"
+HOMEPAGE="https://pypi.org/project/PasteDeploy/"
+# pypi tarball does not include tests
+SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${P}-r1
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py3-tests.patch
+)
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc docs/*.txt
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 2b371b6a90eb..318091942ed6 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -3,12 +3,12 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
-DIST pbr-5.1.0.tar.gz 114412 BLAKE2B 9a886d3ee564f800208529be7a6e1999691a92ce68d8e9da09f36ff7b4c5fe497461ec2c21d09e969e912a8475aaa07154b74fc110ca1f58d62366e67df412b5 SHA512 f09b75c18e1acebb60e478c660aa6cc86c8c52834db40972e74729a13d53990d15d9efc887a584b8176af892845fed861a9cc3291bccc5d85673612c10eb0154
+DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
 EBUILD pbr-4.2.0-r1.ebuild 2747 BLAKE2B b1f4ae987da3a891fe95f9d059b089acb8f75bee89dcfadd981db41de800fdc9432e24530f2f638e0804eef9c0a316244e8b3059074fe797513373d4cfa5640f SHA512 d0cf43215fecf025910e51f22d92fd11501f8d649c31292a1623605f3536552fbb5ecfd84650e8788ec30248ea72c85b8a725a80cda0e4a1207ab8d0ad5318d9
 EBUILD pbr-4.2.0-r2.ebuild 2790 BLAKE2B 7abb3158a404d077fe0742c9ae542db9141b9de42a3c2537ef6ee0bfc7d9f542e2909e3351bdf9a6988cc08603cb24ce07044e49b08ac1f0c438cd8c6320fee5 SHA512 83903d15a678cc80171e0cd49e6bfedaebfa245494d4c2875bc6679d4647e65a816c9f41181f49739fd035b4c93a92a06db899b5a44f0688420035480c111bb5
-EBUILD pbr-5.1.0.ebuild 2925 BLAKE2B 4d98333c8093a1978a7f8f7b1ff4035a18787897e15cb3f4514c96522817deb613b1adf5356267ebadb53eb926ab0b1654659937b903b39b153a3b2867222bc9 SHA512 08ed8cf91ac16b094b9b7e69178408e2c7f864997afcbae5b43b612fa35995a3d2592919833b8cca3b71d4e9b14b9bf19a25d61cdcf943af3c9fc890cc47ef38
+EBUILD pbr-5.1.1.ebuild 2925 BLAKE2B 4d98333c8093a1978a7f8f7b1ff4035a18787897e15cb3f4514c96522817deb613b1adf5356267ebadb53eb926ab0b1654659937b903b39b153a3b2867222bc9 SHA512 08ed8cf91ac16b094b9b7e69178408e2c7f864997afcbae5b43b612fa35995a3d2592919833b8cca3b71d4e9b14b9bf19a25d61cdcf943af3c9fc890cc47ef38
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-5.1.0.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index c0cc4e82f516..c0cc4e82f516 100644
--- a/dev-python/pbr/pbr-5.1.0.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 732f6afc40b2..aeda4ef24943 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -3,5 +3,6 @@ DIST pecan-1.1.2.tar.gz 120316 BLAKE2B aa63103552e8563d7da27d2ee06706f5dbe507557
 DIST pecan-1.2.1.tar.gz 120364 BLAKE2B aa0f75249a3c91dbe45376180f1886ec6ff4169c407166dc7a6014152a4cc50bfb8085fcb53996fad75f3b142784ad0a6c2c52c7eb92ca1585dae9c771116c2d SHA512 ce7007f2ea9cf01b7375919c1624b8bf9b8a836d383b6a1906b6d33190b6586ae8700149d862a6a9f16d7eb5e29d055540a13122f67bd3074270e3791a82a233
 EBUILD pecan-1.0.4.ebuild 853 BLAKE2B bf4d4906a33f429f62834c3af413facc680d6b821659c975ce71187594dadb54fb8cd2cb1720590705feed4efb4c0f27a76c09f28e05bfec91d6976e268c919c SHA512 84ca233a34439f001f167907abc88ae6540a5fbf4498ad7bbbd1a36e99190d829f41057515de084425c1f25bb193deed8a84d1cfd5f4eb0c7ca250b5c261b937
 EBUILD pecan-1.1.2.ebuild 861 BLAKE2B b43ba1bfce7973b2fd588108c8e6f7feb6aaee85ae890b9985865abf8d485f4cc45d47b25db060b3163376dd61b680cde6106f86c8d87d0a0894f9d1326fda28 SHA512 6c98550020dc3d4ec9a3df22096fb3d78e6c5ccb5a02fa3faed608e8efa3235378f128ab43db8b0840328380ea4a6637c836b7312d3a63a53def56da5a24da31
+EBUILD pecan-1.2.1-r1.ebuild 857 BLAKE2B 0fc4cbbd54aa9ed32ac4cf11f31a172f1e1304190a30ca86727a3dcabd8152ec7a27fc79e5220215fe8d5ac55ecb1c3a38ab785eb1873051f8e47d4a4efab485 SHA512 93de7068eed04d839d1168ae722e744b1ce1e352e127f5053a4cf0ca02cacd1a632646cdc6ffaa2bb5b70944ffdb189e1dd13ce2a20de921d8ac113b7aaca0a5
 EBUILD pecan-1.2.1.ebuild 871 BLAKE2B 8013cc8721178d6286d62de514b89bb09aa13c7f19f893a772bfce05916b859c534ad47aa3a1b88e7396bbfe2000233739d3d3ba2554b24fd92699791a5168c7 SHA512 ac40db725b6a77c43529c2beca5d5ee2fb2ffde63859265e06fbc66e9e6c27d45c975499758810105f86fda77a616435a5d343f8ff423db13dbebaa187579f50
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.2.1-r1.ebuild b/dev-python/pecan/pecan-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..c5bde13c10df
--- /dev/null
+++ b/dev-python/pecan/pecan-1.2.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI object-dispatching web framework,  lean, fast, with few dependencies."
+HOMEPAGE="https://pypi.org/project/pecan/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/simplejson-2.1.1[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
+	>=dev-python/mako-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webtest-1.3.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/logutils-0.3.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
index f184d9a86462..b96184abbe2c 100644
--- a/dev-python/pew/Manifest
+++ b/dev-python/pew/Manifest
@@ -1,3 +1,3 @@
 DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
-EBUILD pew-1.1.1.ebuild 743 BLAKE2B 3ea45d63e72b2478057133b85cab386e9bc84c79d51077b7266af6de7aff08b080a51fdae085e1e9f18b98092248c36cde9d15d615404401937812c4195abda2 SHA512 5acbcf2ddb35c9d8ec9ae0244b9cc82715e244ac583038a6c3626f7c96b886b9d767466f4872e25218c0e10092ae3aff3d7b709424cb4a141175fb4beca8e5c6
+EBUILD pew-1.1.1.ebuild 742 BLAKE2B cd11714e6175a1f981e4026e00a2a04f126ba993a04a138d10a984fa45253720bccfc603db3bcfe4ed367b565038844a081313c6f2edd3913c9529b0a49278d2 SHA512 fb5b81b6d23336b12ae3b2b0a7ed14f6c95a97675de0ef4698c187fa1783a1fd977c24c1381866e7c09b8de14fc5d154068ec291c8236a67aab166fbb1b06dc5
 MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 5c0c4ea55839..b1256f212e99 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 03a45e16f995..a38aac901972 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,5 @@
 DIST pipenv-9.0.0.tar.gz 3859618 BLAKE2B 138e53b1ef08d036f4ded6b4ca9da1a88084ad3d987aea1c6783181de414f7b24a54d46b26c2171f0918a1b1c22e2dac983fafad8a80f4aa95f93979bebfe2df SHA512 ea2d5ada73288a5d20473d769e20d6d195f65c3d3aebe2e52a43e1641af916295a18810bdb74a611751e773bfdfbc0ea7190d61358dce66d4aa33fa4a6f6131f
 EBUILD pipenv-9.0.0-r1.ebuild 892 BLAKE2B 125ec57e5556590ee4dcdc32d35f86f2b8b07d8f09d98f18ba96b3393541cf407010c7f43c8692865e9c1b721a8bd8f03c985660b43306196f2f9bf7a0ec14b3 SHA512 0ac8571ac6fafa820752f6e469f4641ff247b8655c2fdcfbe533992e2f00177a8d9b5fafe6ff7bbc3598e32bfd15844d41b5b9bd41dcae458ae4f2da92b651d2
-EBUILD pipenv-9.0.0-r2.ebuild 1071 BLAKE2B e091f28dea632a1c7681f5e85585ce1fcc20bb664e03b8fe716a62b1658cecabf159d5508ec4a6fd3a21c80f3474c14b1de204691f806498e2649773917dff3e SHA512 6180fb88f4c0537a89db07fa024d4098c55637d12342fe6d9350588d981f6bd81aee44d1113c55722f0feb70693c018e7c2b8c0cae6b3d10d945b3b1f3af51f9
+EBUILD pipenv-9.0.0-r2.ebuild 1070 BLAKE2B 686e35d0fa772cb5cd5bd86459b51bdb7fa72c1247d1755398c90b0dd1fc8701527553a7f7cd81b7cb273790baee580199ba6740a2df912a54de65e5efaddb46 SHA512 8951f278d399bc88637b463f3251f35856806ade72e65395c76b931581c348dc62771d8ab1f1b2c9241ee63c2adcbf5d2134b39fcccf21f47179a6d65f1d76f5
 EBUILD pipenv-9.0.0.ebuild 904 BLAKE2B 2e27520e451f2c4a4dbeaaa274a0c8320c457c395cfd937ecba35635aa34ef00543e99ab804f01e02168c51e02d01c8e6be5976eeab07f488aa34c25baca129f SHA512 b3912f68a16b99c5beee665cbdc233f33448a0da0b9cc573dead90ded93ca58be7ec5dd43429a9f27da9f0db24c861cea7a40eeb5cb374da029fac1ab28b672e
 MISC metadata.xml 445 BLAKE2B 71ce759695adf862ea00805dc1865487ae2b4bccd94af567240463b8935463010c4c8945fe3ba58a216afae1066de9b8659ea0ec216128c9017ec42e52bed3c9 SHA512 15d259d0f38fbee2fb0d9765934eddc46c8bb1a6da7fc656f3b2b006c74aa1b0ffd8211e9d9c23f241113a8ae3a333708acbf351fa1a150084b127b4eab88795
diff --git a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
index 73a98b4733a8..051af5a9f0c8 100644
--- a/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index ec7b31de032e..1558914362e9 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,6 +1,6 @@
 AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
-DIST plumbum-1.6.0.tar.gz 77092 BLAKE2B 795101098614dfe547e884fb3c4f9e7947a65995a5223d89a83aedd91ed7d4eac25dd926d022e32384430620561128f9e957d05af68c463a65b58e8a86ce2717 SHA512 0be9461720cb03c56aff8f56705b1753013e02df4b4d3dbc7e8379930b9efb3822df587483ca708f3a16f08d625f03459f8fe377bc50e59439d05f73669003cc
 DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
-EBUILD plumbum-1.6.0.ebuild 401 BLAKE2B 3d75d35fa45b284dc076a2658210b70eaedbb8ca8bf1b4bff635a5efd97f91dd3fd6dddd2d255c49fd1d63a59efead5a66dde4dde484bb3c079cca9ed1c59b38 SHA512 e7516ced1b546c0353a265c6726ab5602e598c95eca1e1327d8a5d82b0db8de73217fcaf41b00d829ad1ff15c41741ce216066471c6b4057b1024a18027e99ac
+DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
 EBUILD plumbum-1.6.4.ebuild 498 BLAKE2B fc648f18bdd2919185b6cd3f4e7f91f5f43bf9e36fcfff07b7fb8ee9e65b50bd64ea21715896f1f454d680949abda63a2dc06d984b438efb1485f132ae51f573 SHA512 60c8398f8171411cfb4a583c0724d12184c140069a357eb58faf4d97ad024476cc2546efa753aefff1ead95dfee750f99b0c5ca92d4bf34a2192256600922b5f
+EBUILD plumbum-1.6.7.ebuild 465 BLAKE2B 500a257a6e817f897270db29032afe940ebdda9fe14fd05d891ae3943dada3071c8fc44cbb6ca1e1666f656011c08971d103deeb8bd2770181c82fcb164e2d40 SHA512 d17923cf45f1442faa93edb11901022c11a3af3689c92d9b5c1fd9e4e8c640645873c68774a2a90c69c4d95dd23f21fb49ddb84da681fa1bd4463b89acbb991d
 MISC metadata.xml 667 BLAKE2B 831314c0a117c620e7d17f7023d0bed99deba80cf0d84852bd972ca788aa8e4ed6d959938fe5c7592db95b13d600a86b7928aa46a58d65cf1b9e48a2209b5c61 SHA512 c44ac643857f1e096d33e7ac3ae9a5a7e135861b7f6e26a3b889d9cc4fd5d302ac9657520c73cdc618b95ee31f168cb2e5704c1bf1b7710b859e57a2abafa812
diff --git a/dev-python/plumbum/plumbum-1.6.0.ebuild b/dev-python/plumbum/plumbum-1.6.7.ebuild
index dc3714d61357..66450ca0aee8 100644
--- a/dev-python/plumbum/plumbum-1.6.0.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.7.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
 HOMEPAGE="https://plumbum.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
new file mode 100644
index 000000000000..86fe4b0c940d
--- /dev/null
+++ b/dev-python/podcastparser/Manifest
@@ -0,0 +1,3 @@
+DIST podcastparser-0.6.4.tar.gz 22446 BLAKE2B b6111251c6ce325a91e763402d7f0a6cfd137491939dd581e1e4f1bb2458b741fee0a61eed009b61876224722fb4e43d289b2a294e02bccb724e2f0337786884 SHA512 c63065aa822b0210891c3316fc592591bcc962e16c52a86815637634ad5f02d3f559596e3727d56d191c454f28320e21ddb469ff8473fc99f57ea830fb046b2a
+EBUILD podcastparser-0.6.4.ebuild 380 BLAKE2B 7e311eb86631a706883134a308f0905fe3cf776855154127d32389d8bc8404d8c7f2040a34ee34df0da82cc91bd225c5306c2fbf87ffd4c40c03efb1b554715a SHA512 a3507ff8da4969edb9a643f37b96818170bf7021ef3a5bdc245ab3dab81db49e9bc625d9d2182c8ab403126eda5520649e00818d377721752e584ba8123da466
+MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/dev-python/fexpect/metadata.xml b/dev-python/podcastparser/metadata.xml
index 8fe841db5de8..39626a990be5 100644
--- a/dev-python/fexpect/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="github">ilogue/fexpect</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/podcastparser/podcastparser-0.6.4.ebuild b/dev-python/podcastparser/podcastparser-0.6.4.ebuild
new file mode 100644
index 000000000000..6ff89afc2b05
--- /dev/null
+++ b/dev-python/podcastparser/podcastparser-0.6.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Podcast parser for the gpodder client"
+HOMEPAGE="https://github.com/gpodder/podcastparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 27f9e7305cff..a4eb5c7be42b 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,4 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
+EBUILD portend-2.2-r1.ebuild 716 BLAKE2B 509a32f062e47230cc6d62919b45f9954ce0e15cfd58843a7376ee1aad5a645278e5eee4c2e0b85db6fd4cc1c8bf4f8e82f6018017cd00b979f48dbbd4a9af5c SHA512 4dd8469cb1426b41edd40ddbff10cec085d86b751313b31295f0853a7c8d1c50aedc8c2aeb404c22a07350a972e246b5fa763717b9a7fce41aad372eff65a8b1
 EBUILD portend-2.2.ebuild 721 BLAKE2B 41301119264f2c4e126083ff4ce8f941a204a2505c4e345185ef0191318f199ba1dab81c8839ea7e63f07897e4a9047cc9df2167725ec4f4b75b9eca90b890bb SHA512 32047fb041e2de07b8accc5b0e1aa2e3e21f9ba4039569b70e1cd49c85ec5ecb45e1e3522e084fcc96af65108efb31f73f5bbcdd9ba2226d439dde1845ff6ffe
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2-r1.ebuild b/dev-python/portend/portend-2.2-r1.ebuild
new file mode 100644
index 000000000000..aa3d5f77db5e
--- /dev/null
+++ b/dev-python/portend/portend-2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="TCP port monitoring utilities"
+HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPTYHON}"
+}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index f85f7d2b9901..d74d42e40888 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,6 @@
 DIST prettytable-0.7.1.tar.bz2 21499 BLAKE2B 6f8e3306fd26e134dbcfed18cbb641f6b167cc9b91846fd14ee9402c5f7384d71b00d120dfe32cc6948ff6cf78c613c8f4317cae0ae5b3eb028e16f1054cac12 SHA512 1a7aa604f608483b107401ddca9721ddea673ea1415d2a514948f7399835784e0a9025f0e5236f4109890e5924da345bd111893200730501b496c136465c204f
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 EBUILD prettytable-0.7.1-r1.ebuild 599 BLAKE2B 731536aa4482096159be2569e00a84c4cd7d8dd397be02272fcf2026c98cc8316556041831ccf8c077e06338d4119c81cc67711c7fbe934fa0114b58cf3f9dc8 SHA512 4759b8ee7210fc0c0acd409e9298b3fcd4494bbad8407b7c786ab63f2c325dc32b452b9d053064664d5d9afedf74f8799a431985659f2286dfd8abc569813f4a
+EBUILD prettytable-0.7.2-r1.ebuild 620 BLAKE2B 0a604b1cd0b65d72d7eaf3115f6f8018a78bd518e0b70feea6906cffb0fe6df2757bfd0813dba9b4bc2554412d2835d14a22f76bc60e96c69271fd340123f6db SHA512 f4eed0dfac7d3b39676ca4839982cdaacbd45c0f7cd7b5cb6114cd67590c67c8b155e9ef355a710730f32b6cfa88e469001e7e7caf3a8da45945975e1478a60c
 EBUILD prettytable-0.7.2.ebuild 617 BLAKE2B 7400886ab5f73f1058a0ad4d93899dbbc3d1078cae3a82f4a89eaeab762a0167125da86ca3a54768a7b5e72ce7aaba8fdadcdb22aa1bdc5515334895ce3d761b SHA512 d47a152c7d9fc940ced485efbbfc361d7f4085b959f2f01a155a1633d948624df4ab656a2bb69483366db27db2bfe4c6ab641a7567c102f0933dcd820eea2b0f
 MISC metadata.xml 388 BLAKE2B c19229c631dbaafafe2f8b2bcb0650052b4827bd6d0901d51d7c16fcf2456fca33efbcd21ee3ea1012a1b28c7cfc67042661b02bcc23af6d5768bf180304efd5 SHA512 7ac1cfd03216f171bf432f35b21bd6b43d297e77f41dffe5c5c5c4d85614c799252182a06bd5a116b5b831c06df115dcb933f1b2fd051eca8676f0aca7997d58
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..ab4c1ba7e987
--- /dev/null
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="https://code.google.com/p/prettytable/"
+SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 4264d6a92a3c..efbd72812603 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,7 @@
 DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcacf2355da0540b21af35cc40cb0f0115d0a3b027236235a89a95c1ec1fa947bf5b88b236b737fab5de78e7bd5fc798aa764 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5
 DIST prompt_toolkit-2.0.6.tar.gz 339714 BLAKE2B f969edef98d25930e4d61c1500bb9c8d731dea29e8d154e6baa2ab4045ceaf9d577d46024734a255cc15a4c13685582309e9d2fe7ae3320257f6fd1f9981ada6 SHA512 37082011ee5b8d6fd9febef95c92494ed6108b9ad8c64ac580b69c3464781a2f0dcef5b1c4d06fe309a3036932f7c622042e6b2293acf2ab6f9f2aa3c48d9322
+DIST prompt_toolkit-2.0.7.tar.gz 343267 BLAKE2B eed36fb951bcf8b0663a87eb4e77267246bbc7a6b773ed76d730c04b4dd012434fd0e71e5f558c231fd5ba1e8b3403878106bf3c60f44b7aa3e492a99a622b65 SHA512 4ea8102a50290878248ccc2119eb2b5ae50ad58f466510f8328bc172942f5417abde24393958c910ae0ab2ea4a8caff049b6e7acd8d94e9dbeb97b36c6e2191e
 EBUILD prompt_toolkit-1.0.15.ebuild 754 BLAKE2B a363862593748865fdd8c312cd5e2eb654bc04f8e73e0149a21b1752a2506d5f4ce07c9529971c7ffaf583bfa58d6aef45a8ad8d4186cdc1e0683b5df5ec2f93 SHA512 3f735e57d8893a89765e62aa1818bed08ea1b9a50efdf4f761bac5d43cc399ae0481627e53c8f4ac3b00aa90195a933f354bfa017ea69a36ef8e2f96dafee486
 EBUILD prompt_toolkit-2.0.6.ebuild 758 BLAKE2B 09e4f9d91eb9b8e252a7d665c156e903e35267bc83b35c85cd279eb05cef5c05c7bc3cf2426909afcfa42f7382fd6ff33893f20d314cacffa3848710c9885935 SHA512 fd33b49d741dd2282e31894f9e09348aa9fae700dc7cf7e91e76d5d6b6af175916a175b75df39e080c9f949ca6093f00365d8bfc5240756f57499e80f681f918
+EBUILD prompt_toolkit-2.0.7.ebuild 760 BLAKE2B c6d8ccf5754e821889a7e9ae65be8760eb48d67bcb36da6327b4dcb30dd0e0ab2a721ae17cebefd63104c081fad7e0d1add7eb5052607c3075020b5267287971 SHA512 6e3584f33f8d2d0673570b8089efc3fd734ff888fdd4675d53e443ba581e613228a53301fe5e9dc2c2e94fdd472b77d48e23d965cddc92521645ed74350a4394
 MISC metadata.xml 407 BLAKE2B a53543e0383cf16a19405b6722f7c5b430c69b0ac1a0863681ca700c56dba8e630f04e27fe682ecfaa905d6fb8ac4b4fbc78cbdc3e2575647071c2662ad5fe5a SHA512 7322ba928408db64bb54edf92fd385bd2fc41dea2a857bd2034d3b3e3bfe23b7fc82fd8048a41bb65f0aa103153e9f99f64c5f6abc76cc01a3d2db139b0a98ff
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
new file mode 100644
index 000000000000..23d9ed1bf792
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index c1b8ba65520f..5eff7736dece 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -7,5 +7,5 @@ DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94ae
 EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B f7566fc24019d971eb0895f5f5dab2f86688e868d86fea4acb211d5d5f48b843b995dbae96c1eba17044db12c83b50ea402b546351a991960f383f79cc4a1153 SHA512 6d96b5827e4a569d60506570bcfa38796b7e240c85db8aaae215f79841968d13df63eebfed451f1aea8f9412267ea491eca64b776034044a64711951deb4b390
 EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac251f54c53d410682e94369b3a2ab62d084bdf6d1a8627c11096dbedcea565d157d96d428f447035766105b7affa1bc5e23a46 SHA512 b84fca10588e8faac8c4bc95e50d7a39a67e919e0c4a28c751f8dba9a7b421435a0b2df77d5989862d4d63441a4625af3b75b6ef59814f3d41d5da2906ea6eb4
 EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281
-EBUILD protobuf-python-3.6.1.ebuild 1399 BLAKE2B 0b31c995156b2f36cbc7bc76dc3c9100b904150580e052bceed2e6a5ee06e1107d74b763c8e4c795d9e9ce05a5812d6e0931a43cc74108e8757ca81c9cafe567 SHA512 51d6ce96f4146ebfeb2b39571cf7cf3b580526069c45a4d5ad91962b78f0c34d335d894d0a871d391a398f510f337893508392cbd7291a636a8c2ddec36cb847
+EBUILD protobuf-python-3.6.1.ebuild 1398 BLAKE2B 3f0c8016a5b96a0c33b4dea9d5e63207ad53b2b813c68c7301821406e5d70395eb58d7616d21b3de8568413fe8dae21ba47b064f07e8ff2d15058a2f3a8b12b8 SHA512 16b281fe310af2fbd702b3c61ffd3c53ff673221b0bda8d07ca1ad7dc96cf1f4b49a6a6715753e1ae03a5f789ab5ac25134658a2bbf7e8f360ec2358a79482d4
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
index 1263e597ef86..abf9aeda24b9 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 95a6560b3e6f..8a94021e058a 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,4 +1,6 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
+DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
 EBUILD psycopg-2.7.4.ebuild 1561 BLAKE2B f3f777c8efaeb7f31a77b025a2dafca2df253603b295af25f1193110820769e2fceabf305160bc7ffdb2deb68aa0069cef2ea1734e388cf337659a6ed3b454c7 SHA512 01afd0d38aaef299d9590f9d37b3f3bc5c2068e5a24da0cac44e417582952c93e372838f7922f01f58d6aa178d079e9036022c7ed044d66263865b22767ada5d
+EBUILD psycopg-2.7.5.ebuild 1568 BLAKE2B aadbf7b22637151227f36add992b5b8cdebffcff15bb9e185304790237f0dcc18f4640d0019ab15b6405afe4b6f3f821e5025721d5d2e9df687105ec5ff51413 SHA512 36f52384fe13174d6cedac08ec629874c5c9d802245702bf7e20761e38631fcb65a1a6ca4f3bc1280f5d21df3eadba9e92a92d7ee891ac55451385d5f4d23bc0
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.5.ebuild b/dev-python/psycopg/psycopg-2.7.5.ebuild
new file mode 100644
index 000000000000..e126c37d17a9
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.7.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=( "${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	if use examples ; then
+	   dodoc -r examples
+	   docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 037419891f04..23f0a8c44115 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,3 +1,5 @@
 DIST pudb-2017.1.4.tar.gz 55322 BLAKE2B 9cbcf856e364938b93e882d97556512817eaf9fda81a6b5dcb62f626696ed50ad5434cd238a2a73d90484b8e10a2d25b41d4d151fa066b410ba88b85372559d9 SHA512 7abc4f09eaf0df52f66cfc477e02285c32b1650f92db1e1bbc95cba534acb4bda1b5f853f7a1dd1af61ca7ac0296a10b9082e6c9059af176300b93153d472bc6
+DIST pudb-2018.1.tar.gz 56771 BLAKE2B 1c57392a2dcf1a178035fd5824b253a0b5ad19990d32360956b55696f76f40c69b3baaaff14bd4bbc4556bb7c7e12bbcf4f00aea057555480771bd27c1ec4ced SHA512 4f0311d5a8642ff7097c2bceecde9a45999ad4567e008507cc8f977cc1e452cbbb80be525d08703c3e22038831b6b94e9b5b46ea1f1a1dc2d4292c8df9ef7ca7
 EBUILD pudb-2017.1.4.ebuild 550 BLAKE2B 84bacd3c419fddd9b7eb52b72f3d6fa954d27ecfabc9971d2a14f9ad467c8a2ead726f1640d9c645abac418db899280fb92d0fc9e8c498beb87e902b39ebdecf SHA512 37e7f9139b56aa973eaad7b2e82208c1c908c25c22b4bc7f3248eaf50c227002741755c853de26625d853773f25103e6c4a9ec3ca46d9ee3728aa8d0e477ab62
+EBUILD pudb-2018.1.ebuild 552 BLAKE2B 68599d04c53abe6eb9026f39bd9d94801bb817b126bebc25765f7be75efe700a0af861c7da099dd4b6ece9605defe1440db0a9438d3d8dbb5e964b3b5fa87f78 SHA512 ab2cb71899b9a22c55d1076401639f388e0a81221cd8b31aba1c2dedcaa5fe9167b4a67901d12bdcb876ab1354e8fa1d52066c011a12878cf94a6e93092868af
 MISC metadata.xml 495 BLAKE2B 7cc2da3650908671807f02695e8fd3f1f674a7a591313072bb6b61ec1a7a597f8b6fff2473cc385a9cfe8792be4248cf5e48330f6716dd362f3ab3671f179150 SHA512 21a4c18638b19cef9f1d01f7641be082c20053a0dbd455d2c8a6f5cd41a058224362187c299b96e0735cff6dccb942c060776f17c94d74a47b290ac7f5916b80
diff --git a/dev-python/pudb/pudb-2018.1.ebuild b/dev-python/pudb/pudb-2018.1.ebuild
new file mode 100644
index 000000000000..d85dfc1199ca
--- /dev/null
+++ b/dev-python/pudb/pudb-2018.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 6cdbd961e6da..3243813653a5 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,3 +1,5 @@
 DIST pyTenable-0.2.2.tar.gz 53904 BLAKE2B 2a7c747b89900ccc6181627e8d0efbbf0f6081ba67b14366dea5aec8f60c95fa9496b5caed2f619210c573455c3af6148f9cbf686738bf9a03d14913e82cd41a SHA512 231e0e0f7f29607bbcb57e2f6e064aee87e2229e9465be52e0f3010ec8beda9795f658a2f6d4a6fe2eee6e7ab446a4ecb5c93264291b92f306271d705560baa9
+DIST pyTenable-0.3.0.tar.gz 62847 BLAKE2B 61e7fda6437b020f207eeff3f2ed772647dd2c1dbfe848b921c966fdce5a4486a1ede8819ed6f7235e46464cebb06691daffd48a0d84a0db0dae041532f4311e SHA512 6e0d93d49358fb32ce3606968eb0a40be2089b22bf9778e2fcc9cf1f4e668d0b5d2c4e216773ab68bf4121bbf461df0141b3403864654c455a84d79c723a4018
 EBUILD pyTenable-0.2.2.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
+EBUILD pyTenable-0.3.0.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.0.ebuild b/dev-python/pyTenable/pyTenable-0.3.0.ebuild
new file mode 100644
index 000000000000..4e6bd10348c9
--- /dev/null
+++ b/dev-python/pyTenable/pyTenable-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
+HOMEPAGE="https://github.com/tenable/pyTenable"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# requires networking and API endpoint
+RESTRICT="test"
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 13d5d1afb652..9994b995a60a 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 617 BLAKE2B 13a185174cd192ede9a3c94c1ebc1f2c29a767d29faca5625a89039e1e0964db87a77d759dc23205bcc355157e8e713061c3b6916defcc8cee6f6eaf5403d07e SHA512 49dd4da4d33ed0814e3d2aa2e64790a1b634542067fbae1d6e78d9e35eea4b2994be10a877d83c62d663eb04fe5c918e9b1fb676b1561665b7764f45b5e84715
+EBUILD pyalsa-1.1.6.ebuild 615 BLAKE2B be22f9ea3771cd822a51cae6bea98c8e9df083a6dd7927525d303f570c4d1104d4adc85ce8e1db5316f372504b794b11b1adcf8dff50c25f75ff3e21dd966e31 SHA512 ec41b03202840c3a06a0a7b2e36955a31c77c8e4721ffc4e5d5c05881f95ce280b34c0a052959bca84ba72214fcd553ff6c928f90246285cc6337076aa749159
 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 53005f0a245e..5782b7beb26b 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -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 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 66cd0752ec40..b9f915b53617 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,6 @@
+AUX pycairo-1.17.0-pkgconfigdir.patch 2465 BLAKE2B ea288bb36d4096586d2384b3d25b95fc02747e0780c773bde768832893fbe7c87476ab57fa342d6ec15ff06c6cf123cad1b1e6461c79aa3e1c86369f5b96fc13 SHA512 716e55df7416f8bb6cf73e3576fac5a9967667019b05ae9dd13e4c9edacf9c07d1e29b6e67ac8bb158171d8d2d82d02a61f3d8fb77c3c1a28e288de1f352d163
 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
 EBUILD pycairo-1.16.3-r1.ebuild 1095 BLAKE2B 20def77c3a3e045e0032facc0398ffa8ff74c5720a2c4b94f766a94bab62d3ded5bfa38635f3d95f864f38f235b942522bae3a4b2e7ae554a937f47bb96303dd SHA512 cc782cf27262f03e466e714aa232b5525ecf8e38e282890df3cb83ee9f18ccf28c4bb4a04cefdc78436d5b8c0a8d1cec6508bde5c966fb01db8dbf066ec39dd0
-EBUILD pycairo-1.17.0.ebuild 1107 BLAKE2B 8eba2cdda75db82159fabe1dab3b4918f1936faa6298510169e40d3658d412d138d5568ca93be262eb00b5c0da5004452d6f1a52b417142d3368fb9b99db8823 SHA512 07fdafe3bad55ca27e57c04ca0824ece886453b282f506efebedeed8f03eb8a680d206eced00e0442f45513494c6cb81e71f33c73f4563a12e83f33429e2e9ac
+EBUILD pycairo-1.17.0-r1.ebuild 1279 BLAKE2B e3a7357b55481d7dc425848534e21474f3ae4ab14b7ad8bf2f807aa003298114bcc3d7eb8ff04e53c46dd2fc37315b4994084834aabdf6cd2aecc864e3a61bbe SHA512 f22e7853603300728d09ef47be0ba24ebc785c897e61261061c98d6940d714907f12d87b05357d073564160785cfe92f71b3964afb32ad8165914760894825ab
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
new file mode 100644
index 000000000000..d4d75a172d63
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
@@ -0,0 +1,71 @@
+From 430c6ffb65cd839be5ba6266a89f645afa8f9442 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Oct 2018 12:30:56 +0200
+Subject: [PATCH] setup.py: Support specifying custom --pkgconfigdir
+
+Support overriding --pkgconfigdir for whenever the autodetection
+gives incorrect result (e.g. PyPy).  Fixes #119.
+---
+ setup.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 36641d9..75c8888 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,6 +14,7 @@ except ImportError:
+ from distutils.core import Extension, Command, Distribution
+ from distutils.ccompiler import new_compiler
+ from distutils.sysconfig import customize_compiler
++from distutils.util import change_root
+ from distutils import log
+ from distutils import sysconfig
+ 
+@@ -265,11 +266,15 @@ class test_cmd(Command):
+ 
+ class install_pkgconfig(Command):
+     description = "install .pc file"
+-    user_options = []
++    user_options = [
++        ('pkgconfigdir=', None, 'pkg-config file install directory'),
++    ]
+ 
+     def initialize_options(self):
++        self.root = None
+         self.install_base = None
+         self.install_data = None
++        self.pkgconfigdir = None
+         self.compiler_type = None
+         self.outfiles = []
+ 
+@@ -280,6 +285,11 @@ class install_pkgconfig(Command):
+             ('install_data', 'install_data'),
+         )
+ 
++        self.set_undefined_options(
++            'install',
++            ('root', 'root'),
++        )
++
+         self.set_undefined_options(
+             'build_ext',
+             ('compiler_type', 'compiler_type'),
+@@ -315,8 +325,13 @@ class install_pkgconfig(Command):
+                 "Skipping install_pkgconfig, not supported with MSVC")
+             return
+ 
+-        python_lib = sysconfig.get_python_lib(True, True, self.install_data)
+-        pkgconfig_dir = os.path.join(os.path.dirname(python_lib), 'pkgconfig')
++        if self.pkgconfigdir is None:
++            python_lib = sysconfig.get_python_lib(True, True,
++                                                  self.install_data)
++            pkgconfig_dir = os.path.join(os.path.dirname(python_lib),
++                                         'pkgconfig')
++        else:
++            pkgconfig_dir = change_root(self.root, self.pkgconfigdir)
+         self.mkpath(pkgconfig_dir)
+ 
+         pcname = "py3cairo.pc" if sys.version_info[0] == 3 else "pycairo.pc"
+-- 
+2.19.1
+
diff --git a/dev-python/pycairo/pycairo-1.17.0.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
index 65751904ec19..3b7e663eaa0d 100644
--- a/dev-python/pycairo/pycairo-1.17.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/pycairo-1.17.0-pkgconfigdir.patch
+)
+
 python_compile_all() {
 	use doc && emake -C docs
 }
@@ -36,6 +40,11 @@ python_test() {
 	esetup.py test
 }
 
+python_install() {
+	distutils-r1_python_install \
+		install_pkgconfig --pkgconfigdir="/usr/$(get_libdir)/pkgconfig"
+}
+
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/. )
 
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
new file mode 100644
index 000000000000..96960b3914b1
--- /dev/null
+++ b/dev-python/pycson/Manifest
@@ -0,0 +1,3 @@
+DIST pycson-0.7.tar.gz 9970 BLAKE2B 4ea59d558cd668b0ee074d22f19509056f5b39ee35289fb4de9123ff39472121a2cf57cba59888c43275c3a8ead2fdee2355b654aecad4fedbf796b478c02c06 SHA512 e8a48afbdd48d4250891d449c80f99bfc668e128a2784c1b951acd7e217cb66f6e527a7d417be3c5362930d426fc189cd3d0a7f4b2e41df351d2347f44d0e206
+EBUILD pycson-0.7.ebuild 487 BLAKE2B 575ad0051d2c184ae476685b85fb4e059ee9ef6e35e74e1bd2bf2612c07149415a83654b629f795ebc95874ffec01d92435f68a533406a73576c9d38b1c40d8e SHA512 c877c24994fa3eb2c4e2a79fe36a9651776de4e9e273d25bc18810e7272e11c0a938d6a69f7d0880ca7122c0113009a43fa27b510fcacd49682498393022b85f
+MISC metadata.xml 378 BLAKE2B 6219f2f67b53bfb416508e9d0701fdb719fa45f6748c2a31d4eb7df19cb80cb25f774c19bcdef069c65d34952839c06e3d597da3187d500eeedbaa3bd5fcb24b SHA512 7f3674a4976aa6c6591771922354183b1c448fbfd204ab9be0c160604f220fc3e6d483c155f8a06a47f7808e0ed79943843ad7ce5c03f3679808a58fa2377095
diff --git a/dev-python/django-extensions/metadata.xml b/dev-python/pycson/metadata.xml
index 42c1614f9ee8..5e324f58760e 100644
--- a/dev-python/django-extensions/metadata.xml
+++ b/dev-python/pycson/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>dev-zero@gentoo.org</email>
-    <name>Tiziano Müller</name>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">django-extensions</remote-id>
-    <remote-id type="github">django-extensions/django-extensions</remote-id>
+    <remote-id type="pypi">cson</remote-id>
+    <remote-id type="github">avakar/pycson</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pycson/pycson-0.7.ebuild b/dev-python/pycson/pycson-0.7.ebuild
new file mode 100644
index 000000000000..9c5fe89fb5e7
--- /dev/null
+++ b/dev-python/pycson/pycson-0.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+DESCRIPTION="A python parser for the Coffeescript Object Notation (CSON)"
+HOMEPAGE="https://github.com/avakar/pycson/"
+SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/speg"
diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
index 61f61b0c3b7a..5b40a24f75e2 100644
--- a/dev-python/pyfiglet/Manifest
+++ b/dev-python/pyfiglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyfiglet-0.7.5.tar.gz 767904 BLAKE2B 761b933d60d074d3966fd0c8a10a5e0da056ef351c3ab31cbb43cd545ea75baf8b4daf1c2b61f8023b88d9c485acd402b12c1ccde103e545882588d87c8302f2 SHA512 835a2710c576e3695388bcad60c93bd58394bdd263cce9b51bfd8d1d82582765924215bf1e7560b7be01d4551923b29f56c2e063e646ef5cffc970521e2cbfb2
-EBUILD pyfiglet-0.7.5.ebuild 441 BLAKE2B a2a3e6886a112ed7a9e15e7310ba4deafca4e751f9fe1f21b4414f1a672ba927c146222d773390d6103c7965e35486fa4b5d5c7dd6398b5e14160cf7a8d6fb10 SHA512 2c1254b686033b071d14c22becbda8420cde35450be37189490c7400cf089c6264d537bf7336883060a5d1e12a2475eb6ae0b7cff3b7eee6ef246bfd986256ce
+EBUILD pyfiglet-0.7.5.ebuild 436 BLAKE2B 97da013548ccc3dda30181d4ce4c6048de9cf3b51d5f86994101c559b7c60002dc511c69b959155eebd3fa23e9227f92803a5499047c6a30d91b8269d9d36fa0 SHA512 21a4d9db089f62dfed382056d315fbb42e57fc179b7a4aad0cabc8355ccf86ba55def773e2d3e26fdae43144f7c43703e62a6ee05225a6c4363112ed4accde7d
 MISC metadata.xml 464 BLAKE2B 1b46b5afe539a60af185b8b5fe10a6e7459508749263efb0ea88adce9655f103ab4ae6bfe666362df894bde1b642a2bb041ef53cf80cc0386d369a3d91b093b4 SHA512 a82637fbb0d524910ca2456bcc19028418d815bac7f52058eac1b677fd6ebcc62f965f002ff3072ffeed78fa54c4a6c427e672a21a8f3d1bc10bd0e42c3b3d9a
diff --git a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
index 57ef0d7b8e60..bf20bf561136 100644
--- a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 0d0de2d19950..d381da4261ae 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,5 +1,5 @@
-DIST pymediainfo-2.2.0.tar.gz 421683 BLAKE2B da7145bc0ccb4dbd227ae1b28691d6b7c85bcfa604568624b233e7aa219429b1678c7247e142b72fc1bbe99eefada929f8ccc50984fab033e179f2d97bf86839 SHA512 70081c0d7f952433dd706296b4d564004b8c28af431871388d5fe2fafddbec9e2035d8bc50df170e3761bb258b113a42bf2dc13ce3b4663f724ee08cd4136cc9
 DIST pymediainfo-2.3.0.tar.gz 423912 BLAKE2B 2108627d7eb661a4329b46abdf6821c7f9af6d3817455edf884d3d96af534424ae434e28c061deca699e967913c40b609f72ffe38316811d4c7b09008de0bde2 SHA512 6ca616ac92f4e8ab71d8edcdd1208dc3dcf9a13f7c3dd2d401a4997c95222b4e559786678826f75b631c4c46913c9cb390126a5468714a7c417638d3a4468d32
-EBUILD pymediainfo-2.2.0.ebuild 965 BLAKE2B 3ca559ad788ba79d963687c62eb0ab088f2cd6a942dbc7c5a960ebf6940f6e0f6f144132bfef1d2e77d73f0638d17978e80b20355b63c1abdd01e28535bc7bcd SHA512 c0c09a5ba066fefff04598a6bcd0ac3693d83086a1521a598b7a83523e061a4bb1c9c9febc64693820ecf28c329997d0d7b4356460c7c79bf1d1e528adb20dea
+DIST pymediainfo-3.0.tar.gz 425428 BLAKE2B b56fa94f41096aff143d57c8f4175ce251d270e1d94f8464800eea2c4a5a952a466b962c646b0449d81ce2dd394c7bab1293eb358a33742631e51aead49e893b SHA512 b6828065f8d4907e94a299e4b3d550b1aad6dfa335b5eaae73e51a9b9052a8c494960b95473b49c10bb4407d3f48db07c2457b2937464317d64997c380571bcd
 EBUILD pymediainfo-2.3.0-r1.ebuild 1079 BLAKE2B d727c3741fdcd0f581abe20f3bfc4dff3fa47b6880ddc33dd3e64211f98dae8789b6d62d2d32772593331d8877f84c009382fb8655b7ca372de1f4d7bf9d3ca1 SHA512 534a061468a4cf27a504b54f566d37e2a8e357d54c07644c2582d94033953d88e0c5182bd2a501096b36c9f4e14fd557eb3ad81ef8b3ee265cd8a2a068787577
+EBUILD pymediainfo-3.0.ebuild 1054 BLAKE2B ea26d5ce2f06d14949193dca7342a5498bee8448a5a65aa4439be2667c3e55f1369c91256ee520a3687bee29964436cc564c6eb4c00516aef3a28c253bf56527 SHA512 17d5f481f8119946d04010e298c2de2ca102e98561a6c48615531a0030385917f5cad923561ca783f8416dbbdf95d4263950c43a67a445ff9c8faf0e9e98f00d
 MISC metadata.xml 441 BLAKE2B 6dcb65038010218beb340daaab820392fa857e77a417aa8957f678983f0b56fbb878c508790f9c7f33b6acd8eeaab2320c7b0ca2d2533e112ccb984f9ec7d3c0 SHA512 a5052eb10a6672d924cd1a09505d2eccb26187cc11a16b2ab30dcf7e1ebf1e59e12e10f5b35426eebbe9c74a74611b25ea70464e661e9abaf22fee3ed361fea3
diff --git a/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild b/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
deleted file mode 100644
index 9e6cc2c78e70..000000000000
--- a/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="media-libs/libmediainfo"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# requires network access
-	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-3.0.ebuild b/dev-python/pymediainfo/pymediainfo-3.0.ebuild
new file mode 100644
index 000000000000..ea072cab56c1
--- /dev/null
+++ b/dev-python/pymediainfo/pymediainfo-3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the mediainfo library"
+HOMEPAGE="https://github.com/sbraz/pymediainfo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libmediainfo
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Skip a test which requires network access
+	pytest -vv tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index f6e952b0d0bd..f73ae1d18ae3 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,4 +1,4 @@
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.2.ebuild 600 BLAKE2B 898387af21a770c019ab471d2bd87f76324347f9b5c143cba00bf83fd83909bb308cd9458fa9898f0b624ccbe6a79c3fa517931da711bd0bbf79ced1d2065e9c SHA512 540f0ddae0944f8663ca802b530b23718c08cb0839ce0c0759ece91ea8f1d265f7929a3b8526ad2c92ca260ca83b723618efa2845ed2a9bc486386c027be3bf5
-EBUILD pymountboot-9999.ebuild 725 BLAKE2B 7d269d71fca86676a1dd78a33605ddcee852ac3ad28fd6b126c311f12334833fced52715e7db8bb57031bc8e818a609e5cc895dcd652592ab4eaa1c54a4748cb SHA512 e34f603432578895bfa4380aca112d5d76551acf6fcac3c7cf3aa39ec001958211351f53dea5c41b886382db2b572d9b9ec1d163599b3a9279c668cb43c7f4a7
+EBUILD pymountboot-0.2.2.ebuild 601 BLAKE2B aa39a8fb6c9ee35f2566d627f774985fd354bd5862cc39865a2674d11fa8415bf2967bd4255e5cb6ee2daa184d9738a894c0c09866e604b4e988b25d0e9bfa24 SHA512 f806b53953d998756c99aa64a7da5bac7ef6395ee5dd238ddba6a9081754f077aae86b5bfb4b727a7dfb944e11053da97540bc49af07dd9f184a03a91a0f57b4
+EBUILD pymountboot-9999.ebuild 726 BLAKE2B e8d1d245e771f393987e2cc817d77fbb5c4652fc8e44d798355cc1838ad21b2c57c15034f93366800e126135a77a9c463c791fc02ac4a27b6e534191e6844608 SHA512 dd2cc9aa86ada2b926a4c0c1475a0d6909f0d02a0a655826c22c76c0de1edc3f6fbba8f56b2ce767832a510fa730dd52881509620d85dfbf3aba53ec20275939
 MISC metadata.xml 539 BLAKE2B 0ab0699ff77f99bb28bfc66ddfad742f877f256a597305b3ce4d4a462c865696a7c466e32e0f68eccb138d367c5d360880372a5816683fb49d1063a5c55d9249 SHA512 d95f758cbce79b166abc9cf68c5605e03a4b5f168a25e46016c812e667bed8ce40a146beeb02ea236890f081154e2239e87386ccb37aa29acbb134fdf7704756
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index 6390c3678064..685f7efa576a 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index 6b4362ffab04..dee1eecf0794 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 41f3b169b685..ab07da7388e2 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 998 BLAKE2B cdd42964466ae359e11780f1af3ab5250cf1b39e978c46c9849406512176b6184e53624e7527eccefb0821709485ce74ba51765ee257629545fcb6058b78e68a SHA512 7310f00f7a4301e248b96aca258e75d19949104444b0e8bd10870a12a1851dae670a4837b82c8776355fd1ce941a3aca57979aa771525dae12424f81a925c02c
+EBUILD pynacl-1.2.1.ebuild 997 BLAKE2B b822a825777de270c614f7471e0f7b2537bbaa015f4538d05a0bce46df1e3944f579f54757248b28b44da02ced4b8c2d940465b0fe4789c19eb6f033b122cc4f SHA512 507fc63e985327227c0a53200eef0e1c6150c7706de6731792a52cff7525fd5d1aaf90011c6f2b2e428b9ffb8c68db853c65472769a5f15b88116e003738ae30
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 069a03cb9925..7fadfbf0c8fd 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index bdc83509cee5..ac0124a87cfd 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,3 +1,7 @@
+AUX pyquery-1.4.0-network-tests.patch 700 BLAKE2B 6ae1cf19f7ae717df3ce5ea509938d37024b4e06ecb422c91e3ff41992fcd2d2bdcd79f47ebb591fe803dbf6bf5085f2422b575ead44f00b04f3b5abe1237dfd SHA512 b491c1cfc8c917eefed0c261dbc25a91e65db4007ee393b39b666a9043d00d26affd38897f277436ebe18ae2eaf6e817b6001b14f12b43f335b82b22961b28fb
 DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410acdf008fe9afd08136a0a7f47d66b99071cce61a1569853ec9c3c38d20ca66aec0950532e94949b36d4814c3e SHA512 39a2bfe6f1eaefb6d1a78f73e5bdb4d12a9e223b26f6aff0f979ceaa68005ab08e41bdf11fe808489d22e0506e558621982dc59fa2164cd1e3d8168b0ef8ceb6
+DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
+EBUILD pyquery-1.2.13-r1.ebuild 1339 BLAKE2B c5492d641308e94af0b5dbfb6035341981f3cbdfa12e960557f9cc12acc6719b970fed6761ad06f328720fea3312c7f9c8b8d617997116d0953e86e4fa465db7 SHA512 e2725456271a1fb5d86d936042f0b154d1bafa2af8d73bc7969ce968530aa368091e9045ef45e61b3dd2be843389b89bf978e411c246bd03a7f20088a45de613
 EBUILD pyquery-1.2.13.ebuild 1333 BLAKE2B dbfb9b5a739efc0495da6770e7dc38ce4aace1f8d796b3bd151ce04f1cf579f66bc4eac720955be5fed6ed983b3c789cbb340e65f1dc53736bb2763896e98794 SHA512 5c105c9db4cef39eb5ea4021bc2aded6f37660986a45625336797c91d676ced037971175b7d836453538b1d4ca61d39e8d6847cbe227ab399aef5db200020575
+EBUILD pyquery-1.4.0.ebuild 1202 BLAKE2B ce2506c468af93ac02073c85c893315026e95dd23a18722ee4e544963f599d7b36ef09776f799635d3c60fdbe6e7b589436ec3d1b8a696bf073b14861f37f9f4 SHA512 e0b797a1ce0aadfdef7573e05aba95a81a32d23a3bd34c8a1408c89d567ebbd373406fd328a644cfabab5827108114c1c325f6c4a01df0bbaecc7dfa81753600
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch b/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
new file mode 100644
index 000000000000..337728794bb9
--- /dev/null
+++ b/dev-python/pyquery/files/pyquery-1.4.0-network-tests.patch
@@ -0,0 +1,22 @@
+Disable test that requires a network connection.
+
+--- a/tests/test_pyquery.py
++++ b/tests/test_pyquery.py
+@@ -613,10 +613,10 @@
+         self.s.shutdown()
+ 
+ 
+-class TestWebScrappingEncoding(TestCase):
+-
+-    def test_get(self):
+-        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
+-               method='get')
+-        print(d)
+-        self.assertEqual(d('#pt-login').text(), u'Войти')
++#class TestWebScrappingEncoding(TestCase):
++#
++#    def test_get(self):
++#        d = pq(u'http://ru.wikipedia.org/wiki/Заглавная_страница',
++#               method='get')
++#        print(d)
++#        self.assertEqual(d('#pt-login').text(), u'Войти')
diff --git a/dev-python/pyquery/pyquery-1.2.13-r1.ebuild b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..f3d235eb3121
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.2.13-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 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 eutils
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="https://github.com/gawel/pyquery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
+
+python_prepare_all() {
+	# Disable tests needing a network connection
+	sed -i -e "s/HAS_REQUEST = True/HAS_REQUEST = False/" tests/test_pyquery.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# The suite, it appears, requires this hard setting of PYTHONPATH!
+	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+}
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
new file mode 100644
index 000000000000..9bf1439e941c
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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 eutils
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="https://github.com/gawel/pyquery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )"
+
+PATCHES=( "${FILESDIR}/${P}-network-tests.patch" )
+
+python_test() {
+	# The suite, it appears, requires this hard setting of PYTHONPATH!
+	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index e3a668e58c5d..25a344ae1bfe 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -2,6 +2,8 @@ AUX pysaml-4.0.2_CVE-2017-1000433.patch 1245 BLAKE2B ef0d8c68cadb6c53810e9b3d083
 AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d8040415665d22104bc8ca1d54473c471c542ae74cda68fe1a62ec3d1ecab0c29f4a017e24d895da1f66bbb4c SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
 DIST pysaml2-4.5.0.tar.gz 20030696 BLAKE2B 547465c2c4191a26de6bf1bab55bd9c36ed7e477c620a4155b7a463c98dbf314a8067d45263055a05ec8ed696177fcbd1443dd856113871f2941b572b9df0628 SHA512 163dfc2acfa0f242bc97d3ec334aec98e993ef9265b2240223205e496f86df5518ca613620b371eabcca0c4070a0bf7bb72a2216f517e19e3b2ff0f20e30a0c7
+DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39383d8150f8ee30185733569fe79c7421b87b3439b95e707f17d5f513abfa2610be76441b8f18d8f75a5a9fdd3 SHA512 259f7395afad44caac32453a03bbdaf8c464adeeb856b78786b665281dbe75b37e8054efaf945a7d10333c0b09d9f516d606e95b157aed34c1cd0821b7255b9d
 EBUILD pysaml2-4.0.2-r3.ebuild 1078 BLAKE2B d3d045eff390a651e64c6354601ab63d566c0344ab07c7b014e04244f4029891455a721baaddd67b1eb9b5cd7c6fba6f2529e7e85a5ef8c94745aed33ed5a7cf SHA512 61e90dbbcc1cc55a32f285257a776504f1125d0b1b6ff5dc78ffefbbb68eab9e29c8485dd4a0da26df19a79ada63dde78f35250f7126db6a2eb2d3c2df0026d5
 EBUILD pysaml2-4.5.0.ebuild 833 BLAKE2B abab89c3f6d390488b1f63c53a59713cad3e6fdf93d8879767584c89690f25644260634e3c28de495f7ad1cc92341e1ba0a171627c73be9c926cc2f2eda14ade SHA512 c80b60d24d487de2bfd2b65843a497e05a025fb5ed924883482280caf7d7585cb862839008e2cff8853992f211bba2f99bb133f9c79a77f0442d47faae5789f0
+EBUILD pysaml2-4.6.3.ebuild 831 BLAKE2B b6c2b5a650a518e29f5a265cfe1cc5bbd75534cdcf4651c943c091e5212bdd15680c56031100d5e341dc9f01a0f5f6c4e1b55869e7fb5e64762d42f0bce3460e SHA512 8983d9caf23e4459d2a811c3e1cc0e5fbff3b5a4ca84cfb417cf3235b1bd6c287580679a50f02c8a4d1cdd2fe495ea35260418864d65d1cb19e503fd61a7a326
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.6.3.ebuild b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
new file mode 100644
index 000000000000..3733d423cc4f
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
+HOMEPAGE="https://github.com/rohe/pysaml2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+PATCHES=(
+)
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-capturelog/Manifest b/dev-python/pytest-capturelog/Manifest
index 8fdfe8d4c881..9f8ad1e0d129 100644
--- a/dev-python/pytest-capturelog/Manifest
+++ b/dev-python/pytest-capturelog/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-capturelog-0.7.tar.gz 4293 BLAKE2B e0dca3e3983f92afc01a988b339062286187175035c23f042e3cee9b3962c09eb0224a6859830ba8812aa39ba1c2f8460d950fd1bcc0c5d60d3081fbc93161a5 SHA512 82567697be2c277f49633cee5c83733b3383b89e987729dc977f4ef3dd08a5ef55d507f5380ac08def7791157208459ee08d686cf532280c665e659938f03c22
+EBUILD pytest-capturelog-0.7-r1.ebuild 906 BLAKE2B 00bc7368e980500a04920ad40d93949cbcb78c37b5ff6ccf1a47a683ea0b474d93ba36e1cde12f46747957353639fa7e8ec434eafaa8d7b451329cdd7dcc3d44 SHA512 ce3a96433a1369cc1ebe651107385460657cbd74ec3e0c9daf0df358db9926242951184d7bf1fc6c2570a9024335d151811efd1781215e7ba8e145053836fe76
 EBUILD pytest-capturelog-0.7.ebuild 896 BLAKE2B ba1472e7c64deb1fe1de29545711cef436ab8013f6361589a1115b81734dab19014897fc0f6cd91efac3526a38100a9e5e25b42876b053944de88f8fceeb441e SHA512 a62844d059dd140ba1defa806544008e1ba2f8db1c18cc553a14e01bd2ff89c5b6b59c835c73b8d4bf61f6f4c5066753a797caa48a4144ac7f29230b74368d65
 MISC metadata.xml 390 BLAKE2B 01e2feb9a06fa2d2a952ec1856e480645c0cadc14f34cf4d65897f9d3986d1ca7d27d6ef87402770904c46cb2265c085acd8cbae58c347eefe439e053eaf0c33 SHA512 c4f5af0f5e6ac325f47cced6f6032279bf9109d1581f18c051869cf7ef4526c38245c4b31335f6fb42851ec5ec8c52e2841aee044c25195142917a39000e7525
diff --git a/dev-python/pytest-capturelog/pytest-capturelog-0.7-r1.ebuild b/dev-python/pytest-capturelog/pytest-capturelog-0.7-r1.ebuild
new file mode 100644
index 000000000000..e9756ccf6af5
--- /dev/null
+++ b/dev-python/pytest-capturelog/pytest-capturelog-0.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to capture log messages"
+HOMEPAGE="https://bitbucket.org/memedough/pytest-capturelog/overview"
+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"
+IUSE="test"
+
+COMMON_DEPEND="dev-python/py[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/pytest-catchlog"
+
+# Not included
+# https://bitbucket.org/memedough/pytest-capturelog/issues/5
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_capturelog.py || die
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index f89078511311..06e017b1f47d 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -3,5 +3,6 @@ DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
 EBUILD pytest-cov-2.3.1.ebuild 1540 BLAKE2B 867cd8e71809be5676ccc8e9d5fc700c9a19eeb38827b659d23ffd9b23a9294e926e8a184bbe4649929ac561a8cf6f81582aa17ea2e57e9e57ac17f1e79df2ed SHA512 ab86d0f5bbe3fb3730335c2f45dc2cdc038e134e9ef17e8fc8c6346ed9d1efc3c4e46ce34d6c24c7e825c722a7847f1996ce57eda9b72a7838f9e9462d97a9e6
 EBUILD pytest-cov-2.5.1-r1.ebuild 1531 BLAKE2B ee39c41850bb4770fbd4c9782ccd20de882ccc2613b31b863a2a9f565227d22648f688b5f4d790926ca213a4fab4110f0bf4e463eb1a950819768a1c848af4ea SHA512 b9aaa24c249b712fa80cc34bbb380ef5909189d6a66145b1fd9f0260b5323bfe4487b81e3d23345e748443c91081dd05a3a00a9a77633c08263cc4e811eeaccf
+EBUILD pytest-cov-2.5.1-r2.ebuild 1533 BLAKE2B 7b7ec65ae91e9ee425975deb9cbc9c61dc430a045264d5ade13f89c87b539f773d76d61340786c467fcb6f470a8677af09178dc3d113497449a1f2aeec918ebe SHA512 dece63461328b15a9e18a986053408ee62d14c9ca938a7bf1881c13db3950e12d5a82611b9514dd268a07a5d8b1b20a6d6a696e1c24f6f9081a25af1c7a784c8
 EBUILD pytest-cov-2.5.1.ebuild 1506 BLAKE2B 57ef01d9e0c9012ca9e00918817c5782775cebd54684fdeaca16bca47439dd1c90ae85828f83b6fefe36295d536ffb6118b140e465dfea52cfc9314677486788 SHA512 2b6b0feeff3186a901c44a759731f18c8edb6aa7e202ce7fe68d620b5decdb82722d5df6806bf9f1681226dd18d6ae9c494d600c8fbd3a15042d3a57ef5ba997
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..98fb738ccee1
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		>=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index f45d124c9254..f25d9aa38e0b 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-django-2.9.1.tar.gz 50570 BLAKE2B f709ba00e16686cc2c7b3db168e775e8fcbebdb8ed732882d53c6c377d957af220b63dbe48120850de0773021f448270d855635336d08b6914edaa8c877c18bd SHA512 0e50f45a0cfefb6fa74f7d60d5173e3e8dac49ac669c9c88e46d27a01cff5c4a255d6f707863406b6f8707e25e9bea3408cbffbb75a2680fee365b9c9167d468
-EBUILD pytest-django-2.9.1.ebuild 927 BLAKE2B e40b384be5874629749c476e1a893266796b4d030dc1369416db92755a33867b113ae53db6b7490c4faa9c6e4f698f38e783cc4ff47ce746ceae9df8e6e2f9b3 SHA512 f2eaed773ecc4a287dea27ab6220f266d6b4c9d61e68c0886049027f0a93fa6cccc05bc19089a2c5413f95f77be2a089add9935cb2fbc670932aa17818d6391d
+DIST pytest-django-3.4.4.tar.gz 66962 BLAKE2B a989009eccab4bbd96e32ed1b6b5d03ca8105026c6d9219ea09f6b33fe2087a30d9042e2cd5a313196ed67cc1c5dc940d04fe981dda0da4f25cf16a43e88471a SHA512 a851b27e9abc4829a47abb5da40cbd69fea5c48b05c81f88910d4345696c6d01f78e07ac489cec7cfb5724dd8432891ff9260dc585e720d758491906812661df
+EBUILD pytest-django-3.4.4.ebuild 713 BLAKE2B c3cc2889003f27da85164b7c670e9a139f78f44b7900fd727d1a4963d9fde1e9934620936d5b54e28fabe239776f3c06968bd6fbd6622a41585458e8de9b7ee9 SHA512 caef6bd41673d293ff67435dd4d353b4d2fd0ce9acd7fce81ad145882f51cf65afa408342576756b6346e489e8659bcee20cd085af24348a583995e2e1185f44
 MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
diff --git a/dev-python/pytest-django/pytest-django-2.9.1.ebuild b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
deleted file mode 100644
index ecfe25826b50..000000000000
--- a/dev-python/pytest-django/pytest-django-2.9.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 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 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.8.0[${PYTHON_USEDEP}]
-"
-
-# https://github.com/pytest-dev/pytest-django/issues/290
-RESTRICT=test
-
-src_prepare() {
-	sed \
-		-e '/setuptools_scm/s:==1.8.0::g' \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	PYTEST_PLUGINS=${PN/-/_} \
-	py.test --ds=pytest_django_test.settings_sqlite_file --strict -r fEsxXw || die
-}
diff --git a/dev-python/pytest-django/pytest-django-3.4.4.ebuild b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
new file mode 100644
index 000000000000..8bf3d8318118
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 777b245a0885..0a3d32f3918b 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
-EBUILD pytest-forked-0.2.ebuild 908 BLAKE2B d13939e526ed4167cf7d642c6609b027775777879833ce6a2de84e51732cc42cd4afe301ab87dee93fd829dbeb436f7497b743f5e6b080049716c247425e8f27 SHA512 1cd0404db2342adf5561d0568badefecd67df773e1e8dde1163b39b36a60617154454c573ef3a135cc6324acf4ad84542531d65ff589c6bfd6149268bc13d0d8
+EBUILD pytest-forked-0.2.ebuild 906 BLAKE2B 57b9095b19f00233d93e04161da38481be723a1d54b663db9d7094d38c20e4f7d80ff12aac3c84cc2657b4867c1e7708c82f24a04c5408f94d1794c143ac4708 SHA512 9bac6faf5e9c996185c97ffd80c7dd9354aa9be53224a8a99406270a10edf45ad3f36cb94eb1f607c1212e3080b3c343a730b92c437ef72c2363c987b64c279e
 MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index 45c0392addac..133265271745 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 5ac944e4a821..3f571788aa50 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -2,5 +2,5 @@ AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136a
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
 DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
 EBUILD pytest-relaxed-1.1.0.ebuild 907 BLAKE2B c599c1b1a8e1f18f7fe0280ed7d5337e201d7fd61839ce151522c2b0316de7b48a048c16424dbea8817afbd3d9cd3ad11b1bedfe1b6942c6582446e259431f13 SHA512 4b9f17644496b1408960f76041ef96c1d311d0c86bb69324465985ea7ca53a5753687716cb7eea65918ff7273b038fd1d64e7aec5b34fd343f5e91479dc32140
-EBUILD pytest-relaxed-1.1.4.ebuild 1391 BLAKE2B 40e6178831051fab72fc86f01d93a6e9503811688950c674623467ad47118249bb316d198fd13a1704112ed87ce837b641bc3f6e007e74cfb89716e30d3abb24 SHA512 e333108444f7b4c1b6017eb5525a1fe045cc3232ab23244854ce4e2b9649356396af5f0a139db2679fb720f9777f7a11fa91e87b3ea0837d431b36f6fee03353
+EBUILD pytest-relaxed-1.1.4.ebuild 1390 BLAKE2B df98a21a19a1a7978533d71bc924035bce386097a6a1d1029c26a0ee67a32480862d85a92671e98c847f9c8c67f4be04eea4640e9d7cf8b5753419cb7cf1ab4b SHA512 e6de854d1747375b8f718a2de132a2fb3ec1462ad8cf904e6c882a17374107d0894213d9bc1703d506fa1fd33e7f32670960535fdab5f64242a856d415f89da5
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
index 85094ff0482d..5d49d5872621 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index c8a5ea49b750..eb3cb58d19fc 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -6,5 +6,5 @@ DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f79184
 EBUILD pytest-xdist-1.15.0.ebuild 1238 BLAKE2B f9f17170a8c0f777c86f715ad954de7daaf3f2dd8d3432f561fcb43b92461ed4d374122eec99e636467ecb3f4d376ab5a07c0605e12d50fa663bc26c025c8df2 SHA512 f639099d0f809555acdf77bfbdc783b92985f45608163a30c7ab01a5efc5e16995851a72eeb09b90876ad738e6accc14e69fd852f62e8880cb0900bfaff721bc
 EBUILD pytest-xdist-1.20.1.ebuild 927 BLAKE2B f15b00b5a68556d0a5f725616199d40e130f8cbc6b9250fdfbbf54f1d05b6fd0440b1aa55412c34e564e4acc113172ec140e614907c244aace48d2736de520aa SHA512 4fa357bafcffa5b77bdebbc36b26dbf400ba178bb4d629b56a3a52e080b397438ec66e7fc5f42f31ea95f4d811f8f4e17299a2974f358a5db117389418b81eeb
 EBUILD pytest-xdist-1.22.2.ebuild 1112 BLAKE2B 8bd18da522c4e9460860ead4d2f5662cab9d9da4dd86c762221942781ed02fe3cc6faccc495c394ae36b6a75f30f9198d9c90a8a6e8345182a78e11423e91a83 SHA512 735a2be777d3054f5b3854d27dfb61f57e3490e1e2be8ec5e2a12acc466119ec3056077917a80a762e416428fff11ecc53c1b1b1346379542b3581d9f8bd662f
-EBUILD pytest-xdist-1.23.2.ebuild 942 BLAKE2B 972bba95e1bf41d8de5d684eb490c06cb0e97fc6523097dbf6958ac73b0b9219a3b124198e8aeeb19c7f75d80fe55431d20e34c70e6787a1931c6948af598ec4 SHA512 ae2e04092ed3d928f453b18a6b1c49e23973f4b1208dc27736c3fd97f5739ecb21fbe160cfa8231e23ca687c891dd5bea9a6a2dae2299ec0c4f54749acd67801
+EBUILD pytest-xdist-1.23.2.ebuild 940 BLAKE2B 92ca6db708e04b9684476b100a2c3f162d0f6912657207379f8f3661439e6f4543533167d4ef81b982d3a2d0c05eab4893a6ab8a817d11bf80c4202f58c91534 SHA512 d8c1955dd3bbb52e451101da2be9352037c978a9c54752c3f921910d49a7cd1b523efd030a8dafa71cd76ba911e5d2e4a66eabfe6671aad6c5908e9b1c52a58f
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index 2a2477401207..2cfc5c3fbead 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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/python-application/Manifest b/dev-python/python-application/Manifest
deleted file mode 100644
index 4abce6f9c8de..000000000000
--- a/dev-python/python-application/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-application-2.1.0.tar.gz 49045 BLAKE2B 32b3a5e20d5aed21a399651ab8ac8c2b335b3f3076a1de688057851a883afd0d4454c34390e7a0688f0bbb716dff8a321481a509eaa3ae92daf3635ef6236d62 SHA512 54bf7c2257d84d213af5c1c192ea87c30a4c54ec5c334e3dcf4d536e610ffe9f56073b033807818c639b4e2585c38b87d6c7405f33b1ab45158fc6613d75c4c7
-EBUILD python-application-2.1.0.ebuild 381 BLAKE2B e05aebcea19d434c7b87b70a96c06e9aa3d190ea85e845931844fde939d57f19cc415ef3271affdefad27aee7b2624edff4e4f5b3df5d460457aa5c1aa71252f SHA512 a4ed655a2455d78b98ea893b5a992eb1fecab93a63d903c14d7ff4c636a5d5d559874929184bcaa0b25d1404387f7fc0ccecf72fd5f335195017399fa4d25984
-MISC metadata.xml 1284 BLAKE2B c48df5628c15a6d309dda0d21f36c699240a9d903fc21b37c8cc464612e19c3417a249d4a1670add02d66f3f7bb10809a487e7cb94ba59c0caf5eefe3ccd424d SHA512 a40bb81f3a76e9d3012ce5aa6a49f0671c5449856afaeb278f4b7bd32eceaf63cdce667d81385fdcab7af4180f80e46f9123a71140829e5f2d6388b73d919fb1
diff --git a/dev-python/python-application/metadata.xml b/dev-python/python-application/metadata.xml
deleted file mode 100644
index bc01efe4aaae..000000000000
--- a/dev-python/python-application/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		This package is a collection of modules that are useful when
-		building python applications. Their purpose is to eliminate the
-		need to divert resources into implementing the small tasks that
-		every application needs to do in order to run successfully and
-		focus instead on the application logic itself.
-
-		The modules that the application package provides are:
-		1. process - UNIX process and signal management.
-		2. python - python utility classes and functions.
-		3. configuration - a simple interface to handle configuration files.
-		4. log - an extensible system logger for console and syslog.
-		5. debug - memory troubleshooting and execution timing.
-		6. system - interaction with the underlying operating system.
-		7. notification - an application wide notification system.
-		8. version - manage version numbers for applications and packages.
-		9. dependency - verify package dependencies at runtime.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">python-application</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-application/python-application-2.1.0.ebuild b/dev-python/python-application/python-application-2.1.0.ebuild
deleted file mode 100644
index 77319b3cfa47..000000000000
--- a/dev-python/python-application/python-application-2.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Basic building blocks for python applications"
-HOMEPAGE="http://ag-projects.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-cjson/Manifest b/dev-python/python-cjson/Manifest
deleted file mode 100644
index 7ad4f1b7f4d6..000000000000
--- a/dev-python/python-cjson/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST python-cjson-1.1.0.tar.gz 12298 BLAKE2B 80d189c5884ba4187d16da6d18279e568519c84d83bec343bfe14a8408ae5a5ce9bd6a578381cf171c61b8aad2887bf0b7af2de2dc11a7cc065f4573ce584aa1 SHA512 039e5f724c3a49d0043f788b0634c4191a6ae5abaa012d8491622e5a9ac22ecc5a342a0243f70b0ac02c8640243aaf8b0cf20a0ab12ee4866d9af966d73c1706
-DIST python-cjson-1.2.1.tar.gz 12575 BLAKE2B 2f1ee29490ab8cbb342af76758cb418763a007a00de73f96215793e39924e81deefc1b1ef65350a99a38b3df974129a40a9570ea27e0cd25d384aad5c513a5a1 SHA512 dd998d1a77c4ac2f48316a66bb10741860a1ed7b8f54431bd72f949a4070284fa5040ed51c3030f7ad9fed4d76e12112206d32acf204800010c8b79b1665d684
-EBUILD python-cjson-1.1.0.ebuild 367 BLAKE2B 5a613c0339ecc9103eb61baaa112acf5e9e71adb11df226b526c2f0b1dcd1fac91ed9d02b83b53df0f19db234b1ebcedfbc907261127e1cd2848b5f88817790a SHA512 d7eaa436a7c7354e46edb0d7f75f512831ef90b21a4be1f279f56a18022825203b20767d3e069de93ceb794b482272731b321e69ce6084ebe92a256f210d0ec0
-EBUILD python-cjson-1.2.1.ebuild 437 BLAKE2B 643b2fd8c4bf18589220c849856789db837150d931f64961d0a516acb7f8140dd2a996896bbd035c78f6d8dcfa6a93afc839c384423bf2745b635fbd5256376b SHA512 8f6efbaca67872615f62c12a3e2ba7cdfb7f35d128de1e4a1fd79439424fbbe7155251570c110ac66a0f46c9c97bdd60168020c156419e09504437e487f3e7c5
-MISC metadata.xml 1135 BLAKE2B 081299d8208dca4f01b61f22617c2c6c4e0eaa9fc08b337eb9a76f575199bb78f9d66c7f0e9d5e3e017992a6e74b162df87c93fe80536636da72ff29f4d779e4 SHA512 3375f2d4c74b6e111b9e2b9eb9cd23a6660313e05d82b46c05349c517f78dd2ff0f057aa305601b4e0a22ec7db36754fa23108c4442f883824f67a6b6220aa1c
diff --git a/dev-python/python-cjson/metadata.xml b/dev-python/python-cjson/metadata.xml
deleted file mode 100644
index ff94a57eb230..000000000000
--- a/dev-python/python-cjson/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		This module implements a very fast JSON encoder/decoder for Python.
-
-		JSON stands for JavaScript Object Notation and is a text based
-		lightweight data exchange format which is easy for humans to
-		read/write and for machines to parse/generate. JSON is completely
-		language independent and has multiple implementations in most of
-		the programming languages, making it ideal for data exchange and
-		storage.
-
-		The module is written in C and it is up to 250 times faster when
-		compared to the other python JSON implementations which are written
-		directly in python. This speed gain varies with the complexity of
-		the data and the operation and is the the range of 10-200 times for
-		encoding operations and in the range of 100-250 times for decoding
-		operations.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">python-cjson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-cjson/python-cjson-1.1.0.ebuild b/dev-python/python-cjson/python-cjson-1.1.0.ebuild
deleted file mode 100644
index f284f1fb32b1..000000000000
--- a/dev-python/python-cjson/python-cjson-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast JSON encoder/decoder for Python"
-HOMEPAGE="http://ag-projects.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-eventlib/Manifest b/dev-python/python-eventlib/Manifest
deleted file mode 100644
index 9a6ac61322c7..000000000000
--- a/dev-python/python-eventlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-eventlib-0.2.1-libressl.patch 532 BLAKE2B 5319b61c9b8edde6840714c62563c5101e21830808d762655fe39b770aadb86bb74f9c1f978719e0639eb0dc84575d205c3b08ddc851b9a38df5306770bc091f SHA512 5bb06ad2028653b0b9991c30b61c26b8b6ec83411c794cdc8a6bd43c1cba06475e306352b0684d8ea61550b21181e79d1a0274ab2fa490d7f044ed323443cdbf
-DIST python-eventlib-0.2.1.tar.gz 189314 BLAKE2B 81cb958813c28f2617e02cc5f6e5c60aadf4fea219bf8fd408b9aa8e346769f5ad8906271c0cd0053ac98e27129328aaa41382b87863c9d1887a5169f0524b92 SHA512 f1ca3c6eb54677068ec209386f09c695c141b08e148475ee3cc69e667dd96af3637a66660e9105a195620f3bde10d4b18087612c501764d52413982c2721e1a6
-EBUILD python-eventlib-0.2.1.ebuild 539 BLAKE2B 96f039435ab58c9e168dc8e146fef9390e588aed4ac922fef9c67cd92410fcfff44fc32e7a50b82676f164bc0554ee1cd9cc91b56fe13f0fbde59c3ecb6a9185 SHA512 b7bdc82948a3b592b9555f9a63872747bf9fa166ba35da9d0656dbab8a4f3f1ea4bfdd8ca12bc8779aaf11becdb4946a38b885e15d6a6a1b083be0a7be1200b5
-MISC metadata.xml 565 BLAKE2B 624054486dcb48b0b42372b0874e5163361c274589276e4c5f932559a2c47d2c412cdc3aeba0081361fce18101f903bf330116888472013e45069a9f930e768e SHA512 9f75a7858c5b3fb18a2961a78d756afc71b69f2b0d9f1c4e13a0a1cc3b0dcbe70645eba631c1a1b57a0ce8b3f419432f00c5fe2f1052c4be6ddabe9d51ed945f
diff --git a/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch b/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
deleted file mode 100644
index faa410352627..000000000000
--- a/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Sep  8 01:22:40 UTC 2015
-Subject: fix compatibility with libressl
-
---- a/eventlib/green/socket.py
-+++ b/eventlib/green/socket.py
-@@ -89,7 +89,6 @@
- else:
-     # some constants the SSL module exports but not in __all__
-     from eventlib.green.ssl import (RAND_add,
--                                    RAND_egd,
-                                     RAND_status,
-                                     SSL_ERROR_ZERO_RETURN,
-                                     SSL_ERROR_WANT_READ,
diff --git a/dev-python/python-eventlib/metadata.xml b/dev-python/python-eventlib/metadata.xml
deleted file mode 100644
index ee0b870b3c50..000000000000
--- a/dev-python/python-eventlib/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Eventlib is a networking library written in Python. It achieves
-		high scalability by using non-blocking io while at the same time
-		retaining high programmer usability by using coroutines to make
-		the non-blocking io operations appear blocking at the source code
-		level.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild b/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
deleted file mode 100644
index 4e72a81a629a..000000000000
--- a/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_REQ_USE="ssl"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Coroutine-based networking library"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
diff --git a/dev-python/python-gnutls/Manifest b/dev-python/python-gnutls/Manifest
deleted file mode 100644
index ece77cda368a..000000000000
--- a/dev-python/python-gnutls/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-gnutls-3.1.1.tar.gz 40593 BLAKE2B 719fd47133e7eb04d682e9757cb810086a79db7cab10fb5bbe206a9b6af1cccd1a94756c7c162ac09e0cf8a487bccd13923c38fa8b89398090d5bd21bc0116e2 SHA512 471127d548cc4f44fb7b2da4d6db23cff66378b45eefde2ea4950ee08d849b1a5aed86245cd2a8a5f46fd53c652d433d23b658184a00e8e5514da3f518a080ab
-EBUILD python-gnutls-3.1.1.ebuild 425 BLAKE2B 9abe380965f8032195e24bf89fa9c166b277db18f58a9926c71f7d86d48d8474e52416edc3fecd9127355107d8f306a2441a51c6c7224ea112d83489c63209d7 SHA512 1de48e66fd71b80eadee204031aadb58985b421ed45d8403226b2a35d37255959ff706f2155da4a114b3aec9c0521dba1ebe7cd0af51cd7bba7b2eef60362d12
-MISC metadata.xml 1360 BLAKE2B ed44151f636c3beedf3d33179f4a3955e12e3e243e358ffabe54c40debde0979c305a6eda6299bb84c405a90c383e7c8359c2bfc891cd058311d35e8f63abd52 SHA512 c03d9429276eec061d197f0e2c9c623ad1b83ed3a2d45fc8d655faa64326f753f4a6c4fd783feb988e508272071bbb6780b617f122813a1a9b824339dfeeea47
diff --git a/dev-python/python-gnutls/metadata.xml b/dev-python/python-gnutls/metadata.xml
deleted file mode 100644
index 586a4a287087..000000000000
--- a/dev-python/python-gnutls/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		This package provides a high level object oriented wrapper around
-		libgnutls, as well as low level bindings to the GNUTLS types and
-		functions via ctypes. The high level wrapper hides the details of
-		accessing the GNUTLS library via ctypes behind a set of classes that
-		encapsulate GNUTLS sessions, certificates and credentials and expose
-		them to python applications using a simple API.
-
-		The package also includes a Twisted interface that has seamless
-		intergration with Twisted, providing connectTLS and listenTLS methods
-		on the Twisted reactor once imported (the methods are automatically
-		attached to the reactor by simply importing the GNUTLS Twisted
-		interface module).
-
-		The high level wrapper is written using the GNUTLS library bindings
-		that are made available via ctypes. This makes the wrapper very
-		powerful and flexible as it has direct access to all the GNUTLS
-		internals and is also very easy to extend without any need to write
-		C code or recompile anything.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">python-gnutls</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild b/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild
deleted file mode 100644
index b4c46448fa00..000000000000
--- a/dev-python/python-gnutls/python-gnutls-3.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="High level object oriented wrapper around libgnutls"
-HOMEPAGE="http://ag-projects.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-libs/gnutls"
diff --git a/dev-python/python-msrplib/Manifest b/dev-python/python-msrplib/Manifest
deleted file mode 100644
index 8b6a7415f5dc..000000000000
--- a/dev-python/python-msrplib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-msrplib-0.18.0.tar.gz 30234 BLAKE2B da90d00291ab68ae5e4e89f275367741d8dac21e2cb35b6b9722430147b5ada1802c943b5e224f36d565faab216c649cc6e155fc1aaf23ab2f63d3c6e39bf2a7 SHA512 ed260b0183aff543e115951f464d0e3934862439a7c049c3d19304c543805ee364129d2a99c0d132561c8ae0af9fc19cde460723f2754e973bf68a602a18db99
-EBUILD python-msrplib-0.18.0.ebuild 652 BLAKE2B a0ebf5ac45b0416078de98f7adff7c7bb2a977b9e24544785f94175a3cc7c413079b3d7cc56b7bc43173ef8b2ed3f29e37e323c92dcded7f5e7e7941a758df8c SHA512 c0792e7f617fd118d44b6bef4434d65988b28e51bb406b6bfa480ba699483121266e461e234a641f60f574b8f3d9cf6f3cca2874ae0982fd35191ef7280d6080
-MISC metadata.xml 1408 BLAKE2B 54f95b890ad88c030d28c59494c9f330aa29fb114aaea3a1c474a4c5e06e2937acb50d9b31cf08f970fc91c57e18e11e9788bdf48d4aa14991ab1ec3e17cfe58 SHA512 09c18e4112893d9598b9d56ba1f2fdfad5dfc78e5a97da0b65f3c00b2cc0ad673f68e94e50dda12c8be506e455f47ec5fd8bb00411ab205221241c6cf4b26f8c
diff --git a/dev-python/python-msrplib/metadata.xml b/dev-python/python-msrplib/metadata.xml
deleted file mode 100644
index d854883a141e..000000000000
--- a/dev-python/python-msrplib/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Message Session Relay Protocol (MSRP) is a protocol for transmitting a
-		series of related instant messages in the context of a session. Message
-		sessions are treated like any other media stream when set up via a
-		rendezvous or session creation protocol such as the Session Initiation
-		Protocol (SIP).
-
-		A series of related instant messages between two or more parties can be
-		viewed as part of a "message session", that is, a conversational exchange
-		of messages with a definite beginning and end. This is in contrast to
-		individual messages each sent independently. Messaging schemes that track
-		only individual messages can be described as "page-mode" messaging,
-		whereas messaging that is part of a "session" with a definite start and
-		end is called "session-mode" messaging.
-
-		Page-mode messaging is enabled in SIP via the SIP MESSAGE method, as
-		defined in RFC 3428. Session-mode messaging has a number of benefits
-		over page-mode messaging, however, such as explicit rendezvous, tighter
-		integration with other media-types, direct client-to-client operation,
-		and brokered privacy and security.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild b/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
deleted file mode 100644
index cc0e91b26aed..000000000000
--- a/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for MSRP protocol and its relay extension"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/MSRP/python-msrplib-${PV}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/python-application[${PYTHON_USEDEP}]
-	dev-python/python-eventlib[${PYTHON_USEDEP}]
-	dev-python/python-gnutls[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-names[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-xcaplib/Manifest b/dev-python/python-xcaplib/Manifest
deleted file mode 100644
index af140b2eeb87..000000000000
--- a/dev-python/python-xcaplib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-xcaplib-1.1.0.tar.gz 22892 BLAKE2B 61600032e906996da96cd5c4b2c24b11988c0482242d9b20d5c000a63bee704968bd1ec3f61955b9246581df04fdfa6dec8fc34ebef8c573c5fc5e82b74a43a3 SHA512 140a12e39decdd15c06816cf5969baaf82437f010592ee2f4b7309db585aaa6611ab3af50e399bb18d216ae1586b5ebf18490d74c385a99d6673171bcf437395
-EBUILD python-xcaplib-1.1.0.ebuild 550 BLAKE2B 820b113dcf92957a22d483ea2564d1e0d3e71b2b69f107d4fb949163b88344dad7fa9dbc605d61e846d29ec80b8c071da571b06288290ccbf335f22569967178 SHA512 146b060138860ed504179f1d96c808a54c1cfb2e5d8b27f83df683353b50e200892f73471bc6bddbfc9bd4d8161ca0bd281c428cb96fb126fee3516defa87055
-MISC metadata.xml 898 BLAKE2B 79eee5dee0299412f44302465f01dd6cd9e6d539eeda1c90fc3a650227419249bd9a13149679124b3383d932aa6c90f6fb5fbcf79a13cab38bc9e90c9898f28c SHA512 6da7eaed0415c31d9ca6591e62a0308ef8f8e7f5849131ee7c4ad26a04f7f8f751784d71e880db304928597be1f0e1352c0e328d3464c147cfe37f1550a3cedf
diff --git a/dev-python/python-xcaplib/metadata.xml b/dev-python/python-xcaplib/metadata.xml
deleted file mode 100644
index e28a9e7635cb..000000000000
--- a/dev-python/python-xcaplib/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		XCAP protocol, defined in RFC 4825, allows a client to read, write,
-		and modify application configuration data stored in XML format on a
-		server. XCAP maps XML document sub-trees and element attributes to
-		HTTP URIs, so that these components can be directly accessed by HTTP.
-		An XCAP server used by XCAP clients to store data like presence
-		policy in combination with a SIP Presence server that supports
-		PUBLISH/SUBSCRIBE/NOTIFY SIP methods can provide a complete SIP
-		SIMPLE solution.
-
-		The XCAP client example script provided by this package can be used to
-		manage documents on an XCAP server.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild b/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
deleted file mode 100644
index 4283bacd35f0..000000000000
--- a/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_REQ_USE="ssl,xml"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for managing XML documents on XCAP server"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/XCAP/python-xcaplib-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-application[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 8c166d18f4b5..26b355d61350 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,5 +1,5 @@
 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 489 BLAKE2B 7f2fa950a0fc8471997fb644227ddb0101b18ceeda6147898d46ec7e2b324fcf3aa24c6230379b0fda4075676225e2c2d1489b1b655ceed177a5609f2cc4e3b0 SHA512 fd0d0cf362ea74d1171f75c8a1757376ffde2b8df451837f9d48e5248cdd623cdfdbb0123850df48de815a87b7667fedc1def337a13b8dfb0eee8c1b591456d1
+EBUILD python3-lxc-3.0.2.ebuild 488 BLAKE2B 32061ea7684e12b8f3c518be7cd11201b5d442b37b7f49c434da305806244e4db4387bc9fb3aec8c703185d899f60d0d948925b0978fa489f260140ea2770171 SHA512 9d8677de52eba2bb367d244c6fe1b1c9795b9c6575bd32179488ba639d4dfaf99e98e29d45d61c27d93713f66c293b5be1c5cb43e1bc3bc35635af8de1dc526b
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
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 c3e8de0285e4..c8a10b5bd63f 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -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/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
index f3612a749876..a43c298f1351 100644
--- a/dev-python/pythonz-bd/Manifest
+++ b/dev-python/pythonz-bd/Manifest
@@ -1,3 +1,3 @@
 DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
-EBUILD pythonz-bd-1.11.4.ebuild 658 BLAKE2B 7771a5fd556898b9a353a8ded3dcdcd89bd4ce3db3255d3e4faf659731e407defca710bb5fc80ccb1b115f256ffa80fcab840cb7c0ab111982ae6be407d9b20c SHA512 53a26b10ed155a2c22d6915cdf35b9de6c16874e359fe52c5482d4dca2e7ff301d290214b06eaac8c05a35612c8c2ddfbf3fdc11285872cd9c457a9b853ea713
+EBUILD pythonz-bd-1.11.4.ebuild 657 BLAKE2B 57eaf2b402bcee0870d983ab9a692cb1a46bea4c6d814c8ed8e084d03f85c1d361b7744fe0b9c665fe27170dda8572e3d66205e8d783961b79141eb770bb1407 SHA512 975df343df25b2752d8bb126b0f8e926a3fb0d8875b4bb123cfa692725449f6bae34032df16362822debc6f3d8fdacef500179d82c3dd2200c17a68d0d1129de
 MISC metadata.xml 439 BLAKE2B e9935c2cf2df4194b736a7d1a8ebaf53780289ccc7ebe2d02c0128e0b298c78f920602f25cddf052af016dba1c9218acd98576fe87874c2fc73241ed5f3c036f SHA512 e3d98902122dd0d5f99e139d58ed62f1291a606eb399c0531936d69e72b855a51bc1475998b7910b5773621ff7fd366253ed7e911ffa40ad61fc18c945f006d9
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index 8927d11a1015..10f54bba9960 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pywebdav/Manifest b/dev-python/pywebdav/Manifest
deleted file mode 100644
index 40e07a8adf0c..000000000000
--- a/dev-python/pywebdav/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyWebDAV-0.9.8.tar.gz 52605 BLAKE2B dcc52fa44f0a826247ec967f17eb4b6792960a6849c91f506a449a4a8531a8cff42aad3483d80d99bd5750049b1cf59c0554636e19dae2a480257d7e644bf4a9 SHA512 a920e63f1241e41acd7cf02f342fc81e321c50866b103690eee3352de3b0d51c0c9473079bb639d65402719158c6c8113b2c1b7e0bfdc0b863ceb290bcde0145
-EBUILD pywebdav-0.9.8-r1.ebuild 629 BLAKE2B 79e7f5e12b80d24e25e31706265fea4b705dba2e35231ecab54b8a2cef604cfc3a5864814d783caaa806d690df990f9ba70621660e8b837b76e23d8b327cd8d0 SHA512 89b8b2fd1af124e79be3478e54940e0bad47ebce36c66fb3f5c0877e18a79aebb8ef9b04efe77f85faee560a82f8687285fb20c9ba7a69c7b2f839b9707cca50
-MISC metadata.xml 548 BLAKE2B aff3d08253047bd7364658b7b6abc14e18cbd2c5ce588759401cc384b24065a46d6667f668ee361817834395cfa3284155f0cd684f4703c677995765e74d535f SHA512 572eea872363c2c2a66073208030f1178d75d15d7fc24b947a34c5253059e44acf7a9b0697c6bda24887d2933c7bd7b7fa870bebbdf34a8bfa2bc1191eb60941
diff --git a/dev-python/pywebdav/metadata.xml b/dev-python/pywebdav/metadata.xml
deleted file mode 100644
index e1e4449e832f..000000000000
--- a/dev-python/pywebdav/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">A WebDAV server implementation in python. It's aim is to provide a
-		simple interface to webdav services to any application which needs it.
-		It can be run as a daemon on *nix systems</longdescription>
-	<upstream>
-		<remote-id type="google-code">pywebdav</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
deleted file mode 100644
index ac2511bd0e0a..000000000000
--- a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_P=${P/pywebdav/PyWebDAV}
-
-DESCRIPTION="WebDAV server written in Python"
-HOMEPAGE="https://pypi.org/project/PyWebDAV/"
-SRC_URI="https://pywebdav.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc doc/{ARCHITECTURE,Changes,TODO,interface_class,walker}
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 4ccb1261e569..1df8c478372b 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,5 @@
 DIST QtAwesome-0.4.4.tar.gz 159621 BLAKE2B 468f927b537eeada0926fc989498e6b1e2a5fc05a67f9f2286063c1feb0479798e95f07a05d8afaf51b07fb25b9717116cf4819b7830c0daa6e5807afdd6e756 SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c
+DIST QtAwesome-0.5.2.tar.gz 610721 BLAKE2B 791e7fb6570c53f4c86cf51e1774218d09d7767e02fc70449fe61544a1dd71ae0acc6c95dcb5688d4137a220a15ea348cdd08163367d600944af0022c17ad46c SHA512 23b1fab5cbc36e2d99edd63a1f0b150b1ae3638297a3145028edbdd57de75a7d68328e70ecd7709f0f0faa75001b791505f031cff939660b0bd5737feeb8d669
 EBUILD qtawesome-0.4.4.ebuild 602 BLAKE2B 67e5875f0e65f3ca38858a3c986cbc330e0cfa0071b02e87c1e4fc6e966c9679c740a9f599f0532f305bccda8e79f1cb3579f56a212e673a47c132895b58079f SHA512 2bd3c2f8954f726539218d964f28cc8155b0efc59cef9c8fa9e2a8df2768e129f28e18c0dc9b0164dafaa974b86a54b3c2e4471900cefae86fba45d5750e371c
+EBUILD qtawesome-0.5.2.ebuild 606 BLAKE2B 7a59e03f7b2a70607d924a3e6a677f5c10431302fce0911ee733029539426bfb9550650f815798f088868ae80da9be907953db14fa5d3d6226db1fe2bd6281a4 SHA512 a89fe1999c53face2e86e4ff513da6173637bda18de33ce1aa31637c275894136e6727520cb5105ef9ff59e7cde953d57a4f25cc0e2638087ff588a4301a2650
 MISC metadata.xml 659 BLAKE2B 7b2b8a66c287c10e194f54a52cf3fbf0ee9b23a3bf8d04b036a368e08b5c5962acd9240cbf50146e34636589d3fdc50a4f0a36cca71ad78863aae622665fc99a SHA512 0e0b4b1ba22fde6a3f2bb78a57575ace1d8761cb3cbe352e5c2de606be7eddb1864f526b51766de3f5194b5eaf7152f1cf7020b1ebc8b785fb76f76ef71c9718
diff --git a/dev-python/qtawesome/qtawesome-0.5.2.ebuild b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
new file mode 100644
index 000000000000..1e2cc4cff8aa
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+inherit eutils distutils-r1
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-fonts/fontawesome"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index a9601c7659d7..3e70340f7bb2 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -3,5 +3,5 @@ DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B
 DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
 EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B 555de72463a0749dc830a6726750f8697e9e8bbb87adca2cb9c6877964107ede4628fc0fc04943cb47326a49f6c94c680bfc5be7b5863125d959cd85a37d9537 SHA512 65c1bcd475acae52ed68c897c5c6ef0daf9c054591c4e48ed5377474673e8ff3b7ec64354899f495ca2e1532e2007efb571f88e246208f1b30b583cbe329d20d
 EBUILD recommonmark-0.5.0_pre20180907.ebuild 989 BLAKE2B 3984d521869c36ffd02144177c6fc4f2763bbe37731ab38e3c02cbd938d5e29d5febf8b9379f96736cbc72c4f40c5cd07d9e079c5c734818d21be9ee2aada269 SHA512 eb0092326e1c3f7759703b65147d683dcf09b1526701d8a677c4c8744d4f1804cf36fa58b569fb4e54561c0a060323cdb363db6f09a0b2327686ed90f9e6deb6
-EBUILD recommonmark-0.5.0_pre20181012.ebuild 944 BLAKE2B 7d20ca39725ad1e412aa874718563badb49ca754abc17704f5713052c2924d24db7efb404a11d0a66904ac2e1b3ce3aa554fd602066f92326f470d2317b7a763 SHA512 4c3c465ec052b4606509c6a218550dda0a4ad6b43ad30847dc8e4ce7be3df47819c368ba9cde0d8b8af9ecdc504e89813807bfedb54d749c4d90265a6edeb14d
+EBUILD recommonmark-0.5.0_pre20181012.ebuild 951 BLAKE2B 234dfa4fb06101d36d9789c760cba88112df7f98fc549a29ca6176a3ca09f993e7c47e975b420211f7785e90a1157709603bfb31220ec3f8dfb12ca34086921b SHA512 60e20db8891932f7db14f9eadfa52c61768c91563fac3f4ee5a97e163e37e123febd7e0018be2498d9c047d101b03d5ff7b201c9b8eee7489a7ad4d104b0ad93
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
index 19d3ec52b16a..b371916faf99 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/resumable-urlretrieve/Manifest b/dev-python/resumable-urlretrieve/Manifest
index 68fb98575034..7db79b9f6dfb 100644
--- a/dev-python/resumable-urlretrieve/Manifest
+++ b/dev-python/resumable-urlretrieve/Manifest
@@ -1,3 +1,3 @@
 DIST resumable-urlretrieve-0.1.5.tar.gz 320035 BLAKE2B 1cffa81020c120b289145d52a7d3dfae1d4868545242cae583350c9d9e3acc7f923af7e1d8b9349a781b2d2eba4f28a8d27220bdc1cc64ab07d079039be9ba87 SHA512 d9af75ac3301aefa0773731539075ff3ecd0614ba48ac7de4a84817b676dfcdcc68e67cf02329d4adc62629b173cd2b8efc525c0f48fa686b267a75c29143aec
-EBUILD resumable-urlretrieve-0.1.5.ebuild 569 BLAKE2B 4a9e6eafb388dd4c428a6cbdc1f15843e4de51f175f264386457c0edfc178505f86419093ea3a68ae4f4d23cc596eff2faa5a353f03c43e7174f45235e245aba SHA512 cf7e191d4367f00d62234149aa591abfff247cbdb16a6c823bbfef252b5fcfa94220a01dac181a1ee38415cc3680339bd4f557377ff6ad824d55c4308535f11e
+EBUILD resumable-urlretrieve-0.1.5.ebuild 568 BLAKE2B b0d00ef1c7f530ac5693c40bec5d49c341c32eaca4bf970a529e597305826e667b949c523ff13f3ca5aabb4f36b393b25de5d75a24b4a5fac76d67e7da1625be SHA512 76fe7d0c992535b5e2c6e61f7307547fb68a1d67906ab8aea2ce764c04d64405b6aea9cee1c1b141571c4f4eb0c90d3c69abcf5a5d07be62312bf06d6b6da1c4
 MISC metadata.xml 464 BLAKE2B 84bc493686b2688bdbdd4591acac96f0ea9b0f16d8e91fa7d6ec7ea225cb537842626106f598c44030f085d7a1502ce290289b7f7eaf5964f079be390fcaf311 SHA512 e8af70f36f05efac61eb6c378f93e5cd05fe7a80abd8f09c0f05ba4cbbfb0f9bb59859b96eed3b6137cde85c83d16c180681dfd4f079042b4e92dc6d426e60bf
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
index 617f40f04bba..e215050553fe 100644
--- a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
+++ b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 89f78d06a120..4f0635feb9ee 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,5 @@
-DIST rpyc-3.3.0.tar.gz 53541 BLAKE2B e519128eee9792f1f66000c0e9be611f29cca30583195879dbe09329eba7ee8255e302cb036f452948505e8c5457397723fd0c2569470b1ec60684f35abe9041 SHA512 c586ab79d2ab3a8e14128c7ac5ae49a3311de0723453f801edb805819b06037ae015825fda32ac7620d99fdeceacbcbc5d1b4fadc3c7b2ac778e883ba9406793
 DIST rpyc-3.4.4.tar.gz 56199 BLAKE2B f56ef53a55d25335708c6750282c8e3d94492405f80e5cc03bcde879f8afbae70ec02cabe6d92bb62413dc92025ef42945e62802c7adb083b880fad31ebeff0d SHA512 0a176b05df28d92e67cb45372b46260611c1bc89f997c5a6760a760dff8792d5bb93505fdeccbd25c5ae7b04cf7aeeb7fd8964d4f124b00e50fbd3d55d7ba7b1
-EBUILD rpyc-3.3.0.ebuild 491 BLAKE2B cd0980e07ad8ee215c56f2e4cba827b01a205908a9fee6de79355344c24d41ebbc39ad3ead0aabaea77fc6b793ac90a72ef9860871025972fb4a602ec4e70fdd SHA512 b58a3d0fd090d7aadc9fb76a49470eb9a3d54cefc16e65605a801428daf94b3aafc04fca38c8d4b48d92efd742d2fced7f794f97737bd8ccccbd8fd6d8b39a35
+DIST rpyc-4.0.2.tar.gz 53877 BLAKE2B 91b2b8da44df91258f1355886019fe70fd2029141c025c3e71d1d2996ac9eaaec2ee4344149192a02ef8835adcf6f3cfad5cdc33f102577ec4ff8e955f0a0d19 SHA512 91fd1e5a65bdb5a5d8c424bc0c8cb0688ae76ae644278855cd7c22f9af47d7a6da3a80f7383643c2161521633425b6a2486960aefbe2e02864f93d53568bca2d
 EBUILD rpyc-3.4.4.ebuild 489 BLAKE2B 5ad117b282f2b13d5aa2447c23d48c6b3a4fd809ba4cea8deae07a30a1ede14395c23d6ec808d97e3e2a32f0f4fd9ba4d81feffaef52ea5d9ba190920531471b SHA512 2290da246dceab34d7f63b46133606694b86feb1cb82a25b0557aa8a92b3fbf709e9e836d40518786df03687d2d472483c0df907202d12aee628e57170a79b35
+EBUILD rpyc-4.0.2.ebuild 513 BLAKE2B 230ba8cf6ad822322ee0ce441370e334fdeb8c70dbdad97d362bc16d804024ead5520f5078a3498dc23eb4bf4a73d70bd28491dd498c9e2c2b08f2b7c51f2967 SHA512 2defc2ad2d8dfedefff287fcaddc09b6525967ad5236fc381c9c0b88a908adcfa3d93312f2c7351dc0ad9c0beae7d0ad5c36408e555218fe78f6f61b9ac52568
 MISC metadata.xml 518 BLAKE2B 023033edd4ab41716a110c97b8b21d60ee9635a3b411401c3e436b69ae0fc1241a2dd5c34dfe98b3a7e32b8351534011f533bb15443205c5ac0740d2ef89d44a SHA512 4ae598f55ddf591e0d75a9cfba54948b3ff78825377c8085ca22ad56184f18c44ef94947dbe53d207996f7bcb708454f417a74a72bbdfe22d76410acdad2f584
diff --git a/dev-python/rpyc/rpyc-3.3.0.ebuild b/dev-python/rpyc/rpyc-4.0.2.ebuild
index a58b1f735b5f..f3e1ff38ded2 100644
--- a/dev-python/rpyc/rpyc-3.3.0.ebuild
+++ b/dev-python/rpyc/rpyc-4.0.2.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND="dev-python/plumbum"
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 47763aba399a..1948e5149a10 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,6 +1,7 @@
+AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
 DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e6f299ec3660b322afcbd0036860a658e641479f0214b67b6e96d1b652d2b2fd888bc84473e8827f907bdcc5c6477 SHA512 83b85dadb696df9dfcd28719ccadba8aa0e8f36b0fe4ce4f61dfe00460617bae74307cbe6ba924a8de86fe527e18a34d66acb72f7a3d9001e670d76dfc8b60a2
 DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
-EBUILD s3transfer-0.1.13-r1.ebuild 903 BLAKE2B 2687e079bb189a518bd3ebd662581f5fc32d67986679b9dbd3990dc3cab20163fef5d1f5f236737e387a206026ff7a321fba21ae0a0aa29686acf89f4ab2f3cb SHA512 490b79f855f600e598f4968e703ffd98f318bb7fa8e614e42affc2a7017db5754e40364a308f689b60959c513c3926fca924b9845db02c3f79d3eb945951fc61
+EBUILD s3transfer-0.1.13-r1.ebuild 959 BLAKE2B 64555af65d463e3ecb67859a7358d2ae34d95ade9fc8d1bbd7a1be505dfd561a070d5dc8986a0be43804b0c1561b55045979865fc1d50246c37e6efa3574188d SHA512 58a82be1c848a0daa383a37c2e0a826d387c2b10209e6903cc8c178ed130f686bcb4c5da24065d2ced8470c28f93e7a8c63af6899b9563765d4d2ccc95269deb
 EBUILD s3transfer-0.1.13.ebuild 893 BLAKE2B d6fd015623b4463fb75ef84d7ee476d4efdadb85cae04bce9aba3343c4649d6b94dec8c9098b6e50743c8461b673e93f945d3a28c36f115ea0196433a1de46b6 SHA512 a22263f3eb37dc8d067585c48202bf36335b4cd0f42d288e1c456a22c5f51846813f38fc8944ba3679eab784acc30d880b2e678ea50f1da30a2552f07af2dbaa
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch b/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
new file mode 100644
index 000000000000..14445f338bf5
--- /dev/null
+++ b/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
@@ -0,0 +1,22 @@
+From 67d2548f9e531650ee90e9518cf6559aabe98afd Mon Sep 17 00:00:00 2001
+From: Jordan Guymon <jogu.sd@gmail.com>
+Date: Fri, 31 Aug 2018 10:22:25 -0700
+Subject: [PATCH] Add whence to mock readable seek to fix functional test
+
+---
+ tests/functional/test_manager.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/functional/test_manager.py b/tests/functional/test_manager.py
+index 9d5702d..ec4175a 100644
+--- a/tests/functional/test_manager.py
++++ b/tests/functional/test_manager.py
+@@ -40,7 +40,7 @@ def signal_transferring(self):
+     def signal_not_transferring(self):
+         self.signal_not_transferring_call_count += 1
+ 
+-    def seek(self, where):
++    def seek(self, where, whence=0):
+         pass
+ 
+     def tell(self):
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
index 37879fd4d19a..11c8e4c80eea 100644
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
@@ -30,6 +30,7 @@ DEPEND="
 "
 RDEPEND="${CDEPEND}"
 
+PATCHES=( "${FILESDIR}/s3transfer-0.1.13-tests.patch" )
 python_test() {
 	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/shortuuid/Manifest b/dev-python/shortuuid/Manifest
deleted file mode 100644
index 44c3f5911710..000000000000
--- a/dev-python/shortuuid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST shortuuid-0.4.3.tar.gz 6096 BLAKE2B f658bed1ba10b6a18508834e27c4a9a6a9d080c7a6c2a75413bb2b22a71b339ef66b73b8f99436c609b00ecdc1d38b691e2eba32b5c34ea83d4c8191275aa0f4 SHA512 409bcaaff421a392640e39a7d25d4eaa320826971dca9d13270b61f21c78f65c617c302b3f7db5d0a3400c8ed4380a3a8eda90d1e9ad13d0a3a7eca53440ea7e
-EBUILD shortuuid-0.4.3.ebuild 596 BLAKE2B 8b522a46181c926a05a22df666e41bf7fbb1561833b27c43e601ac17f3aaf9057c87350004e3ccd589b09c2a60051871a4f5c51206612c6338605ad198b193b9 SHA512 95d801871dc1ab4594c342472ba54287dc73658b9cbb318b3e7e2088997a2c492a1791e8b6c5f1dfe5298e2cbaf592655751d19042c3492a2dffb3beae97320d
-MISC metadata.xml 599 BLAKE2B a3cd639ce610b8469b6e56cefc9a6bcd0d0a5c86e8c447e97bdb38a24e55bbd2eaada7b7b6c6671c4ceba3f46b1eb636b43ed2517f0f18c1e832e21add40c5e8 SHA512 5698091a4834b25b32040d0cbe4a2eb6b6341312866eec765239abaa3a242104a8ceec0e20b780ad47d3acd04573699d9955c61b01fc6e5b54d9a7d3162a663e
diff --git a/dev-python/shortuuid/metadata.xml b/dev-python/shortuuid/metadata.xml
deleted file mode 100644
index 3c92e94f4a85..000000000000
--- a/dev-python/shortuuid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>A library that generates short, pretty, unambiguous unique IDs by using an extensive, case-sensitive alphabet and omitting similar-looking letters and numbers.</longdescription>
-  <upstream>
-    <remote-id type="pypi">shortuuid</remote-id>
-    <remote-id type="github">stochastic-technologies/shortuuid</remote-id>
-    <bugs-to>https://github.com/stochastic-technologies/shortuuid/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/shortuuid/shortuuid-0.4.3.ebuild b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
deleted file mode 100644
index 96c28acd7b8b..000000000000
--- a/dev-python/shortuuid/shortuuid-0.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
-HOMEPAGE="https://pypi.org/project/shortuuid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pep8[${PYTHON_USEDEP}] )"
-
-python_test() {
-	${EPYTHON} ${PN}/tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 89ecb82146c1..e30a08a3f2b7 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 513 BLAKE2B 5ea31ce42b36524c1983aee886d6e8cb025e26c033d329cae78ad6ca29ecf910f08b696c5551bdb56ab1c30a7bef3634deabb03b3054166da1415bbd1ccaa830 SHA512 05385fd317ed8d7990e903e1a2acef3d5ed99b26ee8f4e1d6561e704e6ae1001735129491db186635e48e2246fa32c7b0e9c33a1b3443876161311bcb774c77f
+EBUILD shutilwhich-1.1.0.ebuild 512 BLAKE2B 613277109fec89c83b8dd2fd2071bd715944355aac5a95c63df4bcab07d447108aa17ea5dc018314c6b064e442b171bacf4209fb706f71a2a9c99d6542b99d85 SHA512 177589591dcce9a0be4dbf9137856884442940df887bafb37dfdcbc89aa635437afe7aea6f150cc4fe8b1cd84c112edc1e5eaefba1d4c87e448ad99d45b5c68b
 MISC metadata.xml 711 BLAKE2B cf4caeca6cba1b6211e4910618287135ca84240d348595c91389578a2e2f887c1f88ebabcbf3960d0d6472169cd1b65455d1d8a4b58fcfa530662f75f29ffef4 SHA512 69223961a781434b4877e7648f9f2897c1dcb110a559e64dfcdfb6c26a696f8aeee4be1fa211e07baa01f1c9bf57f3ef44d43502a6635841e14e45ae524169e9
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 96649b834e1f..cfab56be9c81 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index c580b1902770..d63f4aa75f5c 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,4 +1,5 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
+EBUILD socketpool-0.5.3-r1.ebuild 950 BLAKE2B 0aece636ab58ffad1d4a24d3850c0bbd53b5ef23aa94c68421cd547ba8a524d4a2b416cc48eee50c0d69fc53ceb2a8c4ab0c7b5d793a0236e0f5b23b757b8919 SHA512 b497be8c22c5aff675ad25f66f629035fc8e2a2aaf7dee90b3631c1275978f8e6ba8c48168d9f20a7f447c0476855a49d6b8aad0413cf17205fb9c2a2e54c8ad
 EBUILD socketpool-0.5.3.ebuild 943 BLAKE2B 6f7a8bc86c731583aab2170c45989c99400a4a6045457e08b6c613a798780d951a71d051680cdbd7162642b2faafbafac0f2c57a94c009a9afd8080f1907a920 SHA512 da84c454d5ac42ef4174d448b26db22be480a80bcbf6b083c3e70430964da5b55ab51849df5fbb0f7102bdde127fd0757e302f9b7892dd7768ece34497207436
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3-r1.ebuild b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..0f319c590b22
--- /dev/null
+++ b/dev-python/socketpool/socketpool-0.5.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple Python socket pool"
+HOMEPAGE="https://github.com/benoitc/socketpool/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="examples test"
+LICENSE="|| ( MIT public-domain )"
+SLOT="0"
+
+RDEPEND="$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' 'python2*')"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.2-locale.patch )
+
+python_test() {
+	py.test tests || die
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+
+	# package installs unneeded LICENSE files here
+	rm -rf "${ED}"/usr/socketpool || die
+}
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
new file mode 100644
index 000000000000..ef07414e5611
--- /dev/null
+++ b/dev-python/speg/Manifest
@@ -0,0 +1,3 @@
+DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
+EBUILD speg-0.3.ebuild 458 BLAKE2B 8b14514063bb5f316055222947a3f0231b05c4e83d07034f0792df8909152871e3a1469a396c88e3234196855388d628fb4dc490729a3e840deb496e2c2be7b8 SHA512 dc61070fd7daa5f9cbbae6efe51c9210dec076e1c3572ceb9e3242de2542c69a76e2ff2887b7198c44874413f8972fa66ace8cdb3d706298061cc6c23a83d733
+MISC metadata.xml 376 BLAKE2B 113a90a20506bc63a3ff04dbbadcd4816e77cff90a67af41fffa4607b3d04846e10a32aff17406fa6020b0e7352ab856f04f0633985ca99a93aded3aace8786f SHA512 06f948d869175579e428cdea7b74c1074418fb0eddfa256492ad54d8905add9528100f95b42357271ffea24c4d73545d0d4dcdc66cef8fe656d753f175317a6d
diff --git a/dev-python/speg/metadata.xml b/dev-python/speg/metadata.xml
new file mode 100644
index 000000000000..5cd26e92b982
--- /dev/null
+++ b/dev-python/speg/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">speg</remote-id>
+    <remote-id type="github">avakar/speg</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/speg/speg-0.3.ebuild b/dev-python/speg/speg-0.3.ebuild
new file mode 100644
index 000000000000..365e1144c657
--- /dev/null
+++ b/dev-python/speg/speg-0.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+DESCRIPTION="A PEG-based parser interpreter with memoization"
+HOMEPAGE="https://github.com/avakar/speg/"
+SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 18f028a0b9b6..0c860077af8f 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 587 BLAKE2B 4459efe71b6df9dcfa41f10f57feac991edec9ee2549c4c3fd4bf0627b9fd60f8c9551978f23e46b66b4d66aec78530a6ce873287314ac9344c6c88da307cb4b SHA512 0c396ef40f70fc713ad1aba0bce2a35b1141ec223adb740a475ca98c9732375095cd81f17810ffb22f3e13bbc4fe55796bf1452035431f49cbe0392b3705ee2a
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 573 BLAKE2B e92ee32474ac06a298de0302a3583cadc5d29fe33d0e776d5c7ab1c4c1d1b3895ea65a8ab5b530ccc220b1b0c615efcb369638feb1b96985baf6da2179e0c1c2 SHA512 7c48a41760511214e920735c5699fdf7b49faed4efb94ab45adeee2993998667b802d16580ce17e500c53c569346b282a8e24d2ab4a8ba7ee6700d973ed99f08
 MISC metadata.xml 593 BLAKE2B d8e69d801973c15666c838797ca8b5bd746623b2bb2915db38e4b7461757abd2ad6dfdd95078348775c0494dfd19dc5937337b3cc9966bbce88a3711f014c3e7 SHA512 21771b0ca9695c748fe0fdfddaff603a296c671af1d1e7b097fdab104eaa33ea61bc4ff887f27f94cf0a76ff9a52ddbe7055167b5f651f954e78f318a7f9d9df
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..5061e6d63c28
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 2106b7ff021e..5faa54c41925 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -2,7 +2,7 @@ AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da3
 DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 BLAKE2B 1b13890aa38861cbcb6ff57b1169114183d17931890036fa3aa06a66c9f3e5b5cb5c84d752e6a1dc7058fbb9c6581b33a27f74800ab325801e2c318664cfdeb0 SHA512 5ce76f221cab54ca7436f30a907db4a17e7e338af2cc2d324f06e73bfeda99569584227f925f8a078d01c17761878b865af665a9eb7c1de306cbc0f9b8d7a451
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880bd92ad6f771cf6b08ce4472cd2c0361658f449cfecdac2c8d5b12b1df8a00940dbdf714ee7d82cd9fb7f429187ec899eb19a SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
-EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1457 BLAKE2B 99a4bfe924029484d7b2289a1889afcebba5b7d721b7832cc88781ec5ee47c91a5fd98487694a6fb354286ab3b527c6bf3b9ed0760149346588ea62b7b105e04 SHA512 c83f3ccdfd77879e81dbbfe6fa0d13e0251e2f04e7f146408cfeaee0a02961af2ccb93f396997477b880c46fd3468fa17dee33fd5738b75065bb5279ad16c7ef
+EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1454 BLAKE2B 4ceaf2bb95ead06c0a8b75a81040541eaf66e8a46f3ba51e2b597db77057ef5774627777fbb98d5b1efa2c6d8349b91c62d3edc531f68569f97687f002dca0b2 SHA512 d6a835895eaf28a5615c8309c7712cc73b134ec4beebb3adbbab6e6145a45654479859e84c6f2e158f371c1365ba6117c70623b871235320f1d17bf9f76aa549
 EBUILD sqlalchemy-migrate-0.11.0.ebuild 1644 BLAKE2B 01ba49c80842ca24afb1bb0d72788f0bd6bac0e3dffa6c3b314a2a9e1d70d1e6ec4fdddf3e0f93f10e0ac53a9030a785f947fe2c45abdcf82bb73d22c912aebd SHA512 544ca0e697f2c3c115441be3913ac08c87e123d2a806c8773ec3cda8748230e4fea15e0e4526337195edb9b4c65102537ebaecf115d3217193188e9e99d85d8e
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
 EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
index 0cffbd3cae35..daaf70a34f98 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 576dfc3820e5..30b97aef960f 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -3,8 +3,8 @@ AUX statsmodels-0.6.1-pandas-0.17.0.patch 1043 BLAKE2B 0473214de500e911a36cf3ba6
 DIST statsmodels-0.6.1.tar.gz 6980841 BLAKE2B 5ac16df0fc06d051cc79d037bd3a9b097526498a48cdc0bf750babd5915f27a0dea23d8869a5101c62bb780ec0c54c503a766c7da6db59fb8d10dc65c70268b1 SHA512 9047b8cf4b9d19bd697867cecef1c4608fd86f3d16e67e44d8c152e1e25918f5aff6b4843c58395e71614be401551e3e48d4dcf158480cbdb45d9735b1c5ea77
 DIST statsmodels-0.8.0.tar.gz 9464851 BLAKE2B f4bcf38c0292dcdfef9e3e34519f4dff004795bf76f54773f551c6c767f16f9cee0a2756408cff6f727df8eebc269bccf2c8bd28915a729eb022eba34831628e SHA512 32bb7f36acc16796c445e5f695d958af4525fbbb2d374376fb4a73c972e3796fad05532456cef4aa5ee59d6fce11921174e17bbfc2e05d2488ce1ceac5175239
 DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
-EBUILD statsmodels-0.6.1.ebuild 1790 BLAKE2B fcb7c3ad951c5bad5ea3d5bf6e373db02a75b1a210e751c5a98353818103e616114cd86edc3caa42df81bb72cf3e9bd88ee69421913ef0dafc3f7bf49f7f12af SHA512 0db7b9c98d5d9b2a6436c073bcc2172c5b9938f0f4cd5c7256ebe4e5725dc65b3dac80186397d2516b5a5fd29fc6db93afc0caf031d239010b0ef07685c6224a
-EBUILD statsmodels-0.8.0.ebuild 1954 BLAKE2B 660db988aff6c18c625065226a560f3740780ab20afeba4b4deff8a740a789ace1593e420cda8e7503f69fbc2a8f95a01e539fde60d46c3783e81d12948c10e9 SHA512 48f61224be4b2b960a147cdcef7d28e1f1d4eefce6f7526e16816a350fa75a24854fad5b49715081f749b8812f79aac07ae3ff88a031a02b7943191e4780fdc0
-EBUILD statsmodels-0.9.0.ebuild 3415 BLAKE2B 015330f04ba36101b8165b3e8c04281dd9f5d8f6614740d655053759618c465e9b569c159340bb7831b9754852406662b807e0c7f20bbec7ba792628e9d4a3d4 SHA512 1f37a380a0b9d2a2b7197f588103d9dbe864fde788dced0652a1c88c03c32a2c8f777904fdad965baed28b80b43b8046d9d6045ccbbe4845ca22da3672658d28
-EBUILD statsmodels-9999.ebuild 1964 BLAKE2B 400467949cd23f02a0ae92ed9d7725236046cfbf640758dd0a36402da54d7e1703d7306f033fe3b52bb9818de2983c8c88fe51299b3bfba7d278c8b0e6d98d78 SHA512 2c3f726e88b257952b396185e378a4ba4dfb0f626b39e27acd88aa0d9d8e55d65171960de882bab107642327af84c0a132cc424fc1d598e2be0a78a14b546f64
-MISC metadata.xml 1318 BLAKE2B 5e5ef8e0dae2bed3ba7d999d824c416d82515a26e6f99968e1cec7de5ef159caa3de7da3c5fc47a1e3e0a5251bbc542a10210204fb5045d35d1acc45b5030090 SHA512 8c554b8e55d88a7c5ed0bd29379ea1fe41b64e9d354ba584756f706ce1fc5857068c546138b49fb8af778c5401aae7169bb30413f6f209db9371441cb956ae91
+EBUILD statsmodels-0.6.1.ebuild 1794 BLAKE2B c758f0b2b09ef097e71063d6e6f069fc95cfde76603ec2ef17c8efb5355c6f50e7697dc80f7c0dbe41b2ebf08df08aafda306f26ea18359005af0e46bbb737e5 SHA512 fc11dddccd59e83297ffe2179b794f2bd894ccdc74be1f3be87cc186f5e6b55b841d6baa9fc24870fb023f5853cf78ff81bcd36205bf416cc36b97718e65fb58
+EBUILD statsmodels-0.8.0.ebuild 1958 BLAKE2B af0cdc6f311db1e3e00212303bf0560f6804ab59bf92587cc15d8bb32e74b871f6878d37ecee3063beb3439f78e70e17bda3b22c4f891a063b0c940c7a56703f SHA512 632146b5694310a4fbcbb6faba8f271a9011967fe2f50f36747582f9f62547a7704e76f1eb1b6a6bc6919c447ff7ed08d8598aedb6cc1588eae628184c433ffd
+EBUILD statsmodels-0.9.0.ebuild 3419 BLAKE2B 0e92f27150f8c343d2aee1c5157ba3926e7a3e0d26977b0253d53bd7695a8e6875d6f569f715180851d3142be0d6dd8da981028559f643e63907edf0876d7573 SHA512 0b69f9a3f8109cb79a41b4e40dba52dfc0a1e67d20ad7f039570f22c12cca094cb27a7ca89a4d68ffb07c35d0950c6e978fd010dc3632f4ec8372a6a60cc1881
+EBUILD statsmodels-9999.ebuild 1968 BLAKE2B bf9795ff223e7c16056d9bf5c32f8f31f686edf60067064de8ab2b58f48f6bfb8c31bb963d3e7f46f17b8328f023786d3f1f33e68c3212cf487f92b67dc87e5d SHA512 e529f780a5ecaae0aee3af8a86d0c2fb52ab93e20b13401f97a45ab0bae3809d5778c98a6ee78ef865e0d7d92b9e6a1025e18b126e6dc0f700118843fe3ce076
+MISC metadata.xml 1318 BLAKE2B fda44c0af74692331673e5e440e4180d9610cbf50d96c19da4ff19728bcd31ec6cd30a48fb382da3489904b2f361957af54c7bc6983320b9b6fca04ca561aa52 SHA512 30d166a37e102503c22ca6112f297cb6db6d2f795062657f23d7c98cf1871275c28faea7be4bcc117817aae122eb5bbed1d5da1a327058980a3f87ce083fcb13
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 72014447a73d..0a394bee4cfd 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/statsmodels/statsmodels-0.6.1.ebuild b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
index a7e420010582..e67e1d036250 100644
--- a/dev-python/statsmodels/statsmodels-0.6.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.6.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-0.8.0.ebuild b/dev-python/statsmodels/statsmodels-0.8.0.ebuild
index 3aedbad099a4..c8250754f8ef 100644
--- a/dev-python/statsmodels/statsmodels-0.8.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.8.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
index 95b3326d4d7e..c07a82610217 100644
--- a/dev-python/statsmodels/statsmodels-0.9.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index 51855998071e..888c2bcd17e8 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
-inherit distutils-r1 git-r3 virtualx
+inherit distutils-r1 eutils git-r3 virtualx
 
 DESCRIPTION="Statistical computations and models for use with SciPy"
 HOMEPAGE="https://www.statsmodels.org/stable/index.html"
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
deleted file mode 100644
index 8e339eda3e38..000000000000
--- a/dev-python/stormpath/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stormpath-2.4.5.tar.gz 3821801 BLAKE2B 6ad3433c86046d6ea16b3b714e26d612b418a9b690fed4f5de6bd8563196b98fbac8dadbc1b781183cab03079d9bf227adf35685bae7c3c76162178837bc7cee SHA512 8bf3ad45cabd9c16a615f3303a4253d7f81bfb39a9c1542bc9662be54075f85013624e9ace7ec6ae7a81ef3ebb6864919458bbeca685879a8623ab7fb13cfbb4
-EBUILD stormpath-2.4.5.ebuild 1256 BLAKE2B 4a299be8affbf92e633dd8d4f65bb84aaa929e8759f756ab3394c832fc21b255cd2edc1cb388f0d226d0969c45732360398a5783841f5f8df15fd9597824b7b9 SHA512 a39b39acc28b35c9ab133c98a078b029434711d3510f29133e01b04337e9d001a59a13f5675083ddc8408b0b77df47447145b1a419b5810fd7583e3f65b77d2f
-MISC metadata.xml 281 BLAKE2B 303502d835cda76fe3b9ffb59dbe92c3d1ba62ea799b8b870c632be2795fcd3246c0937091ea9cf586cc044c1a35c314812b6cb6ebe2919ac6879088edda6cb4 SHA512 d852e330796b22d173eb005b50d21b9c1e5c017c51a43cad0d4187436f1b365062e9c313480b3211f50395f1fbb2943ac3661f845512d1310eae60d77ba77f79
diff --git a/dev-python/stormpath/metadata.xml b/dev-python/stormpath/metadata.xml
deleted file mode 100644
index c0f81a4cf376..000000000000
--- a/dev-python/stormpath/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="github">stormpath/stormpath-sdk-python</remote-id>
-		<remote-id type="pypi">stormpath</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/stormpath/stormpath-2.4.5.ebuild b/dev-python/stormpath/stormpath-2.4.5.ebuild
deleted file mode 100644
index 55a6f039182f..000000000000
--- a/dev-python/stormpath/stormpath-2.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
-HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
-SRC_URI="https://github.com/stormpath/${PN}-sdk-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	<=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	esetup.py docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 5eec89953364..7db250852700 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-1.84.2.tar.gz 213050 BLAKE2B df6c195a183d15bdeb7ffbfd2f5683b0b667e8a4df7a637d3960369e1b00a90c74bb5d97af64c553e2f250b2bb7bb698d015a65c3da312f74bc7b141c4b63dc5 SHA512 7d3e1a20c30b3c2fa087c9fe86b04462db4b6cd742ea13daae2754ee6b414656847057b30db48634c6d02ef01d8e510359505fab212325a3db36dfaf2d72db38
+DIST stripe-2.10.1.tar.gz 218299 BLAKE2B b1d836ef92dabfd5a5f292ede69264886dadb0b87b72927e444d615e9f0518efff513f34f2aaee778921f7cb68169f7981a5e84993b19221ec394a1d5c07c622 SHA512 877a87e848d425f333ad3e40c172010a3b1882de0894ff8c5c0623f5d09fbd7ab51d9d53ead8773d3680cdab8d07df32f4210abc08c796adf6feeb4014b671f7
 DIST stripe-2.3.0.tar.gz 213813 BLAKE2B b383c724331d5ec21452aee2eee49c789e2503057c4648d9e879fc561b87cc70ba918bb1e620db3bca380150e62d41433f1bfa7f9b6f164731d3d68542d5f056 SHA512 ba88b18b7328d917379d8474373a1f87717d67cf305022b80eb05c74b8055b825cf30cc879c4e99dbe06dc99f03464649e637d83d70c902b84f5873dd0776453
 EBUILD stripe-1.84.2.ebuild 457 BLAKE2B c75936fad3114182081bc7c01c1368e77f85fadc9d8ff52ec491e6a3b241831fe3f2debe1ab66083a4e64937c0038a27bef835653adf51562ee7f2463c0561a5 SHA512 e6e5efc654d511290c041dc3ef8d3e4c09966456fa2f398f23d36aa5ed05a9e30572a88502f67f52ac373c7e9a90cd7c2cf00f9cfa74112d1630ff18f859a310
+EBUILD stripe-2.10.1.ebuild 2069 BLAKE2B 79f0451d217ac0d3116b0cee6ec80b0a5683c32e37756aa176631133cfd1a3ec0f764fdef2fc09519282cf72ce9ba18960f3d186ce576f007cb63a569d358957 SHA512 1fa4ec467c10ea447b41acc47f227627336f37b0b9eef38846aff2ad1ff8644fbcd8c757eaf7dd7fa3c4e9d4a712cde2de2327eb0b9c1c209e02131fe5f170a5
 EBUILD stripe-2.3.0.ebuild 484 BLAKE2B edd8bacf2c513a941a60632ded6876bc11e141fb6ebcabf64c32ac5964c3c53ad26c8ea53c0d064e978d6e5dbce6cddc1b1048698a8016469b441dc35bcad435 SHA512 4ba5b6c40fdb73f708a20c1b7fa843741311ecde00bccd9cd720c06fdfd4bfa5d700ed5b686df37b6b8c558f4c0b066144220529bf2523c709d5bb24b53c1d53
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-2.10.1.ebuild b/dev-python/stripe/stripe-2.10.1.ebuild
new file mode 100644
index 000000000000..ebeb82c56f04
--- /dev/null
+++ b/dev-python/stripe/stripe-2.10.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/requests-2[${PYTHON_USEDEP}]' 'python3*' pypy3)
+	$(python_gen_cond_dep '>=dev-python/requests-2[ssl,${PYTHON_USEDEP}]' 'python2*' pypy)
+"
+# See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
+# for minimum required version of stripe-mock
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-util/stripe-mock-0.33.0
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
+
+python_test() {
+	STRIPE_MOCK_PORT=${stripe_mock_port} pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index ba8147c61862..4b18dcee7ad4 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,7 +1,9 @@
 DIST tempora-1.12.tar.gz 15208 BLAKE2B ced6e5d069780b516ff791ee598683f59d02588d45282f1b6b6c2b8b61d354bc399d10c961b5a112c7ef1185c3661cbe9b1b9c95ab28d42ed2429fa4f504917e SHA512 4acd38fb464e858db371fc4ac6d2082f4f0c676016cdb95d8415895b7d0bdd3c787c2678737e437d1f5861368dd54040ce289407cfeea3ca43b130c56da133b6
 DIST tempora-1.13.tar.gz 15956 BLAKE2B 7b00c4cf04628c1bb6a84b7044a22921f81bd77ff340342d7256acf8bb8b1b427fb15b9c10c28cfa4c99b02e4cee6e2b26ae53be0ed7ef67e3d6f528fb2e9a3d SHA512 98927024f07196a51b8d61017786cfc258db289ab9c98942cca2501074c1675bf1213770ad00db1d38829017bb9928cccde7fb344c170b2f485fc68505737485
+DIST tempora-1.14.tar.gz 16009 BLAKE2B 2f4c90da2aed42c2eaa24e5764c0ec163eeda3f5d7db908f5dfa9057eabaaa67654c100d049a389d43c0f8286c0dea12db3cc3cb9a8eea098925d2d7b011c1c5 SHA512 dea359fcb5eebda2db6b0de2e615ef6681860e9b8ecdb6041316623b9072067f08cd19d72d9a9e1fc792da7c5760f5e2382bedcbe09467109557448bae1fd8cf
 DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
-EBUILD tempora-1.12.ebuild 1333 BLAKE2B 28c364205cc93d289a0ae298a617e553788ad1453635fc53b1ac24dfbc411e3ac9e092b805d407aa14ec22f2153ae549ec25175c41cac01498ec5effa72f7a00 SHA512 737a140abb75ad3918e441c3185044ed08d30fe6526719d41b7bad2b9b4ac91fe3c5f60fd694b6cda57d347990992818dc0b63056eb3d0d5932cf935b0f5f029
-EBUILD tempora-1.13.ebuild 1386 BLAKE2B 11548dc6e346f545f782f95fa00b71ef95e06f4cf07d9a8ffe227bc2ca2e87e92d20a17c97b9bf8f295311c8d876afd8f53bd81e58f61ab8bb62401fca84216f SHA512 0ba324db317db21f1010346f859e0c33105d6a3efb9dbf686be5b5c2a96ef9e54421142ec2b254470d395a4a1247deebcf1ba773ef6114b29ec037a26f2f3f1d
-EBUILD tempora-1.7.ebuild 1239 BLAKE2B 72157f2550ee85e3ddf367c640215a26217f74483f21a0e794d15b51a9c897f7659c49a93025e3583cd69c43f92c0197a9e89b0e06d4dea627cd19316aee5c38 SHA512 65daa135519d978bc25d01ecaf77546ff76c0cf263eb24952775d45c5ab485832e9e935b843976427dfe7963a2940f233be5132099cf870a1907de1d3a8bea9b
+EBUILD tempora-1.12.ebuild 1272 BLAKE2B 7e7295138f1aa00608c16fc4cc900fa5d13b001db915c1c9d0a35580b469ee572cb717851c7330be454d511b2bc868ceb0c8cf32547cadee2e44c79365096b1c SHA512 51fdc74c36818bb833d4c67e591b8c1ea3286f415ea06980607a4ee014e8fab12ca3ba7217e39a81f3222d484b20fc223c890f6ffcbcf5f65d47c290a78a57a2
+EBUILD tempora-1.13.ebuild 1325 BLAKE2B eb107cde8e6afd1924272cb55d5d7ae30a334ecef2e2e33503def30570ce74a09c761cf02fb5304f3cee4789e88cc04b7b59487d1413a022ff022a1fdc10ac79 SHA512 69ef2b4e3fbbb4be6af7aa08b623bf1b10b5e35d378d92ca7c2dc8ef6f2f83e480829ebc3a0f846ee4d32bf304b19528e59c0111296db77d4f3a2548af1dbc33
+EBUILD tempora-1.14.ebuild 1325 BLAKE2B eb107cde8e6afd1924272cb55d5d7ae30a334ecef2e2e33503def30570ce74a09c761cf02fb5304f3cee4789e88cc04b7b59487d1413a022ff022a1fdc10ac79 SHA512 69ef2b4e3fbbb4be6af7aa08b623bf1b10b5e35d378d92ca7c2dc8ef6f2f83e480829ebc3a0f846ee4d32bf304b19528e59c0111296db77d4f3a2548af1dbc33
+EBUILD tempora-1.7.ebuild 1178 BLAKE2B 9b17d445a61479c0daa41896bf1376e4d0d77f211b7e4077cc040ed0072a72099b4dfd5213d6b9c3c904153837877092380143a5dc8ada53ad669145f80d77a7 SHA512 e64e1e1c823ac00beddb0f7be839ff59c43d5d96578e016b0344d80b388e93cc0a2dc4c72ebd515fa123f9d526fb30167399246e8e92dee4a7d9892b640e36e3
 MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
diff --git a/dev-python/tempora/tempora-1.12.ebuild b/dev-python/tempora/tempora-1.12.ebuild
index fac1f1142dae..08220e64091c 100644
--- a/dev-python/tempora/tempora-1.12.ebuild
+++ b/dev-python/tempora/tempora-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,6 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-# The calc-prorate binary used to be part of jaraco.utils
 DEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/tempora/tempora-1.13.ebuild b/dev-python/tempora/tempora-1.13.ebuild
index e882a86c0f4e..0d46a295b0f2 100644
--- a/dev-python/tempora/tempora-1.13.ebuild
+++ b/dev-python/tempora/tempora-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-# The calc-prorate binary used to be part of jaraco.utils
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/tempora/tempora-1.14.ebuild b/dev-python/tempora/tempora-1.14.ebuild
new file mode 100644
index 000000000000..0d46a295b0f2
--- /dev/null
+++ b/dev-python/tempora/tempora-1.14.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/tempora/tempora-1.7.ebuild b/dev-python/tempora/tempora-1.7.ebuild
index 99d577d16754..17583e8875a7 100644
--- a/dev-python/tempora/tempora-1.7.ebuild
+++ b/dev-python/tempora/tempora-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,6 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-# The calc-prorate binary used to be part of jaraco.utils
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index be24350f0203..be30856fead2 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.4.0.tar.gz 12274 BLAKE2B 558d905a65a340843a18b9c0987a34b45a53335478bc29275b4150642e8902f77830a63654a177e0017e3c729ea1bcd63d8f2296866773dfbf31cda6bc785ef7 SHA512 41d1b429ee32cd717d273152da0263cfff13d79aae7ecc69bda455c1391ea1e6cf74b412e6043bf3d32d62932b4498a2484deb997ef545fdd6195fd5ebd58fc5
+DIST texttable-1.5.0.tar.gz 10640 BLAKE2B 54bc7f1ac1860e2b88de092528134f8ba63b4f31f621a32e64a242b5f2d3132294818cff6bfdb848d4fa002d515069448dd077a95fa70bdf4e9266e162bb9355 SHA512 f4727947a302c8e1bf09ba08d73f79f083304b42f86f2f181a98f44602961e0b280aedd4e38660630671eac17e6eb92403b89c1ae6ea3cdd3cf861c122b904a3
 EBUILD texttable-0.9.1.ebuild 433 BLAKE2B 39f373d4876fc255d750d3be892e9f8b720c9f136ca9d89c6f46a3469860b640158c836fd21af37d3853bbb004e46bece4b4a103189d9f0e94c1dda6dfbb1b9c SHA512 ee3e2d6576e9bc93fcdf81e33d0a05d772397e3f662bf6a1ac0bf25e030a844ac7278bf4e2b8873360f0ad3e1ad0c3210f1bea9ea215416d32868d5e2aa9c552
-EBUILD texttable-1.4.0.ebuild 686 BLAKE2B ddc5917d9cda1f057564aa2c3dcfbc8ca62e08e80af01a0cdb92cfe4de8f2247df4a05169722a54e732e2b564c093357530e9550b5b2a6b7ce78891728505420 SHA512 b6765ebffabd5033d17004bf7a74c085c25d9d4893a4d929e6775fcf465abded5473ce6df1606c876e3c23c71b5ed85c6df89b20733396ef97346f4baccbcf5e
+EBUILD texttable-1.5.0.ebuild 703 BLAKE2B cd137889f13e3d42425bfd5612bb8f3cfd22a0d0fd2463e3e39061ff5639e8dffbd12c5444ed635308d888b72041706ea1da2e494cab7b66ff381ac7f974e145 SHA512 fa42b524fe558249ed3b7bedd0dc6b7086f7f2ace148f3629f27a0a71d0672ab229e345f6de1d1d04ac71b2e7a81aa82f5bbb20da65cc709aceb6da0a16ca5d6
 MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
diff --git a/dev-python/texttable/texttable-1.4.0.ebuild b/dev-python/texttable/texttable-1.5.0.ebuild
index a885a2a6c894..3b68d79f45a7 100644
--- a/dev-python/texttable/texttable-1.4.0.ebuild
+++ b/dev-python/texttable/texttable-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,11 +10,13 @@ DESCRIPTION="Module for creating simple ASCII tables"
 HOMEPAGE="https://github.com/foutaise/texttable"
 SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cjk test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -22,10 +24,8 @@ DEPEND="
 		cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
 	)
 "
-RDEPEND="
-	cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )
-"
+RDEPEND="cjk? ( dev-python/cjkwrap[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test -v tests.py || die
+	pytest -vv tests.py || die
 }
diff --git a/dev-python/twill/Manifest b/dev-python/twill/Manifest
deleted file mode 100644
index 607fb88e7f84..000000000000
--- a/dev-python/twill/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST twill-0.9.tar.gz 242291 BLAKE2B 7ba3b9c6156b5c10ec988c9d1f1c6b444b1168b90ff0980e9e0fcdc23bed765a5dc36568acb0fe174ea57182a55caf98cb6913cff9774da6dee56f9712c3ca8b SHA512 ea47400e236c4f5a4d38671bbc5690d004c4dbd20b6152c54c2fa64bae3e3ec68d16a5305d42e8631595cac25f5b2a08e0eb287b7e1ed7b90a8368d6063b1f1e
-EBUILD twill-0.9-r1.ebuild 1195 BLAKE2B 71b704ea38fb81ac78aaacbdbb21f66f306444c231550f55a9d80ecabccbe03d2031e62350befda33aa88ee8fdd4d778c1a5e8c0802ec1d5f9048042f62080e5 SHA512 56704686ef6c315d9acd351d5bdb40b01c16953a775d24e10f62946fadc882fee51cbae045aa609f4a22e9aaa540924903af90499084ebc80da14a81afe20fa0
-MISC metadata.xml 630 BLAKE2B 708005bf0296433cbe5d3377b74e8558b4f90abe1133205b96e6f5912dd96533382f474c1ea9e74322a6bbb57e77ad182c1af8d2f3c3b100b49742ef2cff8749 SHA512 9d08bb18d5ff85f2301d2b1f2aff814cb63257c3fdd1b19d4fe72ce5060d9cbedd0c26a5f3fd55cc972f3c41861bea7df92584945b381b7e8f8caa3d7d97f39f
diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml
deleted file mode 100644
index 99a143d0daf5..000000000000
--- a/dev-python/twill/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild
deleted file mode 100644
index 127b1b3cfb74..000000000000
--- a/dev-python/twill/twill-0.9-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Simple scripting language for web browsing with Python API"
-HOMEPAGE="http://twill.idyll.org/"
-SRC_URI="http://darcs.idyll.org/~t/projects/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="doc examples"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'virtual/python-dnspython[${PYTHON_USEDEP}]' 'python2*')
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup 'python2*'
-		pushd doc > /dev/null || die
-		chmod +x make-epydoc.sh || die
-		./make-epydoc.sh || die
-		popd> /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/epydoc-html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 870bdccc038f..66e435248f9b 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -3,5 +3,5 @@ AUX urwid-1.3.1-test-vterm-EINTR.patch 1384 BLAKE2B 91385ddb7b343a4bbe89718cdf09
 DIST urwid-1.3.1.tar.gz 588549 BLAKE2B b2e135fa1ba60ef75f6d748c7a51e5eecef2c7fd51e19782c4901ab2715c6afc01ac709cd79c74e3da9b8671dfd021c968aaf7c3fa393e607e0ed9ac54bcbbb4 SHA512 8b505d38f3a0c04bbf527b324dc36212f2580213dd55eca61c66705d3beaac4f074c39aaa0f4f71add1fe5f3fce4c4c6dc88dd1e981b04bac6d52195d7a3f0ed
 DIST urwid-2.0.1.tar.gz 604167 BLAKE2B 0c7c289175d023bb14fca2c48eeec9e149af301827874c17d3087532f19d120ca2208306db44c5fbfd28b68f4b192f176cd46b83e915a5cbb8200e442e69fedb SHA512 99c86a26b08c624c23207ce8e587e8442bece1f522e0c788600ad5f01a4c679efff95dd947edade8b6f4adc376edca949a40c305f9d5ddaf6a0ff97f13c6da30
 EBUILD urwid-1.3.1.ebuild 1228 BLAKE2B 9f2ab23facc8b6468c95b0a344415bb1e233f3738150153d4a1953d9d1668a4d01556ec81b838e8adeeb2b307cb083ca8a478a01f8d1ab52a4120902b4963a16 SHA512 9fb6e6fceb84ad70ec51a1dcee858ae040fa479e4a16d60efc8ef8a97553dedb4ee1a1383d2d605943f5b500128abe743b9a26204f641a9b9c732ced65bd6eda
-EBUILD urwid-2.0.1.ebuild 1033 BLAKE2B 481657fc23fab86e81d1d5df35fd9de700808ac73a4fb3f31d7190021cf0bda903e7a3126327d53df90020f3c5032c61207dc4b05f1238eeb9a544347769a36a SHA512 242a3cd7078b9c8cfdee968cf77e5bc2c743d093a6d440c8e3fdeee716a2289926672f6dd3c4181d72d9a15ec066f01684e7ea4ccc66609f755e9db70fe4c4b8
+EBUILD urwid-2.0.1.ebuild 1035 BLAKE2B 64b328b8214af05b7258170ee8df480aa7093783d2bf3b55fe49786c4a31f349378c0a0631840a430465ddb574e9c5009e206ace54d90ad3d00ad3c5769f882a SHA512 a06c893140fb4d5453e43cda93ee2ab7a6e40c7ee267105d2710e79faca727b4b0445e2128ba861b125b66d03f5dd323b0d1103509680197232abe8b66e5a428
 MISC metadata.xml 1152 BLAKE2B 4b992c5bc6907498186b29eba5804d17341a20715dfd9ea568e0b066d5f6b8775a79a703be450a436badf46d052a790a62cb8ce7100cdb54f24faa68eae6ecda SHA512 4bb4df4cc9398e2b77815b908cfc3821a96370e083a7b4452d601009186bc2c29418987f6e9a25d64332a15b860addb66ee4594e30ea51f34a1eae2d8be0a680
diff --git a/dev-python/urwid/urwid-2.0.1.ebuild b/dev-python/urwid/urwid-2.0.1.ebuild
index c8bfd90b8c4b..49c1d4bf5854 100644
--- a/dev-python/urwid/urwid-2.0.1.ebuild
+++ b/dev-python/urwid/urwid-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="ncurses"
 
 inherit distutils-r1
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 715f74b9784e..b53f4334445d 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,3 @@
 DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
-EBUILD virtualenv-clone-0.2.6.ebuild 480 BLAKE2B 5ddcab46155a037a0c69dee8de4b20adb1336b0c5dcbec4609f0ad05529460b6170923a77761756a3bee2f1887cc53aea62c3c4372de7752be86c24cc23d0982 SHA512 0516c8f8f3fc598db07d615cdf3b1ec85a5cd047d36ed8ab38bfd2782bfb6d7e163f3ffe9548bd445587f825b19221a23c35d16a5d814944912551bbe2dea2f6
+EBUILD virtualenv-clone-0.2.6.ebuild 481 BLAKE2B 5982ac112e94805feea41bd9b2caae07757102207a0b840b4229d68c76f5d5bf166921e080d1b2b5b858005ff3bf31908d86c3441d72cd232b888395bd03f3a2 SHA512 73cf01ff7f88d2f12f9c4c29a935a1d61e055cc19dda0dcca107b555987c56816c5e657a8a2a356daaffeb84bb619e8fa5ac2e9ed8b66a303d6a76cd2fe8b819
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
index 21e8667c3e40..0fff093ae301 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index c335b4de1deb..deb689952206 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,7 +1,7 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
-DIST vobject-0.9.6.tar.gz 216446 BLAKE2B 8d0c6ca10a6b22fdf27571bad90e52900c9b013b832fe1fb13f91648298d80e2f68c6335ccb5c93760ef6a4a1a089222e1e6097a82cc47486ecea8474646e3c9 SHA512 1a6c1fb29e700b5d2e6ffbc0bbd75bdaeb568ba00360463b15423881615815e609fea51e72e403e75594676a0be8597fab222f79c3985ab74aa2273f9440819c
+DIST vobject-0.9.6.1.tar.gz 216565 BLAKE2B 3097c3291337299f12d015a75509b0d3f14a1cd452f90e4445c3804d2ac8db0ea5858a3674eb688f66aaa5c048b155675fe36513a78b16714aa7bff2a0fd86b2 SHA512 499f22a1a9e60398a89d3d6fa472a0b4c9dd00b98440a4ce873da824f83cef1b0a5eb9e5051267931707a3eef00a1d3fb83ff63ffe857b403c4ac3a131f18dff
 EBUILD vobject-0.9.3.ebuild 781 BLAKE2B c4df5166da0942cc46e38ad18ed017089bb60befb337827adfef68890c3e2dcc84043311d6598440a87812bb2adf554054eeb71c2f97b5b3065189ccabb61293 SHA512 e668439edbe611806750a3f641e812fafa49fed311d1329395ea2e8103faa52de5b441a396f7960478045d60c880be275e26e4e027be9769d829ea2e972412ab
 EBUILD vobject-0.9.5.ebuild 794 BLAKE2B 78c62ad5726fa07d870740e20bb484b822f20158f19f4d8cfbfcfde3dd655612ba98d0b5bceb43fef1be12fe1d85306d15a1b5cec11caa0d585c1ffffd84af72 SHA512 3f3745254d52434cfd66569eb9a7757d2acc7c5ece6e5a9e1ba77c24fc548175152292605f679865afb5b8828a5634e55b15bf3db0e570a241ae1a93085d7723
-EBUILD vobject-0.9.6.ebuild 795 BLAKE2B bb21835ece9e9b9629267cebdfafb6e952f6ba52d5e64a6033e81f6a66f67b710f5095d8b628c077e604d61d6384d73eaa4c674360842cc413bb9b98d718bf44 SHA512 441c1974452c33de233377f7478b4c47bf38d84d9059f16626fd17239a73eb65ae1ff60bf4e42fff8c5447eeae9c413c51ab3890c6efc1fb5b08577c43530e23
+EBUILD vobject-0.9.6.1.ebuild 794 BLAKE2B 78b50131dbed3165eb7ccfe9bb288154064565cf721e2d7a1c206a52938c6397ef8a1fb5a788831ec4541a8088af1c535edc5a3c7089ad33e9c5714facb2c2f8 SHA512 a2869feb96956bab9f447e4ca5b06fb937dbe341332f0ad1cee6b7a44ce6fc19f27b8a32a7b33735e4eaf26c93ee456b5c36228c29713d75089becf515298eb1
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.6.ebuild b/dev-python/vobject/vobject-0.9.6.1.ebuild
index 51f3deade5ac..1e083bef2841 100644
--- a/dev-python/vobject/vobject-0.9.6.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index bca0d2c981b1..7dcbc3d3d672 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,6 @@
 DIST waitress-1.0.1.tar.gz 123934 BLAKE2B 1e7d2a2d0850096b6b0d5654208ebe23d4e78360d8eedf3bce98276b8710eac0f544158f9efe5fa72abbab27d3ca5c4f3ed9afed43144d4d06f88f8068b2f19a SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21
 DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 EBUILD waitress-1.0.1.ebuild 796 BLAKE2B 82ef2f706193f159e8443e942fe40da112a9d56d5b2dafc752ad56df93a1b1bbc35d62a6fe5f06a388add59da0fd334382c4695eeef6884122804c8039535dbe SHA512 8affcf2d4d81bd7188da21173a1ecfc8eb7817b9f2db5f1c3518f404aea6081f7eeb5585c2ce630c2963aceb9495ba86f48fb5bab333bee308287b634b744e5c
+EBUILD waitress-1.0.2-r1.ebuild 794 BLAKE2B 83c4332be3f1839cf3fe0ac7524542613e157cc02f3522a015ac0db265fb021100d1913b39313237b7ccbb0f42d8eb800db6928f5b2ce3b1e2f7435de2d51733 SHA512 0f3c8564140c17dee699c890379ad4e5e3fbe971549677972ace25ba681d5e4d9eb2ebd5af1102d0e9094fa84148c1b8be62b75c62cbaff1c09dd20bb6a487c2
 EBUILD waitress-1.0.2.ebuild 783 BLAKE2B 835dc96cbb42fc3b1f6b322b37e3d57e811a4a5767f13217c6067c4923f563e6c048a98d2362cdf1211f2ff053f7aa82468e0d3e3f9794b8ec1ff797f495e388 SHA512 c42e78a63e2da187f506b33de12e8e605bb05d7d032c174af77c501026fcf5e9a3daae4ca2ddbcdd2b5f368bf23cf671189069168c277d7c31c1f407ecd7e601
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.2-r1.ebuild b/dev-python/waitress/waitress-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..934166e9bfc4
--- /dev/null
+++ b/dev-python/waitress/waitress-1.0.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="https://docs.pylonsproject.org/projects/waitress/en/latest/
+	https://pypi.org/project/waitress/
+	https://github.com/Pylons/waitress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 42122c361dda..23e5f4e10648 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,5 +1,7 @@
-DIST WeasyPrint-0.29.tar.gz 1418105 BLAKE2B b94f1f0099fcac68aa393758fda23562eae6350e2fb185397cf888735389974f863b6b7025ce349c29e349c91d884320c96b9c7afba2c83e52f6c78ab81e8885 SHA512 3875240b7bed6991372f6a45f82d32f0d2f3add29ab1937001c5559368405737d185aa85871358730989a91ee6b17e62cc21535735c884c47705d0d2d38bb167
+AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64eddff83f7906c1386bd7acdfb30efb45f7cef7b693520d06039233af05ea52076759eac0df652a81b68efa4339d1ec4c33594cc SHA512 df95d9b9c6c9b509bb547929e9df43bbd0c0498c1400c1e070ccc432c035b84cd3fcf1c8b031eaef9e298a614505a2300306d9d54d77dab09c8e238e11a44f89
+AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1
 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f
-EBUILD weasyprint-0.29.ebuild 1199 BLAKE2B b9bcb1ae2a5c13665befba0c6538062336344415ac7d339aa5b62c04479c860edf57fe7fe255bce19c55c82bf2dfb51d56d8e0b8e98ac6852be200d16b6bb2c5 SHA512 4f178b61ead5faaa0be43c9d86eca83add1a4448908a0fdbff459a5e7eb6955fdd7e7fb6eb71deb19c11a77b277fa4ed2f3afa0863335fd89e6ad7d1a36ff681
-EBUILD weasyprint-0.41.ebuild 1468 BLAKE2B 589e6474546b05b2cd38542d2ff1c4415e526d4f5e08f2ea250b7e67e521de2e35a4f89e74a1ba94c7be7512e7c6872c2631aef6c142c86af93484e45043f74f SHA512 cc74288870f66a25436b7d1aa6e78dddf833bd4a8b7dd736096e6e12f31cbdce325ef8002c098233c73f7c14ac13f11dc022cffb7c0bf58bfe130c5cf2613def
+DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
+EBUILD weasyprint-0.41.ebuild 1322 BLAKE2B 909faf1d09fb85b1fe167fff0995d5b96750ed9eb6022eea65b9cc841f0a87d8bf3713b78f3c0898ced55ac624d6dd4b0dcf95279a321c0915b7a21ec185d0fb SHA512 98623e08b261959388e1de4dfc0285fe5f54b5584039122b2f30d81b6173c3dc6a3a356642e5c392bab1fa6c9f95085c52aa1a7049434652e418cea0a8713eb2
+EBUILD weasyprint-43.ebuild 1374 BLAKE2B fcbd23418925b890827b9d9c2a7e7a20bdb9036e1c93a1afd1c53a3daf56e24590abb3c7e2309e03187f315e1d55b8c6293495e5edd2040dd2ac0f29f24b480b SHA512 e51e941af915240dbd1982261a93a72e5c84027fd05f834c64eb7422bd12182aa9f63fe3ea9bb8e4bc8613cb5b04ad0158e1d53e4590c454e92743d5ec87958d
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch b/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch
new file mode 100644
index 000000000000..f49635fc8479
--- /dev/null
+++ b/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch
@@ -0,0 +1,13 @@
+diff --git a/weasyprint/tests/test_layout/test_flex.py b/weasyprint/tests/test_layout/test_flex.py
+index 890df3e8..77c6bbf5 100644
+--- a/weasyprint/tests/test_layout/test_flex.py
++++ b/weasyprint/tests/test_layout/test_flex.py
+@@ -189,7 +189,7 @@ def test_flex_row_wrap_reverse():
+ 
+ 
+ @assert_no_logs
+-def test_flex_column_wrap_reverse():
++def xtest_flex_column_wrap_reverse():
+     page, = render_pages('''
+       <article style="display: flex; flex-flow: column wrap-reverse;
+                       height: 50px">
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch
new file mode 100644
index 000000000000..1229f0bed26d
--- /dev/null
+++ b/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch
@@ -0,0 +1,30 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -34,7 +34,6 @@
+ [options]
+ packages = find:
+ zip_safe = false
+-setup_requires = pytest-runner
+ install_requires = 
+ 	cffi>=0.6
+ 	html5lib>=0.999999999
+@@ -43,11 +42,6 @@
+ 	cssselect2>=0.1
+ 	CairoSVG>=1.0.20
+ 	Pyphen>=0.8
+-tests_require = 
+-	pytest-runner
+-	pytest-cov
+-	pytest-flake8
+-	pytest-isort
+ 
+ [options.entry_points]
+ console-scripts = weasyprint = weasyprint.__main__:main
+@@ -72,7 +72,6 @@
+ test = pytest
+ 
+ [tool:pytest]
+-addopts = --flake8 --isort
+ norecursedirs = build dist .cache .eggs .git
+ 
+ [coverage:run]
diff --git a/dev-python/weasyprint/weasyprint-0.29.ebuild b/dev-python/weasyprint/weasyprint-0.29.ebuild
deleted file mode 100644
index 737ee058558a..000000000000
--- a/dev-python/weasyprint/weasyprint-0.29.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-MY_PN="WeasyPrint"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Note: specific subslot of pango since it inlines some of pango headers.
-RDEPEND="x11-libs/pango:0/0
-	>=media-gfx/cairosvg-1.0.7[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-0.999[${PYTHON_USEDEP}]
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
-	~dev-python/tinycss-0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]"
-# x11-libs/gdk-pixbuf # optional dep
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-fonts/ahem )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
index fce99c16ede2..ba921c850bc0 100644
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -37,12 +37,9 @@ RDEPEND="
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		  ${RDEPEND}
-		  dev-python/pytest-cov[${PYTHON_USEDEP}]
-		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
-		  dev-python/pytest-isort[${PYTHON_USEDEP}]
-		  dev-python/pytest[${PYTHON_USEDEP}]
-		  media-fonts/ahem
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-fonts/ahem
 	)
 "
 
diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild
new file mode 100644
index 000000000000..d18200b1057c
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-43.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg jpeg2k test tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+RDEPEND="
+	>=x11-libs/cairo-1.15.4
+	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/pango:0/0
+	>=dev-python/cairocffi-0.9[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-fonts/ahem
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-43-skip-useless-deps.patch"
+	"${FILESDIR}/${PN}-43-skip-failing-test.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	pytest -vv || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 90ef14382058..20b7a1c13327 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -3,5 +3,6 @@ DIST WebOb-1.7.4.tar.gz 219331 BLAKE2B fe046905bf127dc8fedbf2b993e83b3614cd62ef6
 DIST WebOb-1.8.2.tar.gz 271737 BLAKE2B c6eef650e9b03c83d7c618d0187ef7fbd3432d043ab27501cf8c4d6dc3889f3b542c54bf35963d8a313d62246183373c30706bcf5fd00495808e21d3dc9e0482 SHA512 691a6cfbbff376e7b1f71adcaac4dbe8cc26cb4ddc396e2ab946ddf15b34c05c638113f48ee396d4edaf6ef77498ca8539d1c63de9f58894afb0e4b88bbf04ae
 EBUILD webob-1.7.3.ebuild 1074 BLAKE2B f391ca5a7ca30397d67d33461d04f17692ebcb5043515b6d248e62e5d3188217d145e54b025dedac3a7c11f795395ed2da242ab700d53a3e02c0784c0fa24bfa SHA512 ef10002b17c0bc79733ea9d018acee01e1684b4001e86143420ab7b21b121cb85508ffeb3c078ccc65664f8e5681f2b18e5818679a1eeca6987672c02bfa4598
 EBUILD webob-1.7.4.ebuild 1073 BLAKE2B 52b84cbc1f896ad556214fb0213ab0c5e0468b6f48c23c97207c0c34d12670230579afbd257603c5eb7d37ecb4630f62cb4ad9aaf406d0038ef28d1e7f602ae7 SHA512 3322c1344f8e7cb34448ad0e7c37d0ab3182486c1447cdad420a08687805dffa860056d0d1176d9a9c41d4ee211ba8eae4ac750af3b11b988b88db4f8dcb6612
+EBUILD webob-1.8.2-r1.ebuild 1080 BLAKE2B ad0b2a82738ace3cb1a3a33ffed6b5fd75ab9576cd7c8f6ed19bdb0b3d827e2ddd6fdf7a8a3d63ec86df5ac4f86527e4ea75f1b111e56438f78c4f0637c7cac7 SHA512 eb2ae8c4b89a778630b719f7bf8de1fd3a4c76113525842ba41745043609c1ff4fb73da37c3e44ff7099e3a4367b24f819a93a75117a7ccfacb71e6e3c8a03c3
 EBUILD webob-1.8.2.ebuild 1069 BLAKE2B 3e9b96140e8d01750b77b15a3aeac759b49695e533e137791e1dd12d5606dd57c76664f78c123f619177eb6120c5a8f2d1ee0ec955990c4c14e7114ca4360030 SHA512 e7d2fa06717f06f9c29e2bd8ee9bb48f04c1636444fbefaddb0fe53d86e955e6a7a737db2a425abf2aa42b2a55f351deb2d4beee579fe2868f18e1478d857019
 MISC metadata.xml 308 BLAKE2B b14e4d8d46fb386647015b3ba5028f737f440f53e8a13d3afb4b9f418fccdb902f81728c825f65969577d765140230ea623ff66814b12789d45f22e53ae48534 SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234
diff --git a/dev-python/webob/webob-1.8.2-r1.ebuild b/dev-python/webob/webob-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..4c0774667c9a
--- /dev/null
+++ b/dev-python/webob/webob-1.8.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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 )
+
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 2a840fe9c9c0..b45776c62142 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,5 +1,6 @@
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 EBUILD webtest-2.0.21.ebuild 1806 BLAKE2B c368d64119cfb3289d1957482f18e1d9d601e3a7da4c50ca8b3873366d30cbf95fcf33d00ebdd28c3df55c0b3b28b9b1bb09b34f26960ea36f4af407d5ed18aa SHA512 ae3c51bf50c24db69981ac662c96a9090247d996074334a2b3ac97e546c9472abff270798ca4b637dd320af6c7437b07ebf5f7a8bc96019aeb734ad8a17d442f
+EBUILD webtest-2.0.29-r1.ebuild 1777 BLAKE2B 20932b53d3cef97efb43bf1e7bb62ac7541658f9ba71ce430e4c6cbf52cdc21ea39721b0942d22cfee18c4d3e1b81b32516c5fddc07f425c265922e615ceb1e4 SHA512 f372b9061bad6dd89ca3237245f06d5bc80c8fa8f0a6cb8be93a4b0a8563440dfb33f7517b60371aeae3cceb38dd0ae4c19212e4a8190fe28282c027cc176b6a
 EBUILD webtest-2.0.29.ebuild 1770 BLAKE2B 4b7b7a4a1a536c413e4d3b8adfb16fb985ecde4a7c8fee5aec27ff4450a84f3f42e59b99e4e0f1186882976d36839beea668fb38267a15e3ab195d4b62fac4c4 SHA512 5b33a51941137c257b0bcac531ee1aa58485640834ea184dddfbf33d09174aeeefffba51cae10e639115282f553a0401179531b5c5f0fc20f823e28fc846e228
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.29-r1.ebuild b/dev-python/webtest/webtest-2.0.29-r1.ebuild
new file mode 100644
index 000000000000..f7ea291c78c0
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.29-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 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
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="https://pypi.org/project/WebTest/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Makes testing easier; otherwise we get errors from pkg_resources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	local -x PYTHONPATH=
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 8c9e14411592..2c7ab8a7d290 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,5 +1,6 @@
 DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 EBUILD wsgiproxy2-0.4.2.ebuild 1301 BLAKE2B 0d508bec0cc43df25bdc9cc79846b7d0ae679b4051aadbca7b2ec2d2b4cdd256876da52982d262d88fc49bf2f9d31e7c75a4eb3aa0afb0a84a35486ba8f7459b SHA512 ad96bbb9a28f3d0e4e3c644e07cc90ea8702bd14383e2bf8bc0617980c11d888cc53a94fdea41e9feaa0ba19869ce4a13424106f9756bd1b0dd992e0960fc327
+EBUILD wsgiproxy2-0.4.4-r1.ebuild 1311 BLAKE2B c5396a4a1329201da256cd167959aa440cd7acc8370eb3415b53aaf06318bdbbf37ad62097d746e1c89491846e9ca7b3767946c3b4df989e177aeb7489223f02 SHA512 aa37ca4f2508f90afee59d5b4a46355db9fcb30e214426bf6b024eef651e19b11a667dd86436365fc3d28c91be3ed07c1d5d590c6bdb9e41793b522941986a54
 EBUILD wsgiproxy2-0.4.4.ebuild 1312 BLAKE2B 30644a4f92e238778c9839c1b4f45938dc170a9aa09e161aab069d9930e0eb2fc827e15f88e7db1edde1d79c7c601c2e6e4fbe3faeb29460c9987cdc3959725f SHA512 522aa657376778704f1358e9aca55d692d4fec6d9cd7a3abf3a84c298ebef3a77b66147646edf844e737b07b5c6dd1fee71921dee3601f64c92a947a8e828bc1
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..3fa947ce702a
--- /dev/null
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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
+
+MY_PN="WSGIProxy2"
+
+DESCRIPTION="HTTP proxying tools for WSGI apps"
+HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
+		dev-python/socketpool[${PYTHON_USEDEP}]
+		dev-python/restkit[$(python_gen_usedep python2_7)] )"
+# Tests needing restkit are skipped under py3
+# Testing also revealed the suite needs latest webtest
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
new file mode 100644
index 000000000000..41d24d3c6373
--- /dev/null
+++ b/dev-python/yapf/Manifest
@@ -0,0 +1,3 @@
+DIST yapf-0.24.0.tar.gz 145607 BLAKE2B 2f85130a28d7daea5f656bc3d46ef34291dfa3ac739170b8f7e120acbaa62c5f255c6c69d3b1775ceb13a63c09c239d207f227c41234bc676e131d0b4b958356 SHA512 daa61faaa2877af8bc8579b1f6a8e9cf177d1caf27e0430cc508b86b42d907186a0fe14913530368097b888f12c19fc601fbcc1c4e605341ca328e8bf40ea399
+EBUILD yapf-0.24.0.ebuild 508 BLAKE2B 9da66e7bf3baa1635ebf5860d2c24584df3b89f6f91b0a13dc2252ce95b617850c4f102a8ec1adb52c2a3b1a36dcdf356be92fe8f4e679231c5563b6c9d48bbe SHA512 30ce60093517a66c2699ddfa4b32f9ca79ac1ac73dc2ab94d7486bec7f6ba8dc1db1e036013efca42244f12231bac8d5fe4b9b75db42d6efc4cce56b528492ef
+MISC metadata.xml 667 BLAKE2B 28416fefc49753b487eaf7cfb35dfe2b5bab3ff16187ef6e16ca1fa25cadbda6fe1d5ca83a340a5657bbc0dc14d5a837e1749d114f88a08da1c4cd4b40c65d5a SHA512 f7f98b10dabbfddaf5cfea77d925d67f414d89a8f13ca7a80aa0993d24d696ee677a4cd85335a45c0547575fe42931fbe98c9256e60ab4122c266f83b9af64f9
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
new file mode 100644
index 000000000000..28299522aad8
--- /dev/null
+++ b/dev-python/yapf/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+		<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		YAPF is based off of 'clang-format', developed by Daniel Jasper.
+		In essence, the algorithm takes the code and reformats it to the best
+		formatting that conforms to the style guide, even if the original code
+		didn't violate the style guide.	
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/yapf/yapf-0.24.0.ebuild b/dev-python/yapf/yapf-0.24.0.ebuild
new file mode 100644
index 000000000000..599e8fcc6053
--- /dev/null
+++ b/dev-python/yapf/yapf-0.24.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A formatter for Python files"
+HOMEPAGE="https://github.com/google/yapf"
+SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 13eb3243366e..d434df0063fb 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.8.1.ebuild 558 BLAKE2B c3607d9ebb995c3ea7feaab8bd5545daf5cfa55d1a889713ed7c3fbfbd6862cdce61ab1f43efc84f7f78c6f5c8ba3697a2c133be1840314d8689880a081a2fd3 SHA512 5bbdc89ec340d20ee47f8a44266c5fe1dbc1d533e9cf23206a52f2a11957dcc8eaf34194503310085c485eddb7cc3911b9c5c6962d3edecde5bd27cba7e987e9
+EBUILD zstandard-0.8.1.ebuild 565 BLAKE2B 3d289c597c85abbd0cefc17a2d40b4da4e2e2b1ea486ac5e11f41c92405571d99f3f444927362e3ab891b7307719c5788f772b11f9d04ffac47ea37235c49ec2 SHA512 f66e212432b5dab7ec5f558430481b40dd4b8713aefa22c21f9fd5a617899d26f2c3f97b20e96a3b40d2ccaf94ee624cffbbfd275c7bee73d856b5f399242da9
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 9c888b32c473..1dd90db6e4ff 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /dev-python
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)