gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-python
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
262 files changed, 2391 insertions, 1988 deletions
diff --git a/dev-python/CommonMark/CommonMark-0.7.3.ebuild b/dev-python/CommonMark/CommonMark-0.7.3.ebuild
deleted file mode 100644
index 95f715545b5d..000000000000
--- a/dev-python/CommonMark/CommonMark-0.7.3.ebuild
+++ /dev/null
@@ -1,31 +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="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-RDEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	PYTHONIOENCODING='utf8' \
-	esetup.py test
-}
diff --git a/dev-python/CommonMark/Manifest b/dev-python/CommonMark/Manifest
deleted file mode 100644
index 5af1a2018fd6..000000000000
--- a/dev-python/CommonMark/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
-DIST CommonMark-0.7.3.tar.gz 85177 BLAKE2B f7940e00918d3c737dbbc79c336b20caf3974bc4ba162f9adb1f34bd09b43af69252bd0b5f2f7c072edd1fb55b812fa104c471b7f43daf6187404ccabe0225c9 SHA512 34ddf0539b54d79cd16356124a15e4f51076a7afdde78fbaa0cab06658279357c5523d89bdfa7d595d85da9df9b194491ddac22b78444b230f53298ffd11c8cf
-DIST CommonMark-0.7.4.tar.gz 87841 BLAKE2B 8820d9ee182753ea6069d30c84458a6a5e9f41948ef16e9382d9ac223508f022268f8bbd0661313d458365ef5bedabac41c2508943fb30c1b54a4d3dbcc4892d SHA512 7c76a5f0dec02e9ae8c2f73ebd2980a5a684b43ee8a82ea23b72c7f2332e1d4316a7b2d7b66ad8fe912803115a57e03b2ae4c7b042cc53e1205e579093053b89
-DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
-EBUILD CommonMark-0.5.4.ebuild 752 BLAKE2B 230b188503b96ba631d281eb59ad6b3f9f8705f614465877f1ad6fe407921e6be28286cb0c701c2e5fef72ba94706a56ddccb00fe7ed59d73401f56f29524277 SHA512 27e404e755cf427e1e8cd61817a1810e8cbfb59112a929ade454eb51f3ad57353805257133cccf3fe2facad1db3e7a149b79cf4f75e4fb6395dfe7c54718e3be
-EBUILD CommonMark-0.7.3.ebuild 674 BLAKE2B bc6633250e17b3a3f0a16661b3c500e93c3827e4723b77cc2ed2f6c176be5667eae4809a4fd6284117bc768ded8642c954dfb813a2740e5ac00f8d47e253b3aa SHA512 c12aaa35eab159bd46736ba914a0b5828e8a8660fd2e6d321905a42178ff06e8fa61eb3cd59cd5dcbadcd492bc26e6a4589c4a595a66e1326fdfe6b6f7e907f0
-EBUILD CommonMark-0.7.4.ebuild 1028 BLAKE2B 37d886bd5fffd2c0fd0edcd392ba49a4999a3c37520b8d7f1f7599f4a583c78453ad3906c840c3ed57aecb091923c863c5995563f159022aa7a8f57b17edef83 SHA512 6346dd647dd2a40844c0b9521fd15d4658c79db46e52c6456f5802de305a28201cc33a565a2a29699cd79f602867079a83a84ec007889d0014f1d2474105896a
-EBUILD CommonMark-0.7.5.ebuild 993 BLAKE2B cd7287ab2dcd865f42b4cc76653d1b6179e0b8fc3c99349dc0ca0c5b2ba20a64e49f0b13db66dc794dc4f716647e05dccb589ed444d6de9f1b2a1a445571237a SHA512 dab1ee5f78ef0ed94af125ac4d1e7bb4fa4e1ca4deefb52ad50b4351cd911d17ff28313fe30a887720480febae37868daf9a6c40c723321bf33194168d283d99
-MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e19287d75d14..4453385d68e9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 0c0435308f57..ec4a8591e714 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,7 +1,9 @@
 AUX PyQt5-5.10.1-fix-testlib.patch 1293 BLAKE2B 8ea2a9de5913578c951b4acc05508662fd63590e097fbb8b681ac02cb3d96c9670ab1a1bbe873c1c1320dd78cc4c738f9f714c8ffd5be732bc15f084ad7ca721 SHA512 bfe80fa6018174a6981777031ffa97bc834e17848580d02c994c61507aa4ea16091e582b6bbc3754d469de1901fa8cf2e3e12240cced44fd0dbe928bdd360925
 AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
+DIST PyQt5_gpl-5.11.3.tar.gz 3121036 BLAKE2B e7881fea18535ba55c0b6946718fd1eccdc6a4678b869678c9413c500daee0cbfb281116db40a13655c8cb5e778b605f141821e20bf3834f1434908f73fc22bd SHA512 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
 EBUILD PyQt5-5.10.1-r1.ebuild 5726 BLAKE2B 2fd96947e8386cd0cb04392bd62644340f5b0345f06decca25e21e2cf194d4a9e42fd3bce5b06c7d3afb1d86a83ca17625a45b8b3d66e41f06a3340b8eeb360b SHA512 ad1a428b6894868156bd36810c5476f68e7d23311cddae2f5b7f47bce7827caf223b6423204b4afa3a697848e6ffba46cee8a45753796550a0b6edab4b23f72c
+EBUILD PyQt5-5.11.3.ebuild 5675 BLAKE2B 0066cee24acae56af544117ff497132171fc6d09e7e30eb3a0236467830864cd7b2514f7c576b9bffe56f10375e29d7c27cf5e129aab89dce4801ba035f8ed30 SHA512 edae44de1577c98ac55639c6da68018c7ffd03fdace48ff44f6ac661cef85ec25acb74d8af128456ca4282d4fdabebc0c2ee6aab81859d3c2918dd7716fa96e4
 EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.11.3.ebuild b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
new file mode 100644
index 000000000000..5eedcadd3ead
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
@@ -0,0 +1,195 @@
+# 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 multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}_gpl-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
+else
+	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNetworkAuth, QtNfc
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
+	multimedia network opengl positioning printsupport sensors serialport sql svg
+	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	bluetooth? ( gui )
+	declarative? ( gui network )
+	designer? ( widgets )
+	help? ( gui widgets )
+	location? ( positioning )
+	multimedia? ( gui network )
+	opengl? ( gui widgets )
+	positioning? ( gui )
+	printsupport? ( gui widgets )
+	sensors? ( gui )
+	serialport? ( gui )
+	sql? ( widgets )
+	svg? ( gui widgets )
+	testlib? ( widgets )
+	webchannel? ( network )
+	webengine? ( network widgets? ( printsupport webchannel ) )
+	webkit? ( gui network printsupport widgets )
+	websockets? ( network )
+	widgets? ( gui )
+	xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.9.6:5"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19.11:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2=] )
+	help? ( >=dev-qt/qthelp-${QT_PV} )
+	location? ( >=dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+	network? ( >=dev-qt/qtnetwork-${QT_PV} )
+	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qttest-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	webkit? ( dev-qt/qtwebkit:5[printsupport] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( "${S}"/{ChangeLog,NEWS} )
+
+pyqt_use_enable() {
+	use "$1" || return
+
+	if [[ $# -eq 1 ]]; then
+		echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+	else
+		shift
+		echo ${@/#/--enable=}
+	fi
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			$(usex debug '--debug --qml-debug --trace' '')
+			--verbose
+			--confirm-license
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			--qsci-api
+			--enable=QtCore
+			--enable=QtXml
+			$(pyqt_use_enable bluetooth)
+			$(pyqt_use_enable dbus QtDBus)
+			$(usex dbus '' --no-python-dbus)
+			$(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+			$(usex declarative '' --no-qml-plugin)
+			$(pyqt_use_enable designer)
+			$(usex designer '' --no-designer-plugin)
+			$(pyqt_use_enable gui)
+			$(pyqt_use_enable gui $(use gles2 && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+			$(pyqt_use_enable help)
+			$(pyqt_use_enable location)
+			$(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+			$(pyqt_use_enable network)
+			$(pyqt_use_enable opengl QtOpenGL)
+			$(pyqt_use_enable positioning)
+			$(pyqt_use_enable printsupport QtPrintSupport)
+			$(pyqt_use_enable sensors)
+			$(pyqt_use_enable serialport QtSerialPort)
+			$(pyqt_use_enable sql)
+			$(pyqt_use_enable svg)
+			$(pyqt_use_enable testlib QtTest)
+			$(pyqt_use_enable webchannel QtWebChannel)
+			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+			$(pyqt_use_enable websockets QtWebSockets)
+			$(pyqt_use_enable widgets)
+			$(pyqt_use_enable x11extras QtX11Extras)
+			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		eqmake5 -recursive ${PN}.pro
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		local tmp_root=${D}/tmp
+		# parallel install fails (same issue as qscintilla-python-2.10.8)
+		emake -j1 INSTALL_ROOT="${tmp_root}" install
+
+		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+		local exe
+		for exe in pylupdate5 pyrcc5 pyuic5; do
+			python_doexe "${bin_dir}/${exe}"
+			rm "${bin_dir}/${exe}" || die
+		done
+
+		local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+		if python_is_python3; then
+			rm -r "${uic_dir}"/port_v2 || die
+		else
+			rm -r "${uic_dir}"/port_v3 || die
+		fi
+
+		multibuild_merge_root "${tmp_root}" "${D}"
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index fc94a0150123..46e26d188f3f 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -3,5 +3,5 @@ DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd48
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
 EBUILD alabaster-0.7.10.ebuild 549 BLAKE2B f77214a48102e0180908d429b4789c2506e443dbcf80d39526905b0d801536da43a53c44914f6aee5d214242f8a24ecd63fc1611769246b02f9084b58745e821 SHA512 c7db4066c01d964a285426bc8e783bffd085c2f874e90c339c6c666b751f23134fd135bdbacfd3519c8aa8e2fd8eab87e8da02f7e8263f4c6ad3fcaa9c9a0868
 EBUILD alabaster-0.7.11.ebuild 551 BLAKE2B 5f556550fc40ea3fb2c19d49f0721c7a34ac7531ff90c6ffde8decc9037cbf3e75370295936d951ae68bb7cf000bd5911c1fb85f1825017e4c65e1646b75250c SHA512 24bfb0b2f393a2c4b0f295b2fea2add1ecb7e2b089a3f3a4635cc1671a057ff03c953ef51895f9166f562c8cf180a6f33d8184e32d7d93ce4479b19ae9f3f3dc
-EBUILD alabaster-0.7.9.ebuild 514 BLAKE2B a59f7f5a7a1da542c832ed7a186f77366caff8187c17d7992a2ad039c718127893f6efff900ac10186e76998af035b7f16314abbf8e899cef8cc8146f237e2f6 SHA512 5818d0decaecea3d5340b45c01f3e8e6000f94e7be42a018252a53dd8e9bc1dec17d806fef2367656a7be359b08da987143658895681c219d8e09f720c892480
+EBUILD alabaster-0.7.9.ebuild 510 BLAKE2B f8a0e47fb4322c2016242595fd64e9714fca2595d9e9aed5ba4f2550e234af3323fbce5224c1115ae07fe6fa941d24476a7583b4e1b9847c62363937bab7f0ed SHA512 da85d1ea7dd8035a1f800283474e95fa21adc4fe846d1b4a5a5733ec6cbabf10b4e82f00a6ceae0985bff711ff8350b125725d16c82ac99d0396e3b547b6576c
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
index 3a98a7540eb5..01cf94b1540a 100644
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.9.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index ff8c9de10cef..2f24160ebafb 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -2,8 +2,10 @@ DIST ansi2html-1.1.1.tar.gz 46591 BLAKE2B e2eb3d9b2665fd495ee8591a3cbfebcd1d565e
 DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b6210bfa5e71265d529599eea7713581ef986faa5afefb445492fe09d2170d164a63b2a602c57a79f2c72cbe118 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860
 DIST ansi2html-1.3.0.tar.gz 35989 BLAKE2B b2f949e2c559b2da91d3095b4d8ac2091bd15aad46b178a01aa59d4c900917e733f6ab3884d9c4c7c46bfa530936339d9b105a0471a09eb7a01693c43e8a87dd SHA512 73d1b3431e22146c4fe18fef4b05413231d79d627c396d67528d0aa1ab07a7ef4bcfeff56829b85d9fe9ad508599b782318911f7b10d6b9a1bc98780e31389d7
 DIST ansi2html-1.4.2.tar.gz 25485 BLAKE2B 93f3bbd307b916c9ca60379235600606dbe16f1b6e423d0d2615f7825e92a6d7a8469ae7d60cf5131b4c3431897b3161bfcd2a0327525a332bcd6a6980dad5c9 SHA512 29c569839788968ba5a1fed8dddd4cc92f40ca88b4135b597815012ea44a44e8b7a3c2259d2d5d5f3cc690400be882236b88c0764a649da5679431501aab0b1c
+DIST ansi2html-1.5.1.tar.gz 27133 BLAKE2B 8a8017b8f4edb878b105138ec0dfe3fbde8647315382d763eeae7f90f094b60f0cb7205718c75930ccb7ca1183e40e5205eca6f8362e20445d930d92db23bc22 SHA512 367fa9721de65a6e14118d65de9ea8ede1ecc9f0809115ecccf481947aa442409ca972442e51a75bc4f14913566255142da4e411fe060dfda5e55f84a7ac67af
 EBUILD ansi2html-1.1.1.ebuild 974 BLAKE2B 63d51cb4874427dc950def125e69f094048c770b43c1c53677199c5688efc2e505a64599c2b26d69f62e58bdb0b373aad14e9faa5b27c151050e998d916a0a77 SHA512 d0e2fb2fa975c8a3db5fa5e1a7c316e655188fde167e8a09772c9296f2d0515bb03b48960f98c8ba1b2c322f92d51572878e78236f0687dc7f40e14c77cc1d76
 EBUILD ansi2html-1.2.0.ebuild 974 BLAKE2B 76346fb51b15eef7d57484aa8d15cd36d5a740e18d6f3c75494ddf9bad1cfaa89bd7597aa446fc33bd1399d2fc3787732efb30884c8396f22afe1d458a3867d9 SHA512 9a0a7bbf42528bb6aeb8231bd4179b4de056708f28caef17fe8a0fcd636dfcc13f79aa7bb71a9b1a4613944b23008f827aa514bd92582e575b0104766191405f
 EBUILD ansi2html-1.3.0.ebuild 1091 BLAKE2B 3c1cb0b29a60d36a478ca0d25dcb5c83189ce5f5cbd5eb568890b9447a8e812bee8e04d6cb6e5cea7d130b6700954e17d07eca1bd03ab2add1b3b1858b9f208a SHA512 c08e8fcd4bf6e2590a7d9a56b62d8ca8944d3b5dc72fbc11bf0d96a8500e4650254ca0dca1e92f51cd3b9729c663cfa391f03eb8804b9e6533113dba46201b7c
 EBUILD ansi2html-1.4.2.ebuild 1090 BLAKE2B 5df0dec2430651026cfae0df0218f71a57ec893d223136793355c707c334488a2c6c4fc3c5c2e1b3568a9c975116da5441542e20dcb0453f33b95600f558a92d SHA512 40ed7958d2ffe8c5470efc0881994cb552e54f306c5a334209399361ea2c06dc282e04c55c9c83483dec85020e70eab09f88cc18638af2c18f4314ed306ec64e
+EBUILD ansi2html-1.5.1.ebuild 979 BLAKE2B 1c4ae47f10db340813216ee782450af430abbfdc139c3352d323c8135090896977983e219a8dc0b97d8cec410cd9a48698c09f0f218ffc903067bdfd6bcf103b SHA512 f9fd53e3670073b907e174a8c26ce27fffda82c84197fafd85160246e1b35fa9a8961b8dbeeb36a4580f434a830be4793b447f78a1a74db8121b5da779d18243
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.5.1.ebuild b/dev-python/ansi2html/ansi2html-1.5.1.ebuild
new file mode 100644
index 000000000000..076a1f0115aa
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.5.1.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_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	doman man/${PN}.1
+	DOCS=( README.rst man/${PN}.1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argon2_cffi/Manifest b/dev-python/argon2_cffi/Manifest
new file mode 100644
index 000000000000..f823244f011b
--- /dev/null
+++ b/dev-python/argon2_cffi/Manifest
@@ -0,0 +1,3 @@
+DIST argon2_cffi-18.3.0.tar.gz 1806363 BLAKE2B b60711ac929792ccd87a948f213288d4d47f45bf4bb52a1f6ac698d229e0953e37186c4e7d140231c205777be2fe31982a808cc676c13f12fe8602381665b74c SHA512 482a97ca17a23e4c1f93a0642e5aab1f2556d10f8a24d74afd051e6b58533c4767465abbfe8f1d39c150c5dbb191ad138d08e70633721753c7d317dbaf1cb375
+EBUILD argon2_cffi-18.3.0.ebuild 1172 BLAKE2B c2ce2a0410afa76935e54fdf7bb73ace85051817ce2716558226addb678b933f0dde93e9f135db262e2229145bb10b0d7bc889e4f669a424b0f36123ae9d8adf SHA512 66999c73637722feba791a9e9ac9d63e6fce862e758b2abd3f3695a9abba74674f9e340170d0c98f2169578e47f9230b2fc75cc8b61c87c2ef6da97a4db191b6
+MISC metadata.xml 727 BLAKE2B 8ca033f1a646a7d55dd8c78f483998d8ee34863d372c88b0d9e42c7d1fa7a14962b9a2e9c19aa13d0d35c7cd0e68599419a9641982dd376d76ade5c98d3cf338 SHA512 770cffcd4f6ecbf4fe93463bdb1670a9ec882844da62ac8ce18d606efcda6f314a3942b205d6a4ec54aee6b53f784faf6d19482601c9b570567217c31c6846b2
diff --git a/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild b/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
new file mode 100644
index 000000000000..14c6988af3e6
--- /dev/null
+++ b/dev-python/argon2_cffi/argon2_cffi-18.3.0.ebuild
@@ -0,0 +1,51 @@
+# 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,7}} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
+HOMEPAGE="https://github.com/hynek/argon2_cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+COMMON_DEPEND="
+	~app-crypt/argon2-20171227:=
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst FAQ.rst README.rst )
+
+python_configure_all() {
+	export ARGON2_CFFI_USE_SYSTEM=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || 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/argon2_cffi/metadata.xml b/dev-python/argon2_cffi/metadata.xml
new file mode 100644
index 000000000000..3404c181dec2
--- /dev/null
+++ b/dev-python/argon2_cffi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>m.seifert@digitalernachschub.de</email>
+    <name>Michael Seifert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>CFFI bindings for the Argon2 password hashing library.</longdescription>
+  <upstream>
+    <remote-id type="pypi">argon2_cffi</remote-id>
+    <remote-id type="github">hynek/argon2_cffi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
deleted file mode 100644
index 11a3b02c3d1e..000000000000
--- a/dev-python/astng/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pypy-test.patch 1863 BLAKE2B 4d0cb211cd9129f8a8cef2a8e15e169a23024bd30c065c6e7109f9044a7d9bd017a2d7ec121a652e6d94433f91d491626ca984202eecc85dde19cfa8ca3f6947 SHA512 474805cd55ae930b3d2f0595549b74f8a718ad21de016204367f5513d69afc5a6ad4f43b44162a5b752a820f642ef5600c2c3f7e7111839b1d3ef0d95a7819ad
-DIST logilab-astng-0.24.3.tar.gz 106660 BLAKE2B 0f82787fc0a3de025fb2921d0e94ca8e2ee33dfe636c9ad55f6494983467c8acfdab0aa83e7f84f1525697a6a5317569ff51537732a90ccdec2646f380b316ac SHA512 fb1e46ebf7111d727cd9d187968cb349dc23dfba0d4d8c6c793a8c081d4506f11e488074cc51b632c525aa264cfa50279dda90f0cf35dc2120ebbf4714902525
-EBUILD astng-0.24.3-r1.ebuild 1572 BLAKE2B 8118ddce7e4edf07126eaab8c3c76ee8740fc233c0c51d5167e790ce70da55fc1fc3b0d941829343f6112e09f8ac526e11811d68ba18e438ea4f0122d76c8946 SHA512 d65d12a96c937eafb1577301f5c911904662b825b7fae728c33d7f584e989ad7592b0fdb802988db72df7d5a37311d664f1cdc4ada7d0e06c379779a89b64b9b
-EBUILD astng-0.24.3.ebuild 1468 BLAKE2B 3644639859e5a92bacc0808fff4fd50f7fd738d8fdc3d10267633af8e69c7592415b980105d55c85e4e79abbcb0e534f01d3daa485cbd8f631837fa5fd91049d SHA512 e6e1ec7f70afdbfe2d0f5b3cc4fcf6d75adb47cb9ddd5c5676eaa7fe568d9cbd1d7a8d98bbfb6d4bb59aaf244dd9aa6c7e79de2acdc1f578073b6db4e6bc3793
-MISC metadata.xml 1068 BLAKE2B 0c0056ab7befb8cd391372534f9c7c84fb8f44a789446ec06b5653606d2748341342fc3a7b3886891930faa86404cc831cff0d8825691e99237c01f5e7e04e29 SHA512 c31304cd3895351242c47fef547bc6277421cc634b63862bbb84de081b0638a3020a6347510fff386d78aad432ee6382f8d7f4e1766aa1af32c2b44e83425cc2
diff --git a/dev-python/astng/astng-0.24.3-r1.ebuild b/dev-python/astng/astng-0.24.3-r1.ebuild
deleted file mode 100644
index c082787d9da0..000000000000
--- a/dev-python/astng/astng-0.24.3-r1.ebuild
+++ /dev/null
@@ -1,51 +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
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
-SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# 1.2.2-r1 for namespace files
-RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
-
-S="${WORKDIR}/logilab-${P}"
-RESTRICT="test"		# erroneous failures
-
-# a wit; pypy reports astng modules differently
-PATCHES=( "${FILESDIR}"/pypy-test.patch )
-
-python_test() {
-	distutils_install_for_testing
-	# test target needs unpacked test directories, doesn't like binary egg
-	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
-	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
-	# Make sure that the tests use correct modules.
-	cd "${TEST_DIR}"/lib || die
-	pytest -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
deleted file mode 100644
index 4bbd302c3dd6..000000000000
--- a/dev-python/astng/astng-0.24.3.ebuild
+++ /dev/null
@@ -1,45 +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
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
-SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="test"
-
-# Version specified in __pkginfo__.py.
-RDEPEND=">=dev-python/logilab-common-0.59.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/egenix-mx-base-3.0.0[$(python_gen_usedep 'python2*')] )"
-
-S="${WORKDIR}/logilab-${P}"
-RESTRICT="test"		# erroneous failures
-
-# a wit; pypy reports astng modules differently
-PATCHES=( "${FILESDIR}"/pypy-test.patch )
-
-python_test() {
-	distutils_install_for_testing
-	# test target needs unpacked test directories, doesn't like binary egg
-	esetup.py install_lib --install-dir="${TEST_DIR}"/lib
-	#https://bitbucket.org/logilab/astroid/issue/1/test-suite-fails-in-0243-under-py32-pypy
-	# Make sure that the tests use correct modules.
-	cd "${TEST_DIR}"/lib || die
-	pytest -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	rm "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
diff --git a/dev-python/astng/files/pypy-test.patch b/dev-python/astng/files/pypy-test.patch
deleted file mode 100644
index 42cb3864b43b..000000000000
--- a/dev-python/astng/files/pypy-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur logilab-astng-0.24.3.orig/test/unittest_builder.py logilab-astng-0.24.3/test/unittest_builder.py
---- test/unittest_builder.py	2013-04-17 17:38:31.000000000 +0800
-+++ test/unittest_builder.py	2013-06-19 02:13:51.425269363 +0800
-@@ -62,8 +62,12 @@
-         self.assertEqual(name.tolineno, 4)
-         strarg = callfunc.args[0]
-         self.assertIsInstance(strarg, nodes.Const)
--        self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
--        self.assertEqual(strarg.tolineno, 5)
-+        if hasattr(sys, 'pypy_version_info'):
-+            self.assertEqual(strarg.fromlineno, 4) # no way for this one (is 4 actually)
-+            self.assertEqual(strarg.tolineno, 4)
-+        else:
-+            self.assertEqual(strarg.fromlineno, 5) # no way for this one (is 4 actually)
-+            self.assertEqual(strarg.tolineno, 5)
-         namearg = callfunc.args[1]
-         self.assertIsInstance(namearg, nodes.Name)
-         self.assertEqual(namearg.fromlineno, 5)
-diff -ur logilab-astng-0.24.3.orig/test/unittest_inference.py logilab-astng-0.24.3/test/unittest_inference.py
---- test/unittest_inference.py	2013-04-17 17:38:31.000000000 +0800
-+++ test/unittest_inference.py	2013-06-19 02:52:41.618270007 +0800
-@@ -710,8 +710,12 @@
-         node = get_name_node(astng, 'open', -1)
-         infered = list(node.infer())
-         self.assertEqual(len(infered), 1)
--        self.assertIsInstance(infered[0], nodes.Function)
--        self.assertEqual(infered[0].name, 'open')
-+        if hasattr(sys, 'pypy_version_info'):
-+            self.assertIsInstance(infered[0], nodes.Class)
-+            self.assertEqual(infered[0].name, 'file')
-+        else:
-+            self.assertIsInstance(infered[0], nodes.Function)
-+            self.assertEqual(infered[0].name, 'open') 
- 
-     def test_callfunc_context_func(self):
-         code = '''
diff --git a/dev-python/astng/metadata.xml b/dev-python/astng/metadata.xml
deleted file mode 100644
index b7ac41e3d53b..000000000000
--- a/dev-python/astng/metadata.xml
+++ /dev/null
@@ -1,22 +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">The aim of this module is to provide a common base representation of
-  python source code for projects such as pychecker, pyreverse,
-  pylint... Well, actually the development of this library is
-  essentially governed by pylint's needs.
-  It provides a compatible representation which comes from the _ast
-  module. It rebuilds the tree generated by the builtin _ast module by
-  recursively walking down the AST and building an extended ast (let's
-  call it astng ;). The new node classes have additional methods and
-  attributes for different usages. They include some support for static
-  inference and local name scopes. Furthermore, astng builds partial
-  trees by inspecting living objects.</longdescription>
-  <upstream>
-    <remote-id type="pypi">logilab-astng</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 942a8e1d41e8..408e23a23082 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 949 BLAKE2B d40c8c6e5272d374d466f61e4280e4dd9fca3966671f61feadf7856d5c3a0f28eee3cd4e9d4475780b610468cb0de0c0d17da552be4f45108ec1d23cbca76d36 SHA512 6fd59e1210ca15b1a16382e42a0e4a3cc563b4ba6fdcf0f8df4098d32489a2685e1d78c7bee6fcfc0558af2cbfde7600969d5db3f4e5fbf6587f57c7ba9e8183
-EBUILD atomicwrites-1.2.1.ebuild 942 BLAKE2B d1a3f23d9b752035b1445e344e06db342b6ec15461d17fc9d8640773892e7a5fc83a7b344a3cd566d3ba7c0c5f425a1d70936e262ded4c0d86d15583c86db963 SHA512 1afea14ad6f9b9e14fe88d1023c9e2610299edd9e1f5913ed1678fe01b490a7d6cc326bfb2ec6ebff205d14a2682ce4c509a3d4f9e8e786dfaaf7fadf2fc409a
+EBUILD atomicwrites-1.1.5-r3.ebuild 959 BLAKE2B 3fd41a1bc3fd32c3654e73f9b75d99ca63c98bc41d3de5fc98ba40c03bee51e7dd9b0a72e7a2b6f2dd5880af5a79869aee42799e035645d755e8d0afcaaf8fb2 SHA512 70bd31d5dd33240206ce96eafbef95e2284ec850d4aeac0632350941c82e62ecc9c4d718f30f4d8ec1a2d70c0f2e9642255e1cd39db5d6e1c8d8de7d6a4e6e17
+EBUILD atomicwrites-1.2.1.ebuild 945 BLAKE2B 1686a341278586a5fbebef6b5d9f1c7607a6b55e60fee93d702a8a92ac32af22f83fc2eb0a7d5527ef6f602f26be5a8bfede176bea96ed0f44430b8df0ded9dc SHA512 39d897f6c908237ca75bc591ddef2a663c23750f8787de5a706bfc02e0753b123f32cd89b3e53722783e64f891ca3b4d5b5cf11bae7a0ee954d5a0e64127664a
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index 8fe927585a77..2fb60c61c275 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index 5ca007ff2e86..edd01805d3d7 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
new file mode 100644
index 000000000000..130340b40b86
--- /dev/null
+++ b/dev-python/backports-os/Manifest
@@ -0,0 +1,3 @@
+DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
+EBUILD backports-os-0.1.1.ebuild 972 BLAKE2B 7998d36861786c93ce30852f8fdd27ffbdfc325740a8b31fd24999915a3362c0c09c83dec1ab797ed6414b36d6fd95760154678b787f5feab7d6305792b97346 SHA512 6e64c69bdc405cc63412d5549bd3739827749910afcbcd84e9c49d58dc66508c9353fbe75364e5388d3962ef834f1954301880ff2d671ad830fac8a98e5d1bef
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
new file mode 100644
index 000000000000..3b30347de811
--- /dev/null
+++ b/dev-python/backports-os/backports-os-0.1.1.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_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Backport of new features in Python's os module"
+HOMEPAGE="https://github.com/pjdelport/backports.os"
+SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/backports[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${P/-/.}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	distutils-r1_python_install
+	# main namespace provided by dev-python/backports
+	rm "${ED}/$(python_get_sitedir)"/backports/__init__.py* || die
+	rm -rf "${ED}/$(python_get_sitedir)"/backports/__pycache__ || die
+}
diff --git a/dev-python/logilab-constraint/metadata.xml b/dev-python/backports-os/metadata.xml
index 7f4f33c6dbc9..3da97a9953cc 100644
--- a/dev-python/logilab-constraint/metadata.xml
+++ b/dev-python/backports-os/metadata.xml
@@ -1,8 +1,8 @@
 <?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 type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index 10c7aa7b4340..bbd315328ccc 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -3,5 +3,5 @@ DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332
 DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 EBUILD beautifulsoup-3.2.1-r1.ebuild 858 BLAKE2B d8a3a865e18101053361a4be6d569344484317891f1611d8a3ce2d168a8e4eb0d6b28fb067fb1cb74cc57fa89d99da7c50f6edd37bc120232a51e5962d6eadb9 SHA512 879c787894a065f4150c8b6021ff30f15ee0d273de06c0d151ef84157eee1e5d2ca56df9104ac8a6a44d43cb332d3367cc8f2861b7324d851f0285e1c7e174ad
 EBUILD beautifulsoup-4.5.1.ebuild 1359 BLAKE2B 7629a7dd000b55c72fdf523e361be3756c290a478eda10e20cec96e7725d15082125755ab28fda3c79d1b8f1500f4f6aecb832af93db4077a9ca68eaae37383a SHA512 334927959ed9a41f0bb9b7deea78481504d0051801eab94a66981d3ca3fe5dc69f953dcdb46294a9f68177031b3571b9efed3cf9bff598072d4a1eeb6087bf61
-EBUILD beautifulsoup-4.6.3.ebuild 1328 BLAKE2B 29406083fa344a392e411e0a168c00ae1f7bcc273433b6a0d64afde460fc84f0e68b12ac29e3b14fb264ce2c26eed6c6e19e34a77de5155a9d85203069c64296 SHA512 0e6dfd282f0d3ca65e9a18b976922647be15af48d826f49cf8ae68fe1dd6bfb04cd443e2dc41cc29b188b0d732925d9d37a1c61c602007fefae0da9aaab35196
+EBUILD beautifulsoup-4.6.3.ebuild 1324 BLAKE2B 34832ce698f74ccd1c331a8c392b165567dd44899991d9799f4b885ba1b177227c8c9f74d19481958965907c40524d11d6cf3407760a7d0f1ff53b7e1dd33f40 SHA512 e2b79e8cc2f0852c93330c20741fc1a6edd447d46c07ee9602c19086636be841a3928db571c8a683719f9f113df2908ec13013aeaa011d68fb5707b9071abff8
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
index 8ae9560e9941..48b282ab4639 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.6.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.6.3.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="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 6691d358fb65..c7bec08c57a0 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
-DIST bleach-3.0.0.tar.gz 164459 BLAKE2B a9e873428cf629dc98c8adf56ad8a45f63e355ffb5eb495df4d452106e77a5919c90e2f1651f671e8807e0dddbdb7543fbd4c78fd95afad4cf8cee68e7a797d8 SHA512 7bc13af18baed440c0ce39f8caf7a14fc7264aba8a14a1999334d1ddd78183a0f84a17b3f2088453ee20d4873162f2a8cbd273e6f881201744b2a0f47805839e
+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 792 BLAKE2B 62915001c423ea8c8db88bebc2f06a605702dd7caa93fadad76e347c66c47d2cc666657383169895b175f2cd1755489eac685e6c71de0f2b6ae40c34f30f1b0a SHA512 04c8437eed67e4f48a0829316ee5641f49bb77fe1628168b5d5df72dbaa207bba7b9ce7e6528c0c71c98e815312a0c147f717b204710b1a76bc16cc2bc3c70f3
-EBUILD bleach-3.0.0.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
+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-3.0.0.ebuild b/dev-python/bleach/bleach-3.0.1.ebuild
index 71d5a9790dcd..71d5a9790dcd 100644
--- a/dev-python/bleach/bleach-3.0.0.ebuild
+++ b/dev-python/bleach/bleach-3.0.1.ebuild
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
new file mode 100644
index 000000000000..0e86e397012a
--- /dev/null
+++ b/dev-python/booleanOperations/Manifest
@@ -0,0 +1,3 @@
+DIST booleanOperations-0.8.0.tar.gz 19914 BLAKE2B 121eb4c8587cd56717c757589cadd08334c7a3d90d878c17d24e36b232a1cbf0386a4c1090638818f0e264296796d89a8231204656d2a7432802b385e8200c80 SHA512 76eaeb6a5039f4f5ff3a066545a70c35a512b7ec20e54873cde90a14a18f6a9fc33a2ac356325f7390f206ad2f34412e178212e30065ede41d4b3fa8397eecea
+EBUILD booleanOperations-0.8.0.ebuild 694 BLAKE2B 419289377d4c19650390f8a20594c5e0b56cfced88bac86e8f1e15ce2ac87b0257c707cb691dff9a2bf88a5071c9fc3892c017cb5b00db6a821eca630ee4bab7 SHA512 b308af6e4fba358d384b67c074db8e140bdafbdc09c9977f191cb29fbe950555f9c4a4341e61865cbb9d15eab659867357e96ebb050ab824ee7dc4be1fc2ab5c
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild b/dev-python/booleanOperations/booleanOperations-0.8.0.ebuild
new file mode 100644
index 000000000000..3a04ff471681
--- /dev/null
+++ b/dev-python/booleanOperations/booleanOperations-0.8.0.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_6 )
+inherit distutils-r1
+
+DESCRIPTION="Boolean operations on paths"
+HOMEPAGE="https://github.com/typemytype/booleanOperations"
+SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/pyclipper[${PYTHON_USEDEP}]
+	dev-python/ufoLib[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/booleanOperations/metadata.xml b/dev-python/booleanOperations/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/booleanOperations/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7535e20273e7..cb1a48924247 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,4 @@
-AUX 9999/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
+AUX 7.0.0/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 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
@@ -6,7 +6,7 @@ DIST cfe-7.0.0.src.tar.xz 12541904 BLAKE2B 92ecfcb37e7efb4f3dde275e7a087a52f1ddc
 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 1277 BLAKE2B dfb603b473855cc6ac4ac0f8edd0a689a8d8f10d5131fa286f24100cd483043f4bbcf72ed2b2d3d8364fbb94f45758c3401d0468eda150370064c6b8a6034662 SHA512 0e261d1d3cb6a683e9ec254f4c95b47afcd34c9499d0922e581dc7707d6beb63ff76e075e9ea1eaffd51aa3dbf6e1a8da742fe9e256de834a34792a98b3f561c
-EBUILD clang-python-7.0.9999.ebuild 1235 BLAKE2B 7d203e547693c00763be1542721f005d4bd5ca70a0cc1345509e3112b4a3fde2aa17aa250bd256e68f38c5657b2a060ed8606c42203dba500e6d43fb58fa00d1 SHA512 46fbf754690b5aaa8b56ae2a00191681104bd66c45f062b5744fa6eeeb5624c4341d91d256f370339f25ff25c075c3eea737d8b4c163af9b691712e762b09e37
-EBUILD clang-python-9999.ebuild 1210 BLAKE2B 4e9d11a29d220b74ed4526ad72af2524084a0d7c237e1daa403e2236ee2efe2c96484d7d664e159de6fc394b4a477b1208715e3a398ddaca8fbede6997061fcb SHA512 7717ef6fecad0b31cb9c1656e4945dfb8167e679c899d78283c32ab0bd005ef6b54492776d5447937c64f406c10d54a91fb59a6ee19f6d418e00fb9c8797ec4c
+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
 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 6587ca010e17..cb4c02ae7491 100644
--- a/dev-python/clang-python/clang-python-7.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.0.ebuild
@@ -32,7 +32,7 @@ S=${WORKDIR}/${MY_P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
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 56917d10ff17..ff42c58b9e72 100644
--- a/dev-python/clang-python/clang-python-7.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.9999.ebuild
@@ -34,7 +34,7 @@ S=${WORKDIR}/${P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index b3138a01e172..cf488945799b 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -30,12 +30,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
-PATCHES=(
-	# update completion test results due to completion changes
-	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/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/files/9999/0001-python-tests-Update-test_code_completion.patch b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch
index 824da55ca416..824da55ca416 100644
--- a/dev-python/clang-python/files/9999/0001-python-tests-Update-test_code_completion.patch
+++ b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 0c8f90ed3083..ad1d0df54cb4 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -3,8 +3,10 @@ AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2
 DIST click-5.1.tar.gz 275592 BLAKE2B 0a58e210003f88081fd2ba8e9f401c74d8d61758ae096fde9fa4aebe8a819623aeb90106bf141d5193d632d70488629cf63833297dc1e4b200824cee205c3c4b SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a
 DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f52dcda4fb439f9fdfeea8fdc33b1ce60e93711ba40ecdc508dc3fc5f8aadc371bd85b7dca1bfa070786c2 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
+DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
 EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d90e6f655b9edf5d5ccf86e53399508d01725270bfb5960156f0381fe046c5bf7929e0c91d0ad7b9010a0eb SHA512 dbc45857683e0cb698b9b95f743a13f0d7f77df33eb9d58397404040dac04fb8b0e811afae51ce886a4ace5c6136c3ac1d4ab3dfc53208a5bcd2f74ca5dce464
 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 1081 BLAKE2B d0088141c8d36e22791760971159b9def2402f56d5c3db114a799d16eee30b429cc28b0763188c3b5c055f435a672ce193f9af4a6b40dc6da9e087c6f4b72f6c SHA512 4639cb83331f5ade0e97dcbb0bcb767e66010f814f2ed3941db4eea44b86b00bd4210e301736cc078a54a3e35998fbefcbc521128349ff627f308e0485d228c6
 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
new file mode 100644
index 000000000000..e6e39841fdc4
--- /dev/null
+++ b/dev-python/click/click-7.0.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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
new file mode 100644
index 000000000000..1ddac91462eb
--- /dev/null
+++ b/dev-python/commonmark/Manifest
@@ -0,0 +1,7 @@
+DIST CommonMark-0.5.4.tar.gz 120316 BLAKE2B 47904d101d9d0e3759f82c28a4b80edfc0ed12cf0888e4915339118e496322cf0791d8a46d2edddca0d1794e82a9647cc22cbcfcc2d385a740c7c31cb8251659 SHA512 1983714a50a627f30f86af0d02dad9e52cb7b0ffce29691d0e740f587e599ead6de2412d72b895b7df772e1c81e171e56dfecaf593e611af65bd5798632a98ad
+DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e61b17d0335c3234fc0fa0d3738e9117a8ca29e7a6bbaa6cd0d58b112defb6e19a7efce3ca57ca25c8ce67b2d3d2 SHA512 b0e3c4fea6c99b51c541054ecfe887935c2cc517a82df86da1d9cb4914189652326ec5b543cbbcb40ec43e5e09c285c47f5304ca1907764692e659c540591bdd
+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 1004 BLAKE2B 601fee072353ca32a0c4daea40a3a4a57f1fdb0e3f44062bdb7f7d941ba0e5f84f7afde7ed2f074089d717503a0a89f170670c388d90c636b48ae3fb738d4a72 SHA512 3bb45d760e2f8cff6f582043d587f05d0a1fae49c163bfd708b51e5191e5a560ee9192f852f04ff4070ed72f7d38ad69388e963be52194e073ee45588195f4f0
+MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/CommonMark/CommonMark-0.5.4.ebuild b/dev-python/commonmark/commonmark-0.5.4.ebuild
index e8eb5056c3b6..630fd63052eb 100644
--- a/dev-python/CommonMark/CommonMark-0.5.4.ebuild
+++ b/dev-python/commonmark/commonmark-0.5.4.ebuild
@@ -6,16 +6,17 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
+MY_PN=CommonMark
+MY_P=${MY_PN}-${PV}
 DESCRIPTION="Python parser for the CommonMark Markdown spec"
 HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
 IUSE=""
+
 RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 "
@@ -24,10 +25,12 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+S=${WORKDIR}/${MY_P}
+
 # unrestrict for versions >= 0.7.2
 RESTRICT=test
 
 python_test() {
 	LC_ALL='en_US.utf8' LC_CTYPE='en_US.utf8' LANG=en_US.utf8 PYTHONIOENCODING=UTF-8 \
-		  esetup.py test
+	esetup.py test
 }
diff --git a/dev-python/CommonMark/CommonMark-0.7.4.ebuild b/dev-python/commonmark/commonmark-0.7.5.ebuild
index bd4fc9bf81bd..52faefc635f9 100644
--- a/dev-python/CommonMark/CommonMark-0.7.4.ebuild
+++ b/dev-python/commonmark/commonmark-0.7.5.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
+MY_PN=CommonMark
+MY_P=${MY_PN}-${PV}
 DESCRIPTION="Python parser for the CommonMark Markdown spec"
 HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+
 RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/flake8-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
 	)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+S=${WORKDIR}/${MY_P}
+
 python_test() {
 	PYTHONIOENCODING='utf8' \
 	esetup.py test
diff --git a/dev-python/CommonMark/CommonMark-0.7.5.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index 8da735bd09db..68e34aca47df 100644
--- a/dev-python/CommonMark/CommonMark-0.7.5.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -8,14 +8,13 @@ inherit distutils-r1
 
 DESCRIPTION="Python parser for the CommonMark Markdown spec"
 HOMEPAGE="https://github.com/rtfd/CommonMark-py"
-LICENSE="BSD"
-
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+
 RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 "
@@ -34,7 +33,7 @@ python_test() {
 src_prepare() {
 	default
 	# Fix file collision with app-text/cmark, see bug #627034
-	sed -i -e "s:'cmark\( = CommonMark.cmark\:main'\):'cmark.py\1:" \
+	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
 		setup.py || die
 }
 
diff --git a/dev-python/CommonMark/metadata.xml b/dev-python/commonmark/metadata.xml
index fc5b696a8da1..fc5b696a8da1 100644
--- a/dev-python/CommonMark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 49d72ab81bcb..2259066a4388 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
-EBUILD ctypesgen-0_p72-r1.ebuild 827 BLAKE2B d1083c3eb66ea791152fd9b1342babe99795cd9b9ff6d87dd97987519c5de9259ef77337073cc4b79856005652f4fd01dd7596475cc5fdb489557eecddd4f068 SHA512 41f75aa9f6ef7ea850bdaf111816dfbff825f134b8f5545f8114193f8c7df8b008b4f261104eece9a73f01811095b1112098e16f797532ace088ca2a1e125c9b
+EBUILD ctypesgen-0_p72-r1.ebuild 823 BLAKE2B f5b124923569a694bf55b73156d97a90638135996e8958f2bd3e68057270f0e71345b8f4fdb00fc31ff8a426e6f7316a24269a4af9ef4936d318f89bc0747226 SHA512 9d8369da25cd922a09236c420030ef236f85852fb9a350f734582db0d3ff6b920963fa4dc9afdb16d41002db77e510da6aee2b4b8942211e9efbe4fca6011760
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 5e0843d1709c..3f1f7452a12c 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index e8e590f582b1..56a5d9a0e01f 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-2.4.7.tar.gz 10096 BLAKE2B aeac5b0c0ac3dc0a1a069f3b1bdcc81bc8cc6703c4650ee6b569f6ce9caf6255551655e41a94406b1ff22817ef2f64d7826ad9491cbe1b0591e357141f34f06f SHA512 33c32893916b9bc45949bb4115bc8aee2eacd809535783eb7b07d3d3ee162ea969da5a739078f8b061e89da52e8da468f9d7fe916dd4f9d7dbea7012c2955e9d
-EBUILD daemonize-2.4.7.ebuild 457 BLAKE2B 06d131875c27ca68fa0c8cba2154577748fca2f21b28e8e59ba0543943ab5cc8f8b9c9aa978d20d3045f7bfba0dea4e34dcf8aa608c8d038629c790a5b10b610 SHA512 7a3d533a6965809eb1518482da18e432b5912c99bfdafc4f0d58e49d2aa4abfb1e8121610fd98ed87aaea7e59ba6a75f697b0b72b1cf91f44e65b12ea1f8f8e2
+EBUILD daemonize-2.4.7.ebuild 467 BLAKE2B be33a2d6711e30c43993cdc389f63de65c6614622c2166bc2c95cbb74ba4b7dc01a19a558429863c0a8271bd0d364b5248a616aa1403e98321b03779f506ede7 SHA512 c3d0aff4707e4e71ea130215fbe33fea2bc46756e2bc6e641b722ba639d2f0c4509e7d455185843c15bd897a2ad55098b008e34106490f43cb40fc723a9fe0c9
 MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.4.7.ebuild b/dev-python/daemonize/daemonize-2.4.7.ebuild
index e186dc2bcd22..8a120a67f65c 100644
--- a/dev-python/daemonize/daemonize-2.4.7.ebuild
+++ b/dev-python/daemonize/daemonize-2.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index a039ceabd81f..b13f011a0e5b 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -6,5 +6,5 @@ EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
 EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
-EBUILD dbus-python-1.2.8.ebuild 1657 BLAKE2B 6852964adbdeb9cb39f26c19c12ae810e5af4e6919bf7eeb973066fdb43311d5f88f54c5772626c7ab0819759e41fcb132c722e97999c8202d197356721d14aa SHA512 00bcdbffc06a5c6369b619f34738d9afc4665dafcf8d8d794ae5a52c065b7bfd7e7425f68e19c26939f16f22f09b5b74ea0ea43856ad8a18703f302222b668b2
+EBUILD dbus-python-1.2.8.ebuild 1664 BLAKE2B 21b843ec9b7d2eabaaa2f9dc132a1f67ad5edeafc5c454ed6e23489c7a1cc5dfb1efb984a949c49421c198a3d58c3a5780cfe3dbe97dd296db93b1e6245e5a80 SHA512 d08825d0b7e0712b2df9913d3c675f65c012065dd0ec10963e3c3938ad462e5db5aae2d394a7b82056c57e06dd18b22b9bf50275ef4417d94be83dd2f3ba2dbf
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
index b3a174b9cf04..dd14d3ba6b4f 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.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://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
new file mode 100644
index 000000000000..8a9f6a31bfd3
--- /dev/null
+++ b/dev-python/defcon/Manifest
@@ -0,0 +1,3 @@
+DIST defcon-0.5.3.tar.gz 439149 BLAKE2B 5407eeb8c9bb8e63056d0d42e653eb3bad793b17139fc31f153b12f7ae604aa6615442556f5360f84cc29dfd9674b8117a9022a1e4bdc62324c31378b4c075f1 SHA512 5975c2c0054a1c5d067414b5fe02dc4546fffd12d316c6773ce48425276d7ca7b4e132b772fab2ebc4e683170d02592e1917a67f0dbad64a4c2f2a6a3bfae9ce
+EBUILD defcon-0.5.3.ebuild 576 BLAKE2B 89f6beffdc27454d2e09a110e0fdef48ba3c3443d622db27032ac56a8b316a88e6c03ba5942dc7b430e2e9cae793624750da7cb02a4116265d01c6dfcc436580 SHA512 15c083854d7e5cfcb7d2c3869cab40ca0f152fdb4078fe505c4bb01d599018653afdb2a9ef9ab68d217984a8d2666271cb2eec7d8d0aa8860c112c9ada7397a7
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/defcon/defcon-0.5.3.ebuild b/dev-python/defcon/defcon-0.5.3.ebuild
new file mode 100644
index 000000000000..08be7e8bd1fb
--- /dev/null
+++ b/dev-python/defcon/defcon-0.5.3.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_6 )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/typesupply/defcon"
+SRC_URI="https://github.com/typesupply/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/ufoLib[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/defcon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 83b18cc67e96..90ed05192894 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.4.tar.gz 61901 BLAKE2B 70e4ba2b261d2007f80e52c43bf3fca4b41d2e53067e82aa46010334450b2a81723045f377956340d7b7d4388e829b8648a267a89c7ba69fd1ce28ca1f42ca10 SHA512 7ac9a25ecb46f0556acf48c1427154d3282a59185640aa85f2ae5d638d4b7fffea5b53a1964c621751e42d1d45fd6a6d5c273e1c850e2e473159bd099394e24e
 DIST denonavr-0.7.5.tar.gz 61972 BLAKE2B 17a6d7079cfea1f349b4ca2eafdfadc7cb1731737c9319d60239710e27608da1bdb0101fb36057a8618ceb0f2573aefc7b14932171e6e5ed2f393dc681f62ea2 SHA512 441b256ad34d7e998381a48d34296404418a8297d24fa7f748540e8daf9b067ca7acef4d04289665204ff1cf63e75333d4d49d173cf0eea42283e6eeedac6de1
-EBUILD denonavr-0.7.4.ebuild 739 BLAKE2B b17948d21ece30d16b9d1b06d8798e148b72f3ed28d7d9e384efcdb9341af44bb4d9af4c89e989b024e54275a100bcdc1345e1b13597fc5aeeaeaa1c045986be SHA512 281143ed79912e720b465d2b7709b47c3d3eae7187f3da4c9a8dad0739d5bad78f2a624667c60d67a2d4d557c4bc74f2c5ab3fa88e41d91c50bbb4bd0b23b269
+DIST denonavr-0.7.6.tar.gz 62285 BLAKE2B 45004465f1d8c371535c0e64b5d6decb224a80a986a5bfb1a960d320564e28a152a06c3c5375013261110a1d7c23ee301166580614dd1a727dac296c38b38899 SHA512 87c35325e46d8dc3129366dc45632705157e793d3faf4377f884b1d40430047fc2ff2613a975d6223a925c8c83c807454c03331b706a2d06474e649bbdb85c10
 EBUILD denonavr-0.7.5.ebuild 740 BLAKE2B f34d099173d6731367dd853519efd276eda64f70692a703cf08bb12a474427e670d858c4a3e7969cb19706bb9ec9c0a7315d88d43320265b9f667d9c26497d55 SHA512 9fe357f3e60214b998e1a59ef3d1c888be2acfbceef0a42ccf1a9aef8ea09054a30a6f0ab578e20d0389b54dd1fc8de99caafdd6685435689d6e3b911fd4ccf3
+EBUILD denonavr-0.7.6.ebuild 737 BLAKE2B 6bd02890359a2513508e06e324765385552092882605166c28a3c641c2a7f06c253c659559b06ed76e86f01c98649061ca9d8b8dfc05de53bb2fae7dc3138b61 SHA512 e584987d381b2439101ee760da869bc6efb4e1f8ede5f835989792538769f527260b6fd3decaea24c0a7aacb1d9dd693d82738475421ef974920886fc4811274
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.4.ebuild b/dev-python/denonavr/denonavr-0.7.6.ebuild
index 6f32967db35f..6d935e83ad72 100644
--- a/dev-python/denonavr/denonavr-0.7.4.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.6.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
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 491e1236f579..3893e620c0ce 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,5 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0_pre20180731.tar.gz 182538 BLAKE2B 3a472091fccc4f37d65681727643677472837fd6be0c4fd6aaa13afd1fd4362eb27a5ba4ff6babca46fe15c2f5318ddbba22ce058b522f763baa797e1e2d1ab9 SHA512 67d17ab7cb48c370c3c2dd5cb935eec5ab7e3ac0c912e179931f395899ad186ba869edd8b870c043ba9fb3545bace18549d2a377f2ae2c278660fc488e68a20d
 EBUILD dnspython-1.15.0-r1.ebuild 1035 BLAKE2B 799aaede1fb8078df7632674da6c6efa26edabeaa13e6fac1d41624edf27219e4b28bd54e3dd32429b92c856e040a05e3f05e88638a0320374105a86a242ab44 SHA512 c58f2eb758034ad0e7ee00e3e1ba1012870a624b6ec6f9f7e1d1f215fa75e3cc6c00783ee15cd58b7306a30de071b8caa1f36b824f015a8c8b3995c86f93dbb6
-EBUILD dnspython-1.16.0_pre20180731.ebuild 1227 BLAKE2B 298c5d44a2ccf52eb6d5c85206d5ea6c4c500a5fce8d6237213c3ece9fafdbf9e605c5617034c6de9a56f6b82f16b0f76a4ef094076425857ca73f496c59a63a SHA512 eb56ed381aeccf1df544f1cfc389bf30f326e0f55a4dfc9ac9d6f7e2439dc782e3626ab449caeffd1470a7b74fb31b1af861fa36e927ca226dcb49f699ea2d4e
+EBUILD dnspython-1.16.0_pre20180731.ebuild 1226 BLAKE2B a67046b2f2e4a0a0d84225bd084a11b1fa4bcb045f425de3f2e9aa337e759c85c08d100e2d0d8713646cd4a5c10e65d0c7e7187ef637d241e4aad87628975612 SHA512 696f5e82e492300de104c652c0218fa3bf021f2f859fb8b50bd6000950182d633ecb54e126fad0328f5679f23cdb9bbea99f1d9d8e5dd2c00e3e7b08251675a4
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild b/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
index 1d9163245a63..c488c69b30dd 100644
--- a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0_pre20180731.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 vcs-snapshot
 
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 890514b7ec38..e36f64006c30 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 776 BLAKE2B a7ed4e78008b95a4b924900e40da06d83dcd41db08e7ed820d05b31ee96bb58ae7af0c4ec17194e68d07a6351537a082018844b68ee2d19d1fcf4fe2fb7adb0f SHA512 cf7f86d1e02e323313773f706859358934e03329dc27c9781167ee8fefe288dc983c2c081fa546ec5c52610e23e731674b63eb98e0f16b3b7a21f22c51a9e9ac
+EBUILD docopt-0.6.2-r2.ebuild 783 BLAKE2B 1b1a52edde01ad371bf7639a3ca048824594b9dc789ee91adfa06a72711766f4ac264e3be1667f46084abdf4b9b1ad89c0a2dee9b57abbacd90a35dc5d7a58c0 SHA512 a53579ebf10cbf0af0156377c84346efb9a43283977836e38651444daf95ff15455040079750ef11f1d1f34da5c0f38b5c6ed71729ca64c777a33be22f76391b
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 2851613c91a2..92c9b8f77b03 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index d35f6b32b749..ec24e1300487 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,13 +1,8 @@
 AUX ebuildtester.bash-completion 501 BLAKE2B 55a6ddf54f05c2958fad5d3abc6ea1cf65de1320e5cb6aff14eac2755b1fafaff1df6ea5e813135d66f96329c806a3a3db326f3ed988c09973f20297b6dbeacf SHA512 a5fd613548258585fd6ff9905f9fd4f87517d6821f4e5da8443f1f83a666ddcb40d0e09b305505894677c3f9feb1826e8f2e0ddb8af238000e3462d0da236530
-DIST ebuildtester-0.1.10.tar.gz 12912 BLAKE2B 8d1c28c14dbae7d67b718fd957e6d7c1e1d1c996f77d4ffaf8feb505424c533996858bd7051331111d955d772106c3924f81cc1c2490ff9ac7068d10d838d9fa SHA512 f238fac69415e3a7e0a9ca684aa16ab3a3df5da71daed49a4d6d57b76a696af9089079b995da667d1307b1d4646e7291b8e86777f0486af3b51a8be435b8fe16
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
 DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
-DIST ebuildtester-0.1.6.tar.gz 11350 BLAKE2B 2dbc73a080cb0e6334e1e852f67dbf04e646030714f706e2ac355aac30679bab4e8420d31072d6c6de85a6dda5c2d4d412643f15cc2692f19b1715b22350c259 SHA512 68c877d9eb5dcd0ec21781e92225b3e360ef4fce8aca18b166f1589ba57eaf26e8d9af859e325e1c7c0f80640389a6da137e1fe5920b9be4aa9d35e215d7b80d
-DIST ebuildtester-0.1.7.tar.gz 12257 BLAKE2B cfa936bed77cb9a1e7be55055d1feacbd29d10167a7a4987258d197621ee48697335bdc67e1006ea2b6524397a2ad107677aaa70d1fdf8768ec024959ac9aa08 SHA512 53bbe3c6cd502c4678cea62d3743ff61ed055d5143a5074c9ac6b136aa05692bdd082467c309ccffb63ad1ba25d88ebcaa1562333ccbd73f4191233c22ca6261
-EBUILD ebuildtester-0.1.10.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
+DIST ebuildtester-0.1.14.tar.gz 14601 BLAKE2B ccd2b921524dfb2d6bd1de862292e4f918d14acc806838018f2571a691be5f8226c5666a53e367ca687b3153ac8f568e13b3112a514afccb24c182c96535be81 SHA512 e01a614b00df8e1e5bc5a25e61cb2154c4f39caf2b42b2ba3c8d69341a3f105fa80988f6afff305a96a91d277b6132f00426cac290893d16d2ca2f37f4573011
 EBUILD ebuildtester-0.1.12.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
 EBUILD ebuildtester-0.1.13.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
-EBUILD ebuildtester-0.1.6-r1.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
-EBUILD ebuildtester-0.1.6.ebuild 508 BLAKE2B e079d1f3db025e13346638417bf27f4f4afa870d70bac21667a918af9320038db9d32369da2b55fbef4c849dfccb172e18bd59aa7797107fe564038dc75b621b SHA512 b7afffaef484458f18db0fad6016a838b6ad0653492e3f9daa22c4d0213eeeb73c7a5bf884ed3373326f3564ae02bf619258ea5b101ef58b161198a84b026ecd
-EBUILD ebuildtester-0.1.7.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
+EBUILD ebuildtester-0.1.14.ebuild 673 BLAKE2B fb2d202baeb5734b3e2db1667edff0347f227f6e33cad57912cbc83e1e3830273eb9b96931db4e70df0127d39f906c64f10a73d14f230efc2d2b30b4aebca800 SHA512 907575a642cd22324132ae0a13ba5bf6de80a44d4189d5a2d1c6ee2b24963baae814efeb288f7370ce736bfcc208bd374001e5d1fca262021dde73c09283d4c4
 MISC metadata.xml 222 BLAKE2B aa232ff5c60f78800795caafa7e9ad7cf285afeca45a8d7d5d95808dbadbdd6dd1e7ca04ef38eebde2b199302691fe8cb0f1428150be4b29a8660a4f30f75709 SHA512 7dd37880388ed41ddfd8eddc790e4e800039bc34fcf03baf6d77865f081b3a8cf425060ec9a77182479fec918b7d04ceead69eae2b357f0fe7481be42adfe1c0
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.14.ebuild
index 3f9b13bcc09d..2cb7371a4528 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.10.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.14.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/ebuildtester/ebuildtester-0.1.6-r1.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.6-r1.ebuild
deleted file mode 100644
index ed8da344648e..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,31 +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_{3,4,5,6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild
deleted file mode 100644
index 0eec6d900f30..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild
+++ /dev/null
@@ -1,25 +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_{3,4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.7.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.7.ebuild
deleted file mode 100644
index ed8da344648e..000000000000
--- a/dev-python/ebuildtester/ebuildtester-0.1.7.ebuild
+++ /dev/null
@@ -1,31 +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_{3,4,5,6} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="http://ebuildtester.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	app-emulation/docker
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index c29788d7977c..75a38899d559 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123fd5fea313b377edc118809c4109737ec6f6a97fb536f4aad193a4fd3154401d40f26fe05a336ab730e33e SHA512 f21d4d196404455135a1a2255c889ffa26160ea1e9b9d16c914ea82614831816acb6d27c86aac68cdaafa8b1d5fefe065b5f49ce45acaae4a035cd7f08a97594
-EBUILD ecdsa-0.13.ebuild 620 BLAKE2B 102aab718680fc16ccb3361de579f2dc00635736a7cb78aeb07a30a3e6efdc18f80fcd65d043bc92c26c4fbf8a88ef59da2b361c37c0d31966af72ae848aee47 SHA512 10a1076717a4f3c8e8b2432c77679d468efcb6b78d77bccba296daa414967c9ec742a90ab3ea1d8215d9984b564df3e41103f36d1a056d3d033a5cdf10f8455f
+EBUILD ecdsa-0.13.ebuild 619 BLAKE2B 46c6df0250fe6062601df8e4488717cd6dd4a6f092d5be451e96da6d75ffc43a284cb1d73b95fdf6d5278ac49257cea476dd74a72b298061aea5f65682418b04 SHA512 3aa23d0bdc3b9f8a450740b856fb35075bc88f5e62b9865ef209d14e1b5f8f8cbe3262bf3142dd2937b540c3538052333ff7008cb52d53e919ff2901dad1dd5d
 MISC metadata.xml 638 BLAKE2B 70c66edf039ec739f21145846f74e2306ce879551a2ae39a9321b53a6f5a636235006146c2049dae41ecf3b77dad887f88f45cbf67ead493288570b4b79c6d2b SHA512 b08361b7b3fca4f1623aa71fe1090e3a8890f7b475ae2edfb5f0d7d2075be226e9826ad54b90756060be1d58aaa03a942d39834bf29c09338359b402db5ea7b8
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
index 231b94165cd8..3f06e8c1e58c 100644
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.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=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index fc1ec1b65fbf..a7e33e747e42 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,13 +1,7 @@
-DIST elasticsearch-5.5.1.tar.gz 33476827 BLAKE2B 4f37f13fcd0a236c5da5b74c4eec5ac9ce40234059643bed69b56e93a9d5b9758ebaf0f6d50155b7338c0c203cdd7296816d6c7bc5cb0ee5455e406e586c4bf8 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd
 DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
-DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
-DIST elasticsearch-curator-5.1.2.tar.gz 290616 BLAKE2B 57c02ddaf188b8dd08286e47d4eaf4e0af05d65d89139f77f5d71274c394defe491393a7043bb426fa4b260c199e92221c1e57b6d24922898e5e3b8e9e2de58b SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d
 DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
-DIST elasticsearch-curator-5.5.1.tar.gz 301351 BLAKE2B 1dfcf53995c203a7201e421bc9f01a840597d8c1099ae434be52ff27e47e30f509bf1c5a42d507b549f5fe8ce45cbe74614ea76c338b0ae9de1d51877c8b32fe SHA512 a0ccb35fe93cefb927020add9629d5879cb64ee41a25130150ee8c45867e210f611a5fca0a43357c6f68cbf0c3f0acf677a7f8d2b3b493f4c2815637640ed9f6
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
-DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
-EBUILD elasticsearch-curator-5.1.2.ebuild 3228 BLAKE2B 92a193fc2278315ff7cc67188600a48d3a2ecc98968bcf011b90debd62eb3b2fa728eccaf85d476bd503eaac10e48eeed89518b9db95f299bc980a50858c5954 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205
+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.1.ebuild 3358 BLAKE2B 7e6584f2ce49718446931ebc79f9552137d34a975101d70df3e7b6bbf849f6ce8c016464813422dae83e6839dd9ebbd0e93496e84a97bf9edbcce185c77e24fb SHA512 064a58f3ae727a9c30c356b77148856e8e42eb4059bf01a7e972747ed41041962127673a490783d10dda5644685352a35bb97ff7486278f25d680039c65d7ee4
-EBUILD elasticsearch-curator-5.5.4.ebuild 3396 BLAKE2B 0a5d235cbbb632cbe4bf3351e1cf0005fc45475069670e04ca74b842dabec2c26ba509942414841034996d84f1f57cbd87d498e3fb778823c926e1aa81f964d0 SHA512 ab4f09a87ce7f819bb8a305c8431bcce63a96035626a81e9ed91b8ab025ed8c9fcf765734aaf70d9b0c5c386383b0a64cde63690657fb7739122068641771e3e
+EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3670 BLAKE2B 6a4895ac1f709e3a700a489de3f9cfc73fa20a53013bdc9a5bbc8af4a91d6507702096d7f1bf148f3cf614564e3c597951b4eaa2bc98cbcbd31dd8bbd8e90214 SHA512 9d8cce68c940ebfb8d91dced1e408a0d22c2314171f80c9d03319e26abccc4a7d81b8e6428c78a046340bc049fabf16d10af0eeba1979df65376d4a5f77a4a64
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
deleted file mode 100644
index 91d448a28e3c..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
+++ /dev/null
@@ -1,120 +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} )
-
-MY_PN="curator"
-ES_VERSION="5.5.1"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
deleted file mode 100644
index ac00f389bed6..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.1.ebuild
+++ /dev/null
@@ -1,121 +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_PN="curator"
-ES_VERSION="6.2.4"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2018.01.18[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# allow to use newer dev-python/elasticsearch-py
-	sed -e 's/elasticsearch==5.5.2/elasticsearch>=5.4.0/g' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-#
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-r1.ebuild
index 765bcfef370c..2c9e4be06f93 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.5.4-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
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 MY_PN="curator"
-ES_VERSION="6.3.1"
+ES_VERSION="6.3.2"
 
 inherit distutils-r1
 
@@ -23,10 +23,16 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 IUSE="doc test"
 
+# require >=elasticsearch-py-6.1.0 because starting with version 5.5.2, the package
+# was renamed to elasticsearch5 so elasticsearch-curator cannot find it #667526
+#
+# require <click-7.0
+# https://github.com/elastic/curator/issues/1279
 RDEPEND="
-	>=dev-python/elasticsearch-py-5.5.2[${PYTHON_USEDEP}]
+	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
 	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/certifi-2018.04.16[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
new file mode 100644
index 000000000000..941320c8a7e4
--- /dev/null
+++ b/dev-python/eradicate/Manifest
@@ -0,0 +1,3 @@
+DIST eradicate-0.2.1.tar.gz 4357 BLAKE2B 8dd1854cd5a93940365048c1adcd8d05ac25cb511a14a278c083be018770088ad5bb888195ad474776026eef6c41405b515d5661244998286e8b9c29c01ea883 SHA512 726db51e1d5ecc89a256e2c28835c20e60f4f42cef55193ec8cd3323c06f00e7c1bc270517baebcd69a145bc189f392c96d60b4582f48aef10ece05582942167
+EBUILD eradicate-0.2.1.ebuild 403 BLAKE2B 3d61e2438734cb7f434cc541c3230671ca1bfcf97f823b410019b068d6666f0fa06941af5e8c1eea90215a4ee4a8b447a646294dc8072ff2813325501668dd79 SHA512 6f07c7fd6a63886131d2f9e49e9f27db018592f9bfecb10ebb91edd4a064d23046945e65fec8f423c5c3ee7870195a5ba1867ead2d65e027f2d21763c2cac197
+MISC metadata.xml 371 BLAKE2B 924c04cdb095b17bac52491203ea5545d8aa7450aa910e247a6cc48f6180646a7149b161e4dbeb10b2489bdd39ee056383079a7892c12c8a524219d750b0003f SHA512 edb9d679a9edbbde36b66a12764c0e625b33087c7ad5b89c719c364f08f359862eb8f091c69061ab54d38ff2b83d53f660c6a3e0db03bf6408978e145b75eed2
diff --git a/dev-python/eradicate/eradicate-0.2.1.ebuild b/dev-python/eradicate/eradicate-0.2.1.ebuild
new file mode 100644
index 000000000000..9fff1fea76b8
--- /dev/null
+++ b/dev-python/eradicate/eradicate-0.2.1.ebuild
@@ -0,0 +1,17 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Removes commented-out code from Python files"
+HOMEPAGE="https://github.com/myint/eradicate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/eradicate/metadata.xml b/dev-python/eradicate/metadata.xml
new file mode 100644
index 000000000000..61239fd850db
--- /dev/null
+++ b/dev-python/eradicate/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">eradicate</remote-id>
+		<remote-id type="github">myint/eradicate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 4668826e5a22..81e7f8577157 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 677 BLAKE2B 497c49707f669f0f4814f069679a9141a2ff63f64ed3d2af2143792cb2efd583a52349f61b2ca3331079d2ea90a2e738d0cde24b201720139570a68e981fc5de SHA512 e4b6de0bec677248c208573a9f8074794e89de9d38f373b85f28626d40c67475548d5d2c3488f2324b1043fe2f5ae5f38d3512659f2e4df035a103a4b3e718a9
+EBUILD et_xmlfile-1.0.1.ebuild 679 BLAKE2B a0d4c26f40dee783013b2d0540c92c33e176615414c8a80a1111ecbcc0bf9f8c712ab3e59a39ffb8ea94825b49ce5b3fd463dd99a3a1948f78a8050d2400e8f2 SHA512 215026d67d3dc653395a434845d059eda27f7d5fd803684f760bd9fa22ca6f4515386f9b25eb434704c6f8bd4307bc6359a4b81f4e6482b19c4d090ab51ca514
 MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 0e82eb214a0a..314e0b888701 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 0321a7858a89..92abcb1d05ed 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -2,8 +2,10 @@ DIST eventlet-0.18.4.tar.gz 288920 BLAKE2B 497b5e154de495049e477ab54660fa4e5af97
 DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff9899aa1a214118531e3e6fa7711899f278b2187e1e61409a58c05e9bba1a8a6392e1b31a811ef1f32dd7b929016 SHA512 4be70ba8cc3ac76d424aad66cd214e97249a42785319b992d048a77cd26f53a428f7959596d07da9a88c92ee103d73d4990733fc00bca57cc8fd242041365348
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
+DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
 EBUILD eventlet-0.18.4.ebuild 2037 BLAKE2B 15c627a2b2f5825ed8e2654a21ac67ba9a6283ded875679097f9003d33236533a7256cadd4c5a12dd56d22856c4f018a4cf61ecb95a9e195286c22f64b679808 SHA512 88c1b1ad3be87b7d7ecf5e02b83c7134f9689d71459e0057de369f26aa76f183875c27d59e66090febf0c241d3552fb6584f47278b882cde9cf2979baff6fc52
 EBUILD eventlet-0.20.0-r1.ebuild 2141 BLAKE2B ee5de43d1cfcde83d350dfdf935f78e1bb7a31ea1974850fc7a163e2ee87e69b0603e4e3dc2d5728379128c2a3891b1b5d806f641cd586266e2074384254a01e SHA512 c7dfbedd5d7087fb0b1a3d1f71ed0ba4e6312cf3457f790e3fc3ea09b5d9b9678773fc376d33f6ff6a7d344cac7f1f7a71cd064da39aadb7ea84c560500c8cd5
 EBUILD eventlet-0.20.1-r1.ebuild 2157 BLAKE2B 7908eedcbda5f7fe1efa550a30660d987db09e421d426d10c16bc3e5b6fcf53bd60c9feb32250a15ed90d504898902d150faf363886649dec117b70fb4f72713 SHA512 c44f0f71befb99bcf73e43212f136a46efc36095c0935393baf31c8b306f2032c8ed52dc067ee268af0ea05069eddfb6bbb2f7a72d38a91f4525bcd385dae8fe
 EBUILD eventlet-0.21.0-r1.ebuild 2159 BLAKE2B a70dfa0c5215ba3213ec29134695f9f7b0599c9d22515fc96e828ab653b3421fce63b622df264a70eb8a1eb065f618febac12ff9022150827f2b2dd64d08bdde SHA512 c5ba76b113ba10d526b8d1a83c90c3557cd762b914c5bac70063821dd86465dd28cf4618892b68c4579a1d865faeea87716a631eef41e7eba73eed3682bd4aa7
+EBUILD eventlet-0.24.1.ebuild 2296 BLAKE2B 2900b85a763e8147816c4d596d8613ba608249002b74065de1a8623c9de976820f317e550a395e4361f6f82a4938c194ed6e8663d265666a78893c02f094f3e1 SHA512 2ed8d27d45cc2abe563a4e9b3eb08f4cbdaad9d7d3e4ea0765c213d22240438d6a44ffabf65cabf1ab98b7b017aab08760dbc048ec768ed14c023e618422fc5c
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
new file mode 100644
index 000000000000..1480db301ebe
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.24.1.ebuild
@@ -0,0 +1,71 @@
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flake8-import-order/Manifest b/dev-python/flake8-import-order/Manifest
new file mode 100644
index 000000000000..0264f90e4cfe
--- /dev/null
+++ b/dev-python/flake8-import-order/Manifest
@@ -0,0 +1,3 @@
+DIST flake8-import-order-0.18.tar.gz 18507 BLAKE2B 01d9ea712dd5cc4177aec2c1ea2c2dfa72266edfa6b9143657076edab02548058a5bb4642a9a9b7c3dcad36cd76491114cc36a128d57076d09e4cd9e0f1568fe SHA512 8a897d42c81e99d9373fdf03e975b65309700fddf7c38294fe65562ce788e788c9d6c2ec8dd2c8d24e65b4360b3b3577a7a66eb279a5952f8b9d212b06047395
+EBUILD flake8-import-order-0.18.ebuild 862 BLAKE2B 7da4f16ca60c4f002950c53596f98926f9625959d2bdc75e4fa7a6e14532ed461a8f95b1ccee9976d7d26647318296321e69a5361cb61797eac245feea5286e6 SHA512 9bdcf58a14c1fc5e47b811fadfa4bd8115ea8b8482babb3f565dbd450c1a7973d142d12974bc8d36b540741a585cdbc0d4b26c4595f722aff46f16715a12f50c
+MISC metadata.xml 391 BLAKE2B d16fa34c609e11492136a3f76ae408540ae909313b3afafed9a9f806b7addba6e8e5a00453d6dac9a32b6c93c3772ca7a475fa8b5727f2269eba78c32929fa86 SHA512 c485906927b34ab4e97c9361ea9f0a013f5e64ae9888074972a7db50bc3d3d7a592564217e7ba01894fc252690ab05c3029f0ce64fcbc73683f7f4a7ae541e7f
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
new file mode 100644
index 000000000000..d06f09a5e6e1
--- /dev/null
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+DESCRIPTION="Flake8 plugin that checks import order against various Python Style Guides"
+HOMEPAGE="https://github.com/PyCQA/flake8-import-order"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flake8-import-order/metadata.xml b/dev-python/flake8-import-order/metadata.xml
new file mode 100644
index 000000000000..2bcccd127d53
--- /dev/null
+++ b/dev-python/flake8-import-order/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flake8-import-order</remote-id>
+		<remote-id type="github">PyCQA/flake8-import-order</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 3b4217a0f301..346cf4284695 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,4 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
 EBUILD flask-wtf-0.14.2-r1.ebuild 1362 BLAKE2B b5a5723a99950cfbc263776f5c5edc106755f5bc73a681176c8f83465911950de1ccf8f50b28bb30f0750bb3f7da4a30590860a638a96276925923a2e695290d SHA512 308f86f9d237a6fc0ba97b18baa9f9437ba5441660c022801e5b0c4cdc27dd026503b1c20862a3350a789de32836b38c46168d0b522e556d733a06ebdc305a58
-EBUILD flask-wtf-0.14.2.ebuild 1375 BLAKE2B cd7c15f2f84bcd4956aca938b5832243006d832aac5a02723c56655669c66ea3d20212a37c8fb92fbed08530f2fbf3bfa82be7c54c3d05edabc960a070e0eaa4 SHA512 e1c6afcdc1218114d96e0a4da16a93a028cf6f67f551496a78a0a346484bda5d1da9aa33fe78007e0a622afd376bb86f03147133343a99174fef2b91f379c44b
 MISC metadata.xml 628 BLAKE2B ff9c34258d4f106beb1089406a7be3b776e9b60f72fe2885d7141a88096250334bc26c43881853ca5019f3a0b24f306315ac36f303efa28e2921698d8d5484d9 SHA512 cc8c127cf6483396ba9a849683ecbc34527a9d51c8464b8ba523f015244a5a4efe1052691150f8888e4577dee538a1280afab28901be367f8856405bf380aea7
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
deleted file mode 100644
index 102f1593796b..000000000000
--- a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
+++ /dev/null
@@ -1,54 +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-WTF"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-1.0.5[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/flask-testing[${PYTHON_USEDEP}]
-		dev-python/flask-uploads[${PYTHON_USEDEP}]
-		dev-python/speaklater[${PYTHON_USEDEP}]
-		dev-python/flask-babel[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/werkzeug[${PYTHON_USEDEP}]' python2_7 )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# tries to access things over the network
-	rm tests/test_recaptcha.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/foolscap/Manifest b/dev-python/foolscap/Manifest
index 3dce79d33a52..5792816b211d 100644
--- a/dev-python/foolscap/Manifest
+++ b/dev-python/foolscap/Manifest
@@ -1,5 +1,7 @@
 DIST foolscap-0.11.0.tar.gz 491916 BLAKE2B bf36442b4274943c00df244c2880dbf8f16b67288a6b8391c8f3e8547ab907ff6de3e1dd92e7173c5801349d1f04f3789ef1f95b5baa32dadc3c56d3dd5b5d0e SHA512 577cd15e7f9207a9675999590cb1189edbdd77a2daee5cab80d66d40b1343bcb338a064eedf372ca7f8a102ed1cef0770923d6dea27dd6c3b37c0717cdc912e8
+DIST foolscap-0.13.1.tar.gz 524167 BLAKE2B 4d68b0a969dc90fdabadc38ceb7a912f7e0c25f2c1206d4613d3bc314a907832de02656c32f32bd2361e519476e1178a80c2d4ade7fc1f17caeb6ab7b4b72dfc SHA512 aa77fc22d6c1c32e1361f0ccc42902f25cf18ac917f81428d32f1170b75ecb4fe73f639e8bb641822775326ec920f14308ad7f4c5c01cd8051305fccde9c5e9e
 DIST foolscap-0.7.0.tar.gz 478999 BLAKE2B fbe3979efe8533a7727703af79aa3074f5ff54e4cd42cee4e981d8b2b73c445272792472236a52dc9fa69e9a25bd8cd30972d1fd2f37127db857ce5d5d3e7f6d SHA512 b2eb5415376d4e8e4ee3fd9ecef80a02d195d6b44059e5292c2daa7dcfdea9deafd8678ff89391128244a8d41fb6a69a92f9e4f07cc599f7358783dc8cb70f15
 EBUILD foolscap-0.11.0.ebuild 1268 BLAKE2B 17697a21cb0a1914a37105fb74358777adb430301b08be1a64aea6e3386acc2c70146ce092604b8e2fe9f5f1f81ccf575b6b41891d4aa84c7cafe4648dc32801 SHA512 8f61c6d8e2f9d8dfb5992a639f2e1ffa4441686be755dd603979887b09d335578432c5aa589d5ab07019082d141be2c29fe688ca55f19bc226c1c7b380742620
+EBUILD foolscap-0.13.1.ebuild 1280 BLAKE2B baa2aebad2976eb72c1b172cfabfe836683d2b26ec5026075decf303fad0ac4d8aed978a5f1661464477e6795c93b22c6b855718717564d92d39ed0c9d727d11 SHA512 1103feefe4b6da74d3b7dbb5fdd2bf150e7bb80b73a6212476f50dca69b295e14c274de85ae82eac7160a530a20830331146d4d9a230673a84543af4d14efc1e
 EBUILD foolscap-0.7.0.ebuild 910 BLAKE2B eda252d8f8aef4648d06e3c281fbae305669142dbaf1120482c97899b003721d37545e104c3c0b0c4e52e2da476b8e61fbb91e6609c555202144afa53d69cef8 SHA512 3c181ec3d826f9e1f8c843266e5513341530e4c62533f56107d600da7da08030747c9c1710913b2d66c0fe1441e2e2b418259108ec9d360f1301428d38c2501d
 MISC metadata.xml 1272 BLAKE2B 2e8117819b9d14b123baeb54170b7e166c591af67d1d53911add7cf9cf1d7f5a1e23b00a4f32792d3109750a474c97341ae4d57db400c4884e2c212bfaea1547 SHA512 5509a54a69ca4d5c6898cdf125fc62d974b494dcce9117e9c66fc2e4e17b7f0d07e423739c9ea8b81cd2b3f16012400df9f764a5e2a4ab939edb2f8a3428ced0
diff --git a/dev-python/foolscap/foolscap-0.13.1.ebuild b/dev-python/foolscap/foolscap-0.13.1.ebuild
new file mode 100644
index 000000000000..39dfee6a6758
--- /dev/null
+++ b/dev-python/foolscap/foolscap-0.13.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="RPC protocol for Twisted"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc +ssl test"
+
+# Many tests still failing (#657604), others rely on network
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/twisted-16[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )
+"
+#dev-python/txtorcon[${PYTHON_USEDEP}] will be needed when tests work
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_compile_all() {
+	local i;
+	if use doc; then
+		pushd doc > /dev/null
+		mkdir build || die
+		for i in ./*.rst
+		do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null
+	fi
+}
+
+python_test() {
+	trial ${PN} || die "Tests fail for ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 9f627f387ab2..9376b6689d50 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,6 +1,6 @@
 AUX freezegun-0.3.10-py37.patch 2157 BLAKE2B 9d7815473f512a36431872664aae95d9aba815380ec08ed6bd54d764a3e65347c9214fbc7ede39b94964105f8fca2a3127e1eddb9b4385d30788b3bceb2f975d SHA512 1664ce2e1947a6b9b37beb3191ab83f3e7e257f500aa512c0d0d085af34b150fb964b18875faba976f0d094b80681e778a7b06b5251eaa1e811cfb2eaf9a2fb3
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
-EBUILD freezegun-0.3.10.ebuild 957 BLAKE2B bec9ab1b916ca8d8bd2cf9af1a698cdac8a473fbd9bafc98ba1c99c89a60c6abbc33438ed6cd27920479c1d66f9f8e543fc658747811e8626207994a00c8a996 SHA512 0de365fcdf602cea427ad229b4093d60bcc6ed7d0827664c152bb7845012773510bb24f829aa11d5b3a9fb802b71f0a51a909774796b7f395ba84440a5aa56f9
+EBUILD freezegun-0.3.10.ebuild 953 BLAKE2B 2a6740e075508c29348f0d84ccd20d7c220d1c9b04b64b205a932ec147ce9d8d6009d4491724a36ccfdeda216c058c15cf2614ee22778bc4387c8235de8e9793 SHA512 cd92bc266b8bccc446095dcbd02ea5b8ac8a177f691d0390ceb238ac218f73693396cba3c151eb6c0472ca56c9d886ab9573bce111234cdb81ca520976143492
 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index c25ac0361722..2e8762982bee 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.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
@@ -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 ~m68k ~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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index b612b05e4dea..c9760593ba87 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-python-0.2.1.tar.gz 57833 BLAKE2B 99da322bfbfec193d2e4dfacedfd4e08a885152d1f1ceac19f49288be642c722d7776208dfdef5019b28a03cc00432e898744345041a7d615582c34668fb47a6 SHA512 f89c738352ca23e92b5c0222dde0a13bbee4d86432e9c339080203ed5bf4f885c42a0a3a252ed485f26b569d87e68dc0d78c55d8f7b2f3ce0cbac8afb251bdaa
-EBUILD fuse-python-0.2.1-r1.ebuild 424 BLAKE2B 2dd105c04b2cf555d9002ffe2f9c708198247b21518028ad177d35b82772f8299e6112c8e074ff7f471889fec5f598594116ecd27948d1b4efcf3c6d1044c2c0 SHA512 ff9f02a55327537d0a99b7d874bc6a4118d7d66c9a9094a6b2b407f7a63ec8a2bbd37bae76e83a3e41d250692d6eb06ea6f9805b494a5a3e3957de5432901855
+EBUILD fuse-python-0.2.1-r1.ebuild 406 BLAKE2B 1fcda89353995a57c036f1917f7b86bc416a882ea5ac1ef3eefa7d68c24e943371c155971fde7decf6c417044252febce7a0f774a7a8986853f723d04e843238 SHA512 2ab2f2dd29b167ff026baaa698038e481d2de2266feb87ef9e2c71bc472bcefc5b397bad6a3154d74e6a8774bf855ca3b7a0ff94f72509b38e0112ee8180ed44
 MISC metadata.xml 241 BLAKE2B cacf8034dd7b4cfc624467a8d32b4a0f0b97ebf3ba84ee4572d491ab3da93098f7ae1c765efed3a6c2372cc859098ebf0853753c35d7b23d9c92bcb04e426f11 SHA512 fae6c0b9c2f7b479a2ae029b5e79207756486f5c59a9fc5a2094b239464270eb7a18928a34c11237811a3d1537cd35839778da6704ee6ea3fd806c76e3e6bb6a
diff --git a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
index 627c96fe3666..f20fac61e99d 100644
--- a/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
+++ b/dev-python/fuse-python/fuse-python-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 KEYWORDS="amd64 x86"
 DESCRIPTION="Python FUSE bindings"
-HOMEPAGE="http://fuse.sourceforge.net/wiki/index.php/FusePython"
+HOMEPAGE="https://github.com/libfuse/python-fuse"
 
 SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
 LICENSE="GPL-2"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 2acc5a6f7ffb..c10239d463ec 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -4,6 +4,6 @@ AUX future-0.16.0-fix-tests-py37.patch 1700 BLAKE2B 175dd229c31768555aef3ed3156c
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
-EBUILD future-0.16.0-r1.ebuild 1267 BLAKE2B 4371b204cbe93400f3041443fc411df89dd2cf16239a45c334c1dfa14f48677b53ed5e7854c4bdbf5393e3c3dbe224230d779adef8d3a12685864e9295dbc427 SHA512 d70b38403832a533be2a451225514ccb3af4fb0fc8c795a8fa3f34af65414c693ed1f6841c33308f783e40b1cc15539a92fbddba80dd4ab1e63ec182a1af1d0a
+EBUILD future-0.16.0-r1.ebuild 1274 BLAKE2B c22f1d227fafbf3662c15ec331b1eac6e0fefd559ba4593226ac8316e7388f9f2a6227bca8c9307f2fa5063dedfa9d2ece2d299d83141dc79adbbf292e7ff1d9 SHA512 d03dc0e49c637ad09a7c0d663161d15296634ff59473bed4e5b0de3171e94b2119e1b41565ccc2eb5d4c4abd44dcbf41916bdfdaff7af5db922c0afdadc1d557
 EBUILD future-0.16.0.ebuild 614 BLAKE2B 40f614b47a93320680e6d44e8921cc9e615addd818662b9a03ed87ee8affec386445365c8e9253afe3b7881d451d3badbf1a9ba6ec86455a47beb3fd982b723f SHA512 2f527a66bc8efdc8d5ad0e191af6c8012a96bec239335628ee60ea7479d639f30d3b5de7f5096ef20002f4995becc37d19e7c7895cf41f1f241fd0658ec786b5
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0-r1.ebuild b/dev-python/future/future-0.16.0-r1.ebuild
index 03ae068da381..4eb6715d68c2 100644
--- a/dev-python/future/future-0.16.0-r1.ebuild
+++ b/dev-python/future/future-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 009896c8f310..b75d2d8bd0d2 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 745 BLAKE2B 18fffd4db162b81254756763702639aab42eeceea375c67d43516e4582a64b0baad3296b9b707338566d7baa2bbf2b351ec5ad2bfe63361ec9449499daaa8eb9 SHA512 49612d372e3c1f07eed6afd6ecf5e435c32f4c4f15f07c7be6cd3b0ae9b205594f703e9103f1e1ce89516150e81e1595edbc68a2f1d04dcbe0b3e4353588b7c8
+EBUILD genty-1.3.2.ebuild 741 BLAKE2B 622eceb5aced65fdc498b5ee76188c3550cc1c8a28ae93c04801cde8b09bd4d6f41bebf9238051113fe1f74d268ee7dc99ef819d1ca504221af234e47c033c18 SHA512 92ca817072aa94ee96619ea35e6aae37e10216067a9e6f4937e42c8bb921be47acf62e23222160438547a070ff667a0f6f35005571e1689787a5a06df5123089
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 4981c4de3fab..9c1fa1621fd2 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.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=5
@@ -13,7 +13,7 @@ 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 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 8081c47b29cb..78cb0eeb6080 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -2,8 +2,10 @@ DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047
 DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
 DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
+DIST gevent-1.3.7.tar.gz 4614437 BLAKE2B 43d50c36fba2bedf41a7b33d38180f096b18846146953fa68325155f4a3cb6edb7352b9bb4cff5c7eca7a06ac25dc5b3e82a04545704fd0d6f43e9839a8749a1 SHA512 6dba487a9527eb352dc6a5f57120bf7973da655b3a331cad6637271b626c6e9e5439b20ee8abd9035ecb36e5259c99c69dea5ecdb8fa7ad0dbe28876c4d746d8
 EBUILD gevent-1.0.1.ebuild 1461 BLAKE2B 2d74fcc19654b02d952b6b0b4614633aedc38ad294f359004c59b8ea58e64d869e0eaed913f477147fd42bdb927ec03e178ce6e535cc832ce0afbe8b59bea17e SHA512 e8d65da8ede2d244ab2e9d67c626b84f83b0d1264ef25f63842a7787844411c188019426bd83b412de5fa8c6ce9948efabf29fe128c6e7c10f838d6a8112a76a
 EBUILD gevent-1.2.1.ebuild 1845 BLAKE2B c8e7b334fbdf922c12d22be2817fe0abbe64c09df6f7a73113f2211b54ab470a556e69c5bc80f02cb71e62cff3ccc0afab86d8dc2eb1fd96ad90633cec2731c1 SHA512 3b11b6d47ddd96df5f79a262e8ba03908986b324de4aedf10f920a5b87765e4e694aaa6d1bda8ec5747df7ddb6aa976d7a003cb81c04d3a5e16f7f0a2c22288b
 EBUILD gevent-1.2.2.ebuild 1856 BLAKE2B e88950d1a0efff78649584c1f745a9212c3e428af471a7522c771ed2c784ef9700adbaeaa51dd54b43d4ebc83497ae1267538f338abed270c49260fdc947a25b SHA512 f9b23e2db58298a567f81eee28a0388814f5deec19ffcec88bb1c47618137997d20bb287abe6949cef157f8f062010f65b90b35ffb8736d2e02b2bd725a8f46b
 EBUILD gevent-1.3.5.ebuild 1791 BLAKE2B 8cdca98a2012faf3dab69f6933e24b575d6028a833ff90e02837fb63e23fde97d5af58939abad4fe3e3239d550d9e7a057529f308e45d4df007ab47a5a864126 SHA512 78545274f97b632aa9addf4782c098e2d85085100c2aeffd2b7aae0ca79bb7a6bfd921e636df8d8c9d5ea52952310526ad32d776960e8547248a7cd53c1381e7
+EBUILD gevent-1.3.7.ebuild 1788 BLAKE2B 70bf9da70305330e0a95128fa53b3f0e6e41d10e46d42c84cde3d13941b636af776d5bd67ffe9d1dafcdef4ddcb3597b244b4545e35cab26a973fb0bbba9fec8 SHA512 28312c2c99a33c2f0d014d8eb37dc5627507ede40f861e74935f07e0cf7515f245a5b83e1386b57c23a1c677dc7d0eed662706598947681bf6f2e5b4b5194557
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.3.7.ebuild b/dev-python/gevent/gevent-1.3.7.ebuild
new file mode 100644
index 000000000000..8c3be0fa7244
--- /dev/null
+++ b/dev-python/gevent/gevent-1.3.7.ebuild
@@ -0,0 +1,72 @@
+# 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 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.14
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index e24979e5e62a..bc00e1413c9e 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,5 +1,7 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
+DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1073 BLAKE2B 6e0dd038d4c0f28cb7edbf89a8f1f7a3cc5425adc7385e16b4ce181d125eb4897e51d4837df9c7561c0f71dac15c9e2de0a4c31f69eaa91c89be87d17b564b91 SHA512 a6c1b36aa1846f904cc4f9a9d1d9efd4af92f8d8699db38dfb91b576b944c10f8809e292507188b64a3bd50d9f5f27a2483464dd13942e0763a4d13e72d17fec
+EBUILD git-python-2.1.11.ebuild 891 BLAKE2B 3052bd8613842f2fbcb22ddd83992f096aa54d627d4a0d71e97779c355e967b52b4143d5f973f228359f91fc524e6fd6261c8ade182daba2ebfd6b722f5e0404 SHA512 faa49d40a5fcc9be3c814716b2227dc3f419d0ab5faa5b5c550d2f9bfa42f871e7ba17736bfe3b10c0b7728b5316b02ade56addbde89ba4d2286f7173c9b0bc3
 EBUILD git-python-2.1.7.ebuild 892 BLAKE2B 1dbe094db47261a1a8e6c841d4e7be6be55944a709c337ff6564b30f22b991987de2cbd813b3f9cfa5ce49a2bfe0e479be9c7f9e5af4ffc01fbccf45bd54a56c SHA512 e6d094f2729cbf83b1d03818ec2c059d760f6e2ee6e81462f90b8570b07069e7cfe539f35db2f5e92ba0790579e96227eda06133bc69431382863dd133d0d64f
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
new file mode 100644
index 000000000000..96f8566ba217
--- /dev/null
+++ b/dev-python/git-python/git-python-2.1.11.ebuild
@@ -0,0 +1,37 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests only work with the GitPython repo
+RESTRICT="test"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb2-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 31447391b948..1a83d54e14ac 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,7 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
+DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
 EBUILD greenlet-0.4.12.ebuild 1078 BLAKE2B 458d9db8a53c1ff0d076f4ec9b189ef0dbe73c2b2261c347200825df8a63ade022181b80590ece02fce1548f8aa9e24e282ff4dd412eaf319fe54a00c7528eb3 SHA512 94b4be233d2fbd8f88155165673e303ae92ccd1fb33fd9a0be98338dd39871183f1ea12b75ec2765a380fa9af6a34827bbc91745558ca76ac6497d750c96ec75
 EBUILD greenlet-0.4.13.ebuild 1086 BLAKE2B b83981cb8992091fee5df423f5434d5afdbd06ef0c1f8f9f329e2396807d30cc39acd804a5f427ea1c3e5acd0546953c36638fa86219c7e459bb69ac8d09eea4 SHA512 3dc08375923c4e114d6680e9ae9e86623508176c8ea2d349cce535f9f5a5f7b01dd86c5c047548ff5a329ecf77cbe8e5e4bba14c1f330dfdf50085ebba00dffa
+EBUILD greenlet-0.4.15.ebuild 1083 BLAKE2B a665d6bd1e0f18f0ba037c0187cf76e1261e8290e75d98e0aa5ef494560b5b59c39542e5d71b32b670eecd83349df16cea1eaba888f04a77686a92c3cc2d63c6 SHA512 05043a4f4205ccceebbf83ae4ac5bdd4cb89cea93057689f7430930ec5eca4fee62ad65e294e225a0a92243c4cf4374425a83a6071d8a68333422a3d42eb03e9
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
new file mode 100644
index 000000000000..31c49398afe7
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index e31e53e638dc..0b9595bf5237 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,8 @@
+AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba0745d628c08afae85fda67113555f61babd83cae5dee7a79b224d7aa5ead73f29a91441f0de27086b9a4f74a3b53dda05be1 SHA512 d25646d35b94dc19b8c9c7a97601a7666ca6140b6a22a4f6b0bf232a7bd3a75c533f53feb9758cc8d5c9189163a0d90149f57c08dd945b763c0920aa361f2bbc
 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
-EBUILD hypothesis-3.59.1.ebuild 1165 BLAKE2B 6a6f93aba2e1e8e21aaba137c7ce3552f507df5848acfdee1f04faceaf16c8e1bbef2ebfd5eb89931b9ffc2b3ed01371a0789c8a1664c549e4c94b8e0cc95356 SHA512 c55850a992b3088c2b7639bfff783e356b359463df972e8c9efc1670cb3d0c6eb838c885cc0e6b17b30fdde2ccf02e211fd423fd845c91d42f2b917e57b50c54
+DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
+EBUILD hypothesis-3.59.1.ebuild 1164 BLAKE2B 8c53e03eda9e4061ca0a29efb99729002c74f8ffbf3965562954e6b5e53de94a93089c4bd5ce82a5780dac8419082d54b700675d32402bec3698becb3b40dd37 SHA512 c8fdb48e750c664d97b6c64601bb8ae8a9fc091747c8433747e2fdecd4d9b5cc220c700ebb4027b1dbe25718f3f7109a4b38e8576595d0e69cd2bedbfeaa0c04
 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/files/hypothesis-3.74.3-no-werror.patch b/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
new file mode 100644
index 000000000000..1e09133c6fb3
--- /dev/null
+++ b/dev-python/hypothesis/files/hypothesis-3.74.3-no-werror.patch
@@ -0,0 +1,12 @@
+--- hypothesis-python/tests/common/setup.py	2018-10-09 15:41:19.106029968 +0200
++++ hypothesis-python/tests/common/setup.py	2018-10-09 15:42:09.464413825 +0200
+@@ -33,6 +33,9 @@
+     filterwarnings('ignore', category=ImportWarning)
+     filterwarnings('ignore', category=FutureWarning, module='pandas._version')
+ 
++    # Fixed in recent versions but allowed by pytest=3.0.0; see #1630
++    filterwarnings('ignore', category=DeprecationWarning, module='pluggy')
++
+     # See https://github.com/numpy/numpy/pull/432
+     filterwarnings('ignore', message='numpy.dtype size changed')
+     filterwarnings('ignore', message='numpy.ufunc size changed')
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index d6a43fd2932a..6b2b3a54b38b 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/hypothesis/hypothesis-3.74.3.ebuild b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
new file mode 100644
index 000000000000..e213b96fb5f9
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.74.3.ebuild
@@ -0,0 +1,51 @@
+# 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{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+# See https://github.com/HypothesisWorks/hypothesis/issues/1630
+PATCHES=(  ${FILESDIR}/${P}-no-werror.patch )
+
+python_test() {
+	 pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
new file mode 100644
index 000000000000..907a6fdfadfe
--- /dev/null
+++ b/dev-python/indexed_gzip/Manifest
@@ -0,0 +1,3 @@
+DIST indexed_gzip-0.8.7.tar.gz 77640 BLAKE2B ff35693204a41df439b835f232b4e0ad5ceab19532a7f1f4a4aba5cfd810f447ea56c0f6cc0c5600f32317c5a4f4283a3dd5bc791dc9aec5742303728e76ecc2 SHA512 90872898b69269f42d28f61f7840879c1942060da923e8d5480c4f99feb160c1b03412378b1dda3cdf94f64434d81e4cdc524e19c268797f11444362149d0e18
+EBUILD indexed_gzip-0.8.7.ebuild 862 BLAKE2B 038ab1274ad7e5461ecde8b33f2c3f1998a28c22d1af40563475ce28c031b0fefee768b7feeb3a2f88c4f08b6188f2f690c91477043a5e35c980a3fe0c3e19fd SHA512 94928d70395816767b7e8a53f83e751ea8a8fb33864b0eba24db802d6281fc3ef609e22201087c24d2c43cc6a20e625c8f77163716530526a253fe33c2139372
+MISC metadata.xml 902 BLAKE2B 8d1c493782d05a3c3626279266a44b0d0954977dccbd9d0a87e2f1e744dd6b87c21a8d61d4967da6ec278d09b87c5939b7997ab1138346e63616aa65de6c9b4e SHA512 c6bc3e97af583690a86620ed44925827d3320bd295018c44c7dd057848c6c9833906ac35e99404032377b8f6584b2bce92deb1465dec9e0f7daa21f66c52120b
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
new file mode 100644
index 000000000000..3533fde36c98
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-0.8.7.ebuild
@@ -0,0 +1,40 @@
+# 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 virtualx
+
+DESCRIPTION="Fast random access of gzip files in Python"
+HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
+SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND=""
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cp conftest.py "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	pytest -vv --nelems 500000 --niters 250 || die
+}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
new file mode 100644
index 000000000000..11c36e8de929
--- /dev/null
+++ b/dev-python/indexed_gzip/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="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">
+		The indexed_gzip project is a Python extension which aims to provide a
+		drop-in replacement for the built-in Python gzip.GzipFile class,
+		the IndexedGzipFile. This package was written to allow fast random
+		access of compressed NIFTI image files (for which GZIP is the de-facto
+		compression standard), but will work with any GZIP file.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pauldmccarthy/indexed_gzip</remote-id>
+		<remote-id type="pypi">indexed-gzip"</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index eef53fc59f12..50f4fb2b995b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
-DIST jaraco.collections-1.5.tar.gz 10615 BLAKE2B 4331a1df4a1232817e5bde97ce22b019ecb50711c0f4dfd18d050233b820a51c420719ff2a0d013e60da4710a63ab34293ee15f091b86392ec0d5e36e8262880 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161
+DIST jaraco.collections-1.6.0.tar.gz 11991 BLAKE2B 8f8b3da18641d6348a28ef3792afabd504771f31f1de17ebb621aff493cbb7357e11d49d8b3f4ab4fc7b9a662986d10a90d20734cd802c6d34be1d169390aa96 SHA512 9bd472b51668129f12fabb90b86ed929e135a17217bc850d67d945a786d1952cf1f11b0cd8f5d4ae16b3b19ac35cf87e0584df622877185362e93ba3915dbe6b
 EBUILD jaraco-collections-1.5.3.ebuild 1426 BLAKE2B ad973ab473d0cc84679f9338fcc5f1a3d0f30a29232c67d1e68353213d8fee7ae4ddd0d5625108540f4b9cb4260e4b81a94e769765bf97917571d1969b0e39e6 SHA512 1a57784f212c32a82cc16f748ecbf35b92e2e0b04c348f5003787a5040ec509d4f7714d15811a40941be73f4a24111fef16955be7d05284b6cc078d89d6f262d
-EBUILD jaraco-collections-1.5.ebuild 1402 BLAKE2B ea6bb23d97ca077a13ef637cb68af51d165b8f8b3319fa4d35c279413793e1aa3104fbee394f35b464ff39db264e94d63966e6ef3eaff1d369f9d02baef52666 SHA512 a48e9c9a8918ce2734bf0d2ad37e9ef85353bb502a057e3f3ce63d97ef0e9871fd086c36219452788c9bbcb29e4e0c90aa4094c4cca11360bc645e81c7c30fdd
+EBUILD jaraco-collections-1.6.0.ebuild 1425 BLAKE2B 4637fc3a51a5284dba54125afb0742c76ac6bb34d84280a8461d6015c01ea5993b329aceb2d2ab6081112ea603a8e391ca5d0a7310d399e7272f2bbb7b384f01 SHA512 d3c0610357fa18d0be4c242fd761923e2b44a59f5c484c3e770d5960568b2500622cb2b55e2648c4d42e4f2d603999961950e76adf7144af63ca48cf9ef70df9
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
deleted file mode 100644
index 708280d2b630..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.ebuild
+++ /dev/null
@@ -1,58 +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} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	if use test && ! has_version "dev-python/jaraco-text"; then
-		die "Ensure dev-python/jaraco-text is installed or the" \
-			"test suite will fail"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
new file mode 100644
index 000000000000..e604a649977d
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# 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,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${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? (
+		${PDEPEND}
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${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}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 22dfe5fa5598..153676c4a977 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,5 +1,7 @@
 DIST jdcal-1.0.tar.gz 5677 BLAKE2B d45ed1955cc62fceb07dae87ef4c97714ebaa9e5462d647b7f09e87c1f607d04c488f13ba74272e0783ffab218513e87016e0bce2bcf6c00f2fbff0a291772ab SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408
 DIST jdcal-1.2.tar.gz 7059 BLAKE2B 6795e5511349490bda9df4e47566d3d65d9a69f654466d6c0090cae3b21e4be38090e2582b753f5eb04fbfc4ba33183a69b4e658ca3125f6105fe0b55b6d1d4c SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af
+DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
 EBUILD jdcal-1.0.ebuild 433 BLAKE2B e1ed961cbfbc837d95cb6bb4a2920b0db9045ae66801e3190d3cca708e3062553b0b23f94972601043f15a44eb6658f464b6a1ab2ee8ac6a7f3ded894eadc9f3 SHA512 cd2a1bbc9455f6c4ffb2f544539022c9127c3edf8dc27a5f806437ba4d31f9af72ca1a1ae32cb02f3df8ebe2b1f591164eccfbba93ddd5c8dcc39f4dd9c44e21
 EBUILD jdcal-1.2.ebuild 435 BLAKE2B 066df1a0e50fc5ecc0858ea65de0b222ce2e8df48b362ca3e4bc69ca8ed3c1796eb933a40a1ced9eaaf04b8d691deef8fa322355d305940ac0e6588a0afdda58 SHA512 71a34b4c910a8a38f10808ab4167882498dfae48ba5cf078c24efc2e65bcce26e8edb5c7cec00af421f1b42c71155059a6ded626b5c7e5b5aff550cba9eed765
+EBUILD jdcal-1.4.ebuild 611 BLAKE2B 6517e5058c7c3076e89909d04daf314418310c6f39fd87da3e308b3ac812836b4139adf8e4ec42898b8f40d7fb04a4dc4661cae2d255331eca2443ff577bf25c SHA512 9163d5572ef35fdaa3b00c2f0d9f99c6c50a765818b2cb72cc362ec4901594d20ec87e33327110f71dd781a9108b80b8750644f01e1eac3239a3ba57c85fcd5f
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
new file mode 100644
index 000000000000..67aa9a72b7d5
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.4.ebuild
@@ -0,0 +1,25 @@
+# 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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest -vv || die
+}
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
deleted file mode 100644
index 3ecf660f2f30..000000000000
--- a/dev-python/logilab-common/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX logilab-common-1.2.2-test-namespace-fix.patch 502 BLAKE2B 257f19769d7e2f6df1fa606a1f596d24f24c3f5be319944929d4e258ff8f7068edc977dddf4be2b58df6eedb22e0135d1bfc119340853a1f9352dfe9b8de6aed SHA512 c8a9898a6fa497c21edebe4b6890a87215622dfd1c4ccdd7b23ca7669131200cf82ae82bd17c7226ac79ff3fb4ae964b1bf1470eb79c5aec0018850eacd2760f
-DIST logilab-common-1.2.2.tar.gz 184817 BLAKE2B 0318b4144150303b483fe921e01af326b55b7a3b93a014506685fde0b4e094a88efaaa70f63623264ee34fdfa72703e31cb0c8e9f4a69e309cab50997acae7ac SHA512 9c2161e8644e50cb3d4418430ca95363363e532b286d39cbdb73a51274bee02e5e8d0632b7564049243f497df96102c90ab0aeff9c91e91f7275407a6cfc56e2
-DIST logilab-common-1.4.1.tar.gz 185150 BLAKE2B 4c77b0a136a0de708801971f85b55fdd598767737ed17bc83ad1b934bcea5db67534370c202bc4b874ac774494ec6295a2458a7ae39fae36a9d5b482bce65563 SHA512 e016aa8bd8641b4178aa1d1dd58c8c78bf6c3a80c35c9096d9761eeb49c9ee1ab5952839a1b7ecc404cd60b31078d3e997d73ad4f8d07d88badffe6c8748a059
-EBUILD logilab-common-1.2.2.ebuild 1195 BLAKE2B 1cf354ede8e340b349aa444b3eda7f796477a6940a89be8df4800c9452067a05f43ca93f1d8bb44cad402d60c747b69eb1fe107138e94d2e50914632be1df74a SHA512 cbf438ab6492feebfd8855a8ca83449ccf3777ae9158f27bf6d12e6c025225588dda111bf2f55b38cbc1af3361a281f67ee7821a2cad656692189cc7002be850
-EBUILD logilab-common-1.4.1.ebuild 1417 BLAKE2B df8268e7eec082e91c336630259adb687bf5b04bdf23bb6a7f234e6ba175e0a43bb248de42f02577d68c613a9053cb47d4fdd5de248c6cee40e7c0c8e8435d40 SHA512 685563a02a69cd5320d24620dfb362495388f81a593ee006f4e5e4e5a58ad55f1606b136670746fd01b754aa8ab6161dbaa3186b70c351ef4cc5164245253f8b
-MISC metadata.xml 317 BLAKE2B 88f2ad57938f816c897d8d8c26d26135c064ea7fadd6363cc916f6a047b3a0deb1e3fb9f1282d91198036f457998fca4ab43dafbd2c8c03a72d8ab601542c186 SHA512 4e3f634378fd3dcd721af5e038a2331fab376c3625cb8b9dce6a87921886602ff75d308fc9d7f887a65cda607e9e635fb59e86b1da0c7c11a75860229f90c3c9
diff --git a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch b/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
deleted file mode 100644
index 044fc67f0d3f..000000000000
--- a/dev-python/logilab-common/files/logilab-common-1.2.2-test-namespace-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/bin/pytest-local b/bin/pytest-local
-new file mode 100755
-index 0000000..a2b771b
---- /dev/null
-+++ b/bin/pytest-local
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env python
-+
-+import sys
-+try:
-+    # remove an already installed logilab-common module from
-+    # the list of namespaces to force the local module to be tested
-+    del sys.modules['logilab']
-+except KeyError:
-+    pass
-+
-+import warnings
-+warnings.simplefilter('default', DeprecationWarning)
-+
-+from logilab.common.pytest import run
-+run()
diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
deleted file mode 100644
index 8ba0caf8087d..000000000000
--- a/dev-python/logilab-common/logilab-common-1.2.2.ebuild
+++ /dev/null
@@ -1,43 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-test-namespace-fix.patch" )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/pytest.1
-}
-
-python_test() {
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	"${PYTHON}" bin/pytest-local || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/logilab-common/logilab-common-1.4.1.ebuild b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
deleted file mode 100644
index dd8fe62baecc..000000000000
--- a/dev-python/logilab-common/logilab-common-1.4.1.ebuild
+++ /dev/null
@@ -1,51 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	# https://www.logilab.org/ticket/149345
-	# Prevent timezone related failure.
-	export TZ=UTC
-
-	${EPYTHON} bin/logilab-pytest || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# this package is commonly used by all logilab.* in ::gentoo,
-	# so let's just keep the namespace here
-	python_moduleinto logilab
-	python_domodule logilab/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman doc/logilab-pytest.1
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/logilab-constraint/Manifest b/dev-python/logilab-constraint/Manifest
deleted file mode 100644
index 2657c3f11fb0..000000000000
--- a/dev-python/logilab-constraint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST logilab-constraint-0.5.0.tar.gz 48395 BLAKE2B d08759f5f329f1d155e449e16cb20896ebad9b5f1c946485dd5e66bd8e931608467511b2d2ecbbc8c1d165b3773c95630233b79d96945235ce7c22e7c863a48a SHA512 b1ccc6e7400eacb7c446c1904f5e2b0129104482e312929292c6ca7c9c18bf4e1fa0d0e78fce61527a97e00d85c4e2a5c1bb8cce7c18792cd5d2a295449e435c
-EBUILD logilab-constraint-0.5.0-r1.ebuild 885 BLAKE2B a68b2214857416c57c4cc8daffd6546647f3c4c8a7e5970b45dc4473a230898c2214bf99c9face4b82eb6f1465e0a7b54f2eec6b1d4667b1bacdde5a1370eb88 SHA512 bfd9f37cd733b2bad87c0c1d822098185c29e56af3f31ade0f2232dac5a26def8b4d1f457564351dd773370d6e4f64f46e2e13b123a10fc8d9b50d52ce394959
-EBUILD logilab-constraint-0.5.0-r2.ebuild 942 BLAKE2B 8050e0c8d363dd8a2e989173ab704892ba531701755cf80ad5def5cb2eedb8d197dd8584c59a59ad59673a776574e0ce7c91e436bd641544336a5b9c9aa70acf SHA512 ba48b583b96ad426df4c8a7f4f67c01ce9b6d99db1641093958f7b7e0cc9bcf1f0a5c328ce074d1fe340b51af6df47c480e9de08419d58a4ee3e64e4c5a1fdb5
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
deleted file mode 100644
index 500b9772df7f..000000000000
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
-HOMEPAGE="https://www.logilab.org/project/logilab-constraint"
-SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/logilab-common[${PYTHON_USEDEP}]"
-
-DOCS=( doc/CONTRIBUTORS )
-
-python_install() {
-	# Avoid collisions with dev-python/logilab-common.
-	distutils-r1_python_install
-	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	use doc && dohtml doc/documentation.html
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild b/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
deleted file mode 100644
index 45fdab0c6cfd..000000000000
--- a/dev-python/logilab-constraint/logilab-constraint-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A finite domain constraints solver written in 100% pure Python"
-HOMEPAGE="https://www.logilab.org/project/logilab-constraint"
-SRC_URI="ftp://ftp.logilab.org/pub/constraint/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/logilab-common-1.2.2-r1[${PYTHON_USEDEP}]"
-
-DOCS=( doc/CONTRIBUTORS )
-
-python_install() {
-	# Avoid collisions with dev-python/logilab-common.
-	distutils-r1_python_install
-	rm -f "${D}$(python_get_sitedir)/logilab/__init__.py" || die
-}
-
-python_install_all() {
-	use doc && dohtml doc/documentation.html
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/lxc-python2/Manifest b/dev-python/lxc-python2/Manifest
new file mode 100644
index 000000000000..a29605e781eb
--- /dev/null
+++ b/dev-python/lxc-python2/Manifest
@@ -0,0 +1,3 @@
+DIST lxc-python2-0.1.zip 15251 BLAKE2B e9a7ef693f2cab70a626a5fb7325d2bbdd8b56356d984eebccbdc26e61abf7e55cb87df3fbc717af38ba2278de2c6d2bc40ea950f88aff43c8859b2784e17a54 SHA512 e2374373dbf0567209f028df6c8dcf66b1f06be89934824c9663104e4fed9341f2b68d89011624f87de0e4e2702affaf1f7b17987bb179d1d945c2e04f8aa1bc
+EBUILD lxc-python2-0.1.ebuild 460 BLAKE2B aea88ece733d227d1282f28d2b98de15eda5a4094ae7a1a3cfa31306b8140a616911eae71da1c711a14329d6bf61084c1e6eb35dede847662ccb9de0dfb23a42 SHA512 63a7376d098e527543c83e656226b2229d7ef62bb39ff11139a0494f86b79c14481964a09f80e823ff45a2f10e6ba65ae671fe29d43e5231430e711a41209da1
+MISC metadata.xml 650 BLAKE2B dbeccf480a7490564add2ef993fa1e07ef8ecf61ea4991128e4125dd1a9a7ecac1f4b846a59065b382c7e526341c341901b5375526d5eaa2a88d216653e6425c SHA512 651a2eccf19cbec960bec4baf4b3b4425d896df55249882640068e3fb4fd005fa8a77a2a2cbf88c77542532b9161f9d1390a90fb61659b09971acbc86016bec3
diff --git a/dev-python/lxc-python2/lxc-python2-0.1.ebuild b/dev-python/lxc-python2/lxc-python2-0.1.ebuild
new file mode 100644
index 000000000000..9e09af92cbcc
--- /dev/null
+++ b/dev-python/lxc-python2/lxc-python2-0.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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+RDEPEND=">=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxc-python2/metadata.xml b/dev-python/lxc-python2/metadata.xml
new file mode 100644
index 000000000000..91254ea2063e
--- /dev/null
+++ b/dev-python/lxc-python2/metadata.xml
@@ -0,0 +1,21 @@
+<?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="project">
+    <email>virtualization@gentoo.org</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Python 2.7 binding for liblxc
+  </longdescription>
+  <upstream>
+    <remote-id type="github">lxc/python2-lxc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 518cdcd2b270..04abfe830241 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,6 +1,4 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
-DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d2bbaec24cf44b5910d4fc1a956723a8ed8fecaa428aea361a7ec8a3ff60b82e0d9468ac21d251c16ac8c2b52eafec6ab3 SHA512 0cceeedff6c584d2d7037ff91fbba0fe580fabfda810b9a9ed7c8d8495445339e3ff115d63d4429bcd3eff2b13b123e1bd5855ff1bc9dcd986b968a82c368591
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180222.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 EBUILD miniupnpc-2.0.20180503.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
deleted file mode 100644
index 1fc60e04a6a8..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ /dev/null
@@ -1,31 +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} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 4023900a35fd..0b31784daeda 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,6 +1,9 @@
-AUX mapping.patch 440 BLAKE2B 85788659884ba57f093680a6796ce0e71f0bf6a0f1f221d3d79ecd9055862b472d2cde87c436bbd18b387a4694c09d63e95974552f3f5652060f77e0625653ab SHA512 d69af2a319dc5f3511063b36b456a11c44b8d85d93b541cb223542b71eaef71fecd5405bdaa688d9516ca162060f64a4abe284841b7cbeaf69203f37ee5df120
+AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c614e32f6b8c18e17fe0c03c1bbb599438d052ed241590634c6011497adbe0128544b93294ab464af SHA512 09836864043b8f9d7e8eee7ed9bb2613d3ec34b90a1af3fc30239c54ea901a13b7ab89bdd3dc49a42873de783d1f622cc8b691b02f48b04947dd3667b4dc4fda
+AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
 DIST mockldap-0.2.3.tar.gz 22369 BLAKE2B 0021951556c0b8ea1f043b702f4d8f8719d272559db3ad8ee4e49955bb17a3caab4083a37486366145d8a7aea927fdc0528c1194f849917471ba6174b52bb46a SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788
 DIST mockldap-0.2.6.tar.gz 22892 BLAKE2B 9ed6e7cb7c8ab770ec7ab3af01fb2228190c505ac2025adb7b728d9daa4851f51eeafdcaa3a7413d44a181f005a19ee25da99d93a7c71b9d0207c454a533401d SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c
+DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
 EBUILD mockldap-0.2.3.ebuild 1044 BLAKE2B fbbf56b1cf41eeeca71eebf637711643f7c254441d7d4f605c5b5e00970c4ca71c55c5c88609c666c10816c9c7f9d04c0f2426b5ba4b14899f284e2e229c42d2 SHA512 83fa5a12c8e030b1a4e181f3312f88ebcb6a3c8fd119da6f26884ba72b97fb5755021cf7be1da0a0b41ff4898218e100134b0db299e761e5e1b83c165cc8da36
 EBUILD mockldap-0.2.6.ebuild 1169 BLAKE2B 1c49245f498486d3416b4fcb5cf0a45826e8ddfe26009f34d217b5e3fda0a491467cffe5a070cc093206d7e085eb67eddcae0d0223503e75e2ff744aa9a60b0f SHA512 3c391760df32f971a39a2043c0c4f7f021e9c2478a560b198ee7256debe20cb12d629127928db24136ee03456102729529ccd9dab432c8a3c749fb90d519975b
+EBUILD mockldap-0.3.0.ebuild 1255 BLAKE2B a1e8aad6a61fb752f401bbaaf3bc0552eefaae2ab9aa93fccbb237bb56c5dd6ae6f69acbd093ffafe25cae4f70d564ce4809080d5c6fde1165c79f0dc293608e SHA512 3fb0280dd392d3d6c1e0be36f2a274c0b03383d0910c2ac596c521d7f8714b5ae13311b6beafdeb2d64c3807f1e284c78e5f6adbfaaf0a9b64feb4b7f730887b
 MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
index f3cdd862a9d6..b8c25eca5833 100644
--- a/dev-python/mockldap/files/mapping.patch
+++ b/dev-python/mockldap/files/mapping.patch
@@ -1,7 +1,7 @@
 Disable un-needed d'loading during doc build
 diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
---- docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
-+++ docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
+--- a/docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
++++ b/docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
 @@ -28,7 +28,6 @@
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = [
diff --git a/dev-python/mockldap/files/python-ldap-3.patch b/dev-python/mockldap/files/python-ldap-3.patch
new file mode 100644
index 000000000000..e047032ed56c
--- /dev/null
+++ b/dev-python/mockldap/files/python-ldap-3.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User Jon Dufresne <jon.dufresne@gmail.com>
+# Date 1521133853 25200
+# Node ID c938f5b558833dd290bbdcbde26c97a6bbfea623
+# Parent  8784bdea1cb29b2a5b5d21045b024880ab84c05d
+Unify Python 2 and 3 dependency on python-ldap >= 3.0
+
+python-ldap now supports both Python 2 and 3. The pyldap package is
+deprecated. The project recommends switching to python-ldap instead.
+From the github page:
+
+https://github.com/pyldap/pyldap
+
+> THIS FORK IS DEPRECATED
+>
+> The pyldap fork was merged back into python-ldap, and released as
+> python-ldap 3.0.0b1.
+
+diff --git a/README b/README
+--- a/README
++++ b/README
+@@ -1,6 +1,6 @@
+-This project provides a mock replacement for python-ldap (pyldap on Python
+-3). It's useful for any project that would like to write unit tests against
+-LDAP code without relying on a running LDAP server.
++This project provides a mock replacement for python-ldap. It's useful for any
++project that would like to write unit tests against LDAP code without relying
++on a running LDAP server.
+ 
+ * Repository: https://bitbucket.org/psagers/mockldap
+ * Documentation: https://mockldap.readthedocs.io/
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -40,11 +40,8 @@
+     keywords=['mock', 'ldap'],
+     install_requires=[
+         'funcparserlib == 0.3.6',
+-
+-        'pyldap; python_version >= "3.0"',
+-        'python-ldap >= 2.0; python_version < "3.0"',
+-
+         'mock; python_version < "3.0"',
++        'python-ldap >= 3.0',
+     ],
+     setup_requires=[
+         'setuptools >= 0.6c11',
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
new file mode 100644
index 000000000000..320fd5560f03
--- /dev/null
+++ b/dev-python/mockldap/mockldap-0.3.0.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_{4,5,6} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A simple mock implementation of python-ldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	virtual/python-unittest-mock[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests are not distributed as part of the release
+RESTRICT="test"
+
+# Disable un-needed d'loading during doc build
+# Import python-ldap 3.0 instead as a requirement from upstream
+PATCHES=( "${FILESDIR}"/mapping.patch "${FILESDIR}"/python-ldap-3.patch )
+
+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
+}
+
+pkg_postinst() {
+	optfeature "hashed password support" dev-python/passlib
+}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 69d96246c14a..9ece88213db2 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,5 +1,7 @@
 DIST monotonic-1.3.tar.gz 7211 BLAKE2B ee05b43f8734099c3d7472ff98bc815cb33cd45d33cd780f33703429773cb3f7cccbf97c3e476247b749616f16ee4493cf300ea137b6da89068c912e4689f72c SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9
 DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
+DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
 EBUILD monotonic-1.3.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaffeb64be09138bd476902d500d8304fee42b72b259359f406c31412fa7d24d615a99d1a07a727bf2bb8b016b7 SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea
 EBUILD monotonic-1.4.ebuild 490 BLAKE2B f1a693d907ba48b51abda74002232a42ccfe37ccb4912e444e5aca61616726f79a4ce542cb7200072f43430b8af53fda6982be83a17f57f666d4fbe7502c8d47 SHA512 2ab6bd131db94be8a62248c8e7ed3f09f9d6ceaad663834e027bfb45fbc5c361ee44bbc5be717fbd4d2f51651f442d81ce957d29db8fc2fd61f1ac404bc42ceb
+EBUILD monotonic-1.5.ebuild 491 BLAKE2B bda25a56c8710a65aa27171ab3132cc0b79d19cba1c68bbe3cd0ecb687681db972867fe21bd6ca1f9a0e9d35742270c294d8d00bbca508eb22fef7b15422a89d SHA512 50c1659e3a11184ead7cd64e5952806be38bdd811e53e0f3e0bb48ac9c15b8b6593a54cdb9f63b02adec236d8c86f8e534272391d22b6c7c6eb856d15971e602
 MISC metadata.xml 265 BLAKE2B 3933f653f010c95cad9fed21d1511497c49a48ec369592bf48061a987133ef492a792274685c56a0aaa640cc1f39b2aafe6dd141191191dd1693f6ac9a9aab1d SHA512 46857509ccd598f4774b26386248a7309cde1fdf63a3edb3e75926029abff5cd653a57e213bdea8b976b452ad4ba9f35b65111f6a53ee5868ca4bf76bd8bd1f9
diff --git a/dev-python/monotonic/monotonic-1.5.ebuild b/dev-python/monotonic/monotonic-1.5.ebuild
new file mode 100644
index 000000000000..72cfe7194bd6
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.5.ebuild
@@ -0,0 +1,19 @@
+# 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,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 53a75d1ac388..a3406f36d5f0 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,7 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
-EBUILD more-itertools-3.0.0.ebuild 940 BLAKE2B ecdb27a57e7ee9ee08e84e64fb8ac37f873c41e4dd38a1dd73679bb6eabafbc2e27e20e343228e29b2d695b9de865c42f99be874842bac32ec4464f444179587 SHA512 370654b68c809bb5745c0ac0329aca6eb4e9ff620079082af53c4c85f43c8d9bd1a4f6a0fb11d5913d7c0c20a35acf57127be0e704df8295066a63875aca12d3
-EBUILD more-itertools-4.2.0-r1.ebuild 1045 BLAKE2B bf29d6e86974069ab1cebc6dc2686b471ddbfc8ce2ddd0dd6d9529587aa4d9cefde959761028a99771c87d3fd144a2e370236afee04cef1b0fc8ab4cbdff3dd2 SHA512 47b043ed42f24099ff415f43ea66aa55c64bd8cdcbd47939ea1b10032b589683200628c76ce4949b6d886efc9305ec23848cff96ff2f587b1c4e707fef3029bf
+DIST more-itertools-4.3.0.tar.gz 63266 BLAKE2B fcad717550931f267594f0e338def6e8d6119f28452ed8654b9e3ca073c4219f78d58d691855c4f6b4817afbe94d176077c342fe9b57ae522bc113049da97b57 SHA512 5fee3d99fd796b0f0f6b5aa99a8db22e219d3dced71fef6f4b16286fe67061dce280389b3638c55c6e5f6c828ef1286cee845d76a6861d2af66d90e995d5aa4e
+EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B fee0e2ba67b0b5ae02665f090be10fe7f9a1610c72857b4ea56b44b4709e0af7f93ebb48b9d12279e9e9e77825868e4338d7e6724095ccdab7d17e49e88a3fd0 SHA512 7e3546efeadde855f65e9aa5b751e0186ee33125544d8a0683ebe5e3997bb00f1e150d35df184019e2df26230cb4b50562bd2b10d2d6745e202ab70957913167
+EBUILD more-itertools-4.2.0-r1.ebuild 1055 BLAKE2B 567d1228b00e311e9f0c94633b8a0ef771d3a0a2a27c65f9c4441640dba76dc42c497976612b9690b8ccd67383125257a106b0fd9a6471bf6606a2516343e95f SHA512 ce7348d9ffb14cf68b1c360f20d2fe89fc95995f96a5e24be54b7b171d45ed86b98b363f8e8785d3d358ea3d7075e81c6d9541020dd1d7b143c5aea186829bf0
+EBUILD more-itertools-4.3.0.ebuild 915 BLAKE2B f6ccf7a011620e0fa00eb4bf6cfe657f66724fb19364866f6b10cb663b816ea3487fb768a1d6a4bf4d8be39c53dadf89a31e53402a26f1cde99d1e4e39221721 SHA512 f0ad666b48c265864284b1fd124e3218f0eb18ecda86286f36685ff9027e8b638650332788219f026ae4e9d54131a46941dcc0e0d475273031d51b7b4940ae10
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 50b22feb0655..337eb39858c8 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index 80dfefd9c853..1ed28b384772 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-4.3.0.ebuild b/dev-python/more-itertools/more-itertools-4.3.0.ebuild
new file mode 100644
index 000000000000..0b78adf9d36a
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-4.3.0.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=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (	${RDEPEND} )
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index a49295d1f592..72d04f711cbc 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1.ebuild 806 BLAKE2B 3448b3a0002a6fa66b51512104d5925e36f62d09b88d721b4fe4923db97120f5dce1a50df4a480c62edbfb9347034328e8457cea94f12a905f6b180bf227cad1 SHA512 404ea5912e7eddbb6b5d0f61033e083cdd4a25df0c11b317e725f10bec3373a3774df5233b451cb6e2c0593ce323867d51d1d509d3c180b26ce61bab5da0091d
+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.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index c2f6b3a81b24..c43cb62ecde8 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.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
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+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}]
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index fc82e19b6ae4..dc9ef039ef36 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.ebuild 653 BLAKE2B b9f9362db64a230f7f8e6ad2c2d7fae00842d7327cefbb287d01acc0cd919111a9d1c76c79df71fcdebe747071430fb39506a94e667b2f23f180f0c78c454b6a SHA512 f278fcf00bd29146f4c09e717a7ec102f363c3b1db1ae87a2a6c07e1efc75adde1c3611578de0c4b41598714ee327723aa13c1773c7f502704b2a08a996ef49f
+EBUILD notify2-0.3.ebuild 655 BLAKE2B cb702004604502914589f845d24652f6bd627c45283a2b79a28d40dee4efaeb8c4ba427fcd5123a00fe25fc3995b136a642f8e582ff909870e93ae2204bc4c3c SHA512 3a15e082adf783afa7f14d83f4698617232379f15e486f955cfd36917cbbdc71a5e3828ae5573f30b941b62605789e178c42c2bcd58c4fd8b97b55a28afba296
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index a36960451652..60cbba01f397 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
new file mode 100644
index 000000000000..7d462a040be2
--- /dev/null
+++ b/dev-python/nototools/Manifest
@@ -0,0 +1,3 @@
+DIST nototools-40aa4936022295cf851bb62f09a070f63fc8f5ae.tar.gz 9649749 BLAKE2B 5637373dfb70552f640b728814f3db1f3732b7335e7edac502a553a896e9715a8ef9356502c5d33a09a04ef45b0b27989f5a3602707964c7f91a1eee21e9112d SHA512 b1bfacc69f79b9ff7d40ff9b475a2e5808e57a66fa3bf2c79cdc56999e390cfdd2f92b71fd9e53e0e3571f30f3a54d1dcde2c3d8bf38378c72f79260d8d9d5ba
+EBUILD nototools-20180827.ebuild 904 BLAKE2B 48f7110934037aec586c9c72d0c0e30e67f1c24b791559f04fc8b8ddccf2dd9e8dad372ea4724db2b3ae71d0a5e6e232dddcfbb4f715ad2883bb916a341d5790 SHA512 6eee76ad1058c9f8d1d0a894e53adb8e8ab86d6bc3f2426ae35e2a3dc09204a55d470a0136078bc3b406d8b6c6bf5b1c1fc7abdc972b93b7c13d780f6ef95ba6
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/metadata.xml b/dev-python/nototools/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/nototools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/nototools/nototools-20180827.ebuild b/dev-python/nototools/nototools-20180827.ebuild
new file mode 100644
index 000000000000..ae273247db2c
--- /dev/null
+++ b/dev-python/nototools/nototools-20180827.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Doesn't work with python3 yet:
+# https://github.com/googlei18n/nototools/issues/472
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="https://github.com/googlei18n/nototools"
+
+COMMIT="40aa4936022295cf851bb62f09a070f63fc8f5ae"
+SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/backports-os[${PYTHON_USEDEP}]
+	dev-python/booleanOperations[${PYTHON_USEDEP}]
+	dev-python/defcon[${PYTHON_USEDEP}]
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 8dd7a26473c5..1ccca39d818f 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 669 BLAKE2B 7dc78d7b23c50af368ca63085b7a2af810a84fa6d7cef025657da5ca17d340e1d6deacd44941fc142076f8c3740098db4e0bd399d1daf122bd60d8eb9196eba2 SHA512 46556d11118e8053722add7636da336b9770a735c84f11f7c41640a6ca8c4b205a640b3c0123bd1bf6ff9ca8a772c745afeb72edffbb78b933f23623d2daa4ba
+EBUILD olefile-0.44.ebuild 667 BLAKE2B ab27843fb2c01c63473b9ad347295899740feae07dcdf4d43ccbf6d065d7b21dae68e193c4edec13866f8cb097caadfffdf783b3105a8abd27766fcf56a92d2c SHA512 708f9ed2e39c038345e6826789a4db271f6d4fdd6ca564322a2621494723f23a8ce07f738ba7dabf53b57535e2d27d4c42d55ad6123eeb10d91bc883e7e80ea4
 EBUILD olefile-0.46.ebuild 673 BLAKE2B 7079b5ba6ab8da7f06e11931fd8693abed7b0897f6654f5ac57045c6e4453953086f88f3af144b5b7d2316bdbc41f57ab140dd58406cbc1c2f1a7c87545f2789 SHA512 1e338ae9e07b7a640bf848a0a7b3836715738d5edec752c8cc424ab12fa379b860f9f5a08bb82ced903f1792b2c166d0801b8187be8075cfe47822ef4769bef0
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index 7d8ce108ca3a..e98d48d5c1f4 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index d3bd1be41c3c..9198ee271e9a 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,6 +1,8 @@
 AUX paho-mqtt-1.3.1-strip-test-dependency.patch 681 BLAKE2B 0ed9a448e5e72813aa05ad1d37ae957150ad09b6d48a54f668a969e5e98ad25f8d55b223064e01f6773d0e42da3ba26f2e0a7f43a628ff68fee4b619b8de96c9 SHA512 dbadb8c1bd7691a973d8c1cd146ac9bd72407625ddfc5042b25bc81ff74af6d554c06fa3b2972637acc4a466e75a65c9371990e43bbf649fe5a5a22da2bb36fb
 DIST paho-mqtt-1.1.zip 159529 BLAKE2B ca3a39628c9cab8c4f3606587a5c853e79535b37a92991ecc32903967952cc00f6a9b967af0d343c4619f3e46ace1330baebc7c2e9dc231673f51775e4e1de25 SHA512 ef6d1a29480671413dbb655bd8f668b99f8587c14589d2180a37142b368e0ce058f8ed967dbfaa82f239c86e295338bc35c9f28a3ea39d21a6034cd8787a63ce
 DIST paho-mqtt-1.3.1.tar.gz 102133 BLAKE2B 905a51824d487cb125e06114bcba6b1ba862de4ab816db16aadb6ff761145fd4724dc6523a0c6837b8a16ced6730c5558612deb138bd95721f15054f5d6851a4 SHA512 95adeeaffbbd4b39d19fbd46feb39ec4a2ac923addd3c754a474b7a91d620bfca1678645c1a09c925e38a33995575944b873e3b2300d7bc2f3c5be3005c74d4c
+DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839afcc6fe91f880e29de24d5cf8e2491af81a30eb82c27fe63eee90114326eb75b06a32e05ec2fffed27b92d9601902 SHA512 2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c
 EBUILD paho-mqtt-1.1.ebuild 499 BLAKE2B 43da38aa5822daa6968d4a7b9514ddb86d0297617c59caede2453fe0d96ab29daa11c3ef6a38d9bda79c4f1133901b1eb4f2b6752b54162b684c63dca76f60f8 SHA512 b9c0957e161058d9594f7516fb31b2f45168a55fca7780b84e2ca695eb37b5acda3bee064fe2d4f3f603586565c2f806521123844f84924f325b75f9743eb928
 EBUILD paho-mqtt-1.3.1.ebuild 833 BLAKE2B 5363c1872085058e86c8dde20d56db395b34aac97f673d3e11749fe9945c1c3d28582128e2b3c69540e69cf26ab9498113fd1414ca1d17659f41f463bb64ee5f SHA512 4f5c9188b6cd1729ec53d12e0bc56a25251cf0468fb73464acfd3a1cf39faf885cbfbec3a951fb222fb862136e61879e3adfe5f80ee3eafd862b34d666abdfb3
-MISC metadata.xml 462 BLAKE2B bb478b5d843359050dbdb5ba67e9bca36dec28f6c65b6e89ac49cc00cf63c80abebc4525de91bd0c43f6979bc2c1a3b850243de39f3d5620a1f19d6b3c9fb8dd SHA512 bb6dabe3f0a5dcda951a9aa58ae0c883ceb7324f8538dd2962fbe216eeedf9af09829b79e35f5bbd8baa00cdfd16602411430276329554bb1908d6ca9609a9ae
+EBUILD paho-mqtt-1.4.0.ebuild 842 BLAKE2B 4fd0c6caf9dcd89bc2a31f68abfacc82203573cd82aa62e3399c6c304c761fae52ae47397557f56bd301848e97417731852b3f3bb33a2255f750e4c5f88194c3 SHA512 c01700aa20434c2bccddaa9ce0b59f6f90fc54540ac681f7515bda78f189741ba923079f9fcd75d55d3a49a0e867ee5a539a4163775e2ac08c53cec53824f609
+MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index c1efb3bd1df1..87bf6367c9c2 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@openmailbox.org</email>
+		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
new file mode 100644
index 000000000000..3f9c95cc4cd4
--- /dev/null
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -0,0 +1,37 @@
+# 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}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
+HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
+SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	) "
+
+S="${WORKDIR}/paho.mqtt.python-${PV}"
+
+RESTRICT="test" #659106
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.3.1-strip-test-dependency.patch"
+	default
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
new file mode 100644
index 000000000000..afff70195bfd
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -0,0 +1,3 @@
+DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 535 BLAKE2B 65599a6f145dfcc63c8e4c00a311beec07af0f395c07fe2426f87a9cd394963adfab4fb81386b7f88278913422a684a715063bfd458044bec4eb4cb8af3fd413 SHA512 d8965db6b45f0ba4818fce5081109a888263917f41bad546af26fb61703af4738020c9975b2597ee8184a999fe5132bf1afa95385441b01791c1ee82d17199cf
+MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/logilab-common/metadata.xml b/dev-python/pallets-sphinx-themes/metadata.xml
index 6d7823824e72..8c8ac13155bf 100644
--- a/dev-python/logilab-common/metadata.xml
+++ b/dev-python/pallets-sphinx-themes/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">logilab-common</remote-id>
+		<remote-id type="pypi">Pallets-Sphinx-Themes</remote-id>
 	</upstream>
 </pkgmetadata>
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
new file mode 100644
index 000000000000..72e586a5bfbb
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# 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="Sphinx themes for Pallets and related projects"
+HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 92e7341bcb7d..134038f1fb3a 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,8 +1,6 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
 DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-EBUILD paramiko-2.1.2.ebuild 1126 BLAKE2B b34574e42668a2ae2275ab09bf34207f1dcc81adf7576150060dd6d4c44b2e2682c79262861d14f85bb657d58a4e28e111c5a9701061922a2e7b235f5d269b4f SHA512 dcd0c120cf12e8d6927d772c569c92b0bd67738e6ce71fe7ef8f9bccfec9268e65f61e57f265635f129c9c1fbb8f3581c7d445251960c09c231ae6f74d2e07f6
-EBUILD paramiko-2.4.1.ebuild 1518 BLAKE2B c59af4d2d001f5d565950a93fd462ba01e18fbb3f034b8a21b9833d3a4964477349fe9f1f1cbe22ad4263ea97296b88b180cbc60211f94fb7d17152138627e0e SHA512 4a4a9021b3f76e0340a89d8c8ae6c4973f8481dd2daa0a449f7f7ae8326a9c79bb512811227c1d1c591b62a0f793135480475b17d025b2c4c8df931e0f256f7e
+EBUILD paramiko-2.4.1.ebuild 1517 BLAKE2B 5fb5c4471ea52209dc32829aa4d1b45730de33d73f07a8d3cfdf04d51e782353b054c7ac8bca5bb20f411c5b374d69e6299b06d4f2b58ea864472419d0b844e3 SHA512 d8dae1a8b0e0fb2accc0eb83fb7371c5faabfab31362c0b171d6e98f46803167593978b18e0455c480bccc55c8bc80f729312c873bab18d7b09f67cf50064078
 EBUILD paramiko-2.4.2.ebuild 1672 BLAKE2B 0cf3b93c6ccbd9dc188e0e42fbcf2d810ded48b26cb3399dea710d2307a6bf278c96495ab14b0f83553e916c36727f768443e49cc8bd15fd351c1097bc757c91 SHA512 507a9f2d5b0b166523b23e1ae4881f984d69587c4cdca8611e325cc29fc89bad9ed2094f9eadeb11898811b57bb14928912da527947e94dab12b0c637e775239
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.1.2.ebuild b/dev-python/paramiko/paramiko-2.1.2.ebuild
deleted file mode 100644
index 0206b406c835..000000000000
--- a/dev-python/paramiko/paramiko-2.1.2.ebuild
+++ /dev/null
@@ -1,42 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Required for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index aba3b71c7215..b7ad77c8a4e4 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 357d72f54e22..7b5201a513a3 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 EBUILD pathlib2-2.3.0.ebuild 1060 BLAKE2B 936400ce062dae53fed477ce5f201b60e2bc255bed945a8e3bdb9f56d8a91a4e7fc7a53ba8a391ec9e294bdfd3f22732a05e8fdcb937e693ceffcafd53b264e4 SHA512 7d39226f0942a6e513d7053ce397b4e67e73f82621e356a83ca0234906bd93ca82e058ba4d72acdb8abb1b12db29a97ccecf47eda96e8d942ec9e9cd1dfc2fe2
-EBUILD pathlib2-2.3.2.ebuild 864 BLAKE2B 72aa9a0aee91faa5e85720d09146cc77e7ebcd7732008246a1aedb92f9def96b5cf941d73393d3f6e118b39236021a070855a4acef559af446458b88a88e677e SHA512 00be74455f282d5474041a81fe3423bc954fbe13935ad12a67192dac469dee393f4b3cfc8346940f8fdc450bfb78e9df2c4b60d980372d91250dfd014d44b5e4
+EBUILD pathlib2-2.3.2.ebuild 871 BLAKE2B dbea56e09cdd93023740966bd6a6391290d68ca7942d63a95dc884f05fdce3ba845de7e86b33055658213785aaba53a87ba7d4ea8f426b4214e65ca47fb509f9 SHA512 4b3b911c48bc7ba62caf220272d77dfddae36c44d94636111e5ab035643e33a7676737baf6fabf3c9495847fc9d34f82f8d82680aa4f107baf31fe4d905be887
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index 8b607de7f01a..9aa254025339 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
new file mode 100644
index 000000000000..a0d6abdeb8b7
--- /dev/null
+++ b/dev-python/pep257/Manifest
@@ -0,0 +1,3 @@
+DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
+EBUILD pep257-2.1.1.ebuild 721 BLAKE2B a836a2c55c622e51d4bdd769b85aab43800c2c94e6a6d15b8b9cfd7eb45bd1e4b46915ecd9178cdf7dc4dd8c7998bfbefefae56d599b16c87d6982228c1c891f SHA512 11bc89b864b408b4337116aa4b0af17c85feae4a93e93a472a2d1f4aa660b8167662335318bcf7011549d3795613b5af00d5c3999b958c3c440bd0777a2e6a6f
+MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/metadata.xml b/dev-python/pep257/metadata.xml
new file mode 100644
index 000000000000..303bad4bb36f
--- /dev/null
+++ b/dev-python/pep257/metadata.xml
@@ -0,0 +1,15 @@
+<?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>Gentoo Python Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">PyCQA/pydocstyle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
new file mode 100644
index 000000000000..38e682f3d835
--- /dev/null
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PN="pydocstyle"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://pypi.python.org/pypi/pep257"
+SRC_URI="https://github.com/PyCQA/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index b1691ef7f837..212eeba33a28 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14d
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-5.2.0.ebuild 2723 BLAKE2B d6ea78cc9c4bcc83d6778397cf441365653bcaa0347ff9392986e5750e186fdfbcd499d53e3dc80f2521008655fc428171fc12301780c63d5b15b358b84602da SHA512 e00fec07dc7fb04064b3de979ccd6ce7cf5f8a96fcba63ccd87dd4b70d09fcd6f4dbdebc2479296d9ad4e1f1b9477922d53267264261e1d01211f865827e41ad
+EBUILD pillow-5.2.0.ebuild 2721 BLAKE2B f4c532446efa2fbaaae11744bcabef21cc192a207d0dc849b2a5bcb03713b8d9b9780d576ea05a738da71ca8bef00c8703a90aa8cfa091d0f3dd1f685445d566 SHA512 58cbb107071732acfe26a2bb797748fd6e5557148cc52ce6f0b4186b0ed98c70feada43924a73928417a9a4a6fbf5792120ab136213df32da2900ec69292c05f
 EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 2fe691b736fe..3ca056dab0f6 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 2ba260b98cdb..bf0a09dd6f1b 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,9 @@
 DIST pocketlint-0.15.tar.gz 22334 BLAKE2B f07d41d212192281008173f6314c4868ef993dd7c8220d21e2d45d461cdb5377c61acbd8d5bf7f915928fd007e844cd50f8b5ae9b87d1a6d7eaea97f0529b1b0 SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b
 DIST pocketlint-0.16.tar.gz 22573 BLAKE2B ccf502116d1020f6bde8c0915cd83d88ac5c78c207feeb184ab4f244b23b771b4384fce69d6d562e84bf6ea2ce2a0a0ea6f65be6dfbf9ec26ae6132a86e1116f SHA512 3c7dc76a07e7654ab7bd6bf32b68d296830cab9d6e5c17dcbb5df6af0bdbecd4e86eeff70ea7e857951c9d2f35988263e86a2a559de2cca67c668a864aef431b
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
+DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
 EBUILD pocketlint-0.15.ebuild 483 BLAKE2B e1275965b450636bbee4414361331eb92e0460b7e207ee50ef242dd8f48c051b002ca22585e3639a57b3add690dfd3e7327a33a79eb2ec681f5b5a4139b6a475 SHA512 8eb83de3bfb057d21ef54fafb82eba92b3c23b37eb115dd844500557f368ee8bb62df0ed541b6284451772aa29e49a56e95925799478e9b7e431231d4c79dd19
 EBUILD pocketlint-0.16.ebuild 490 BLAKE2B 264e5c85b0706695fcd7b23c7c33edb1498ade0dadb70fbed1232d04670f64a3d5036db3367e82f724e572c2c422330e3abe3694beadff76d2db27a104e47540 SHA512 5f3c54df0ff04a6a116aba00d7593088a248c2f8e6cc105af2e316a75f3753d866984db0ce2bb94f0fbb808c4624a8c72fc7f859e220b6cae5c5499c5229c906
-EBUILD pocketlint-0.17.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
+EBUILD pocketlint-0.17.ebuild 484 BLAKE2B 53c73b134365db1b096f4530cb86b9c40e1a9dcb22f438fe7f8504fae4a8699fdf2df38a823399733957bb46cf48c629ed1e2b8dda42e8421ad622994cbb315c SHA512 52ef44009daf6dd1641ed7aa34effa967e64b3de2e61fe8114d2686fc915494692ec3f3084e1e220d72298747bf2727373a6f0fd10edd2236f7cf1f070553230
+EBUILD pocketlint-0.18.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index 4c9d535328e8..b7e157b6eeab 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.18.ebuild b/dev-python/pocketlint/pocketlint-0.18.ebuild
new file mode 100644
index 000000000000..4c9d535328e8
--- /dev/null
+++ b/dev-python/pocketlint/pocketlint-0.18.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Shared code for running pylint against rhinstaller projects"
+HOMEPAGE="https://github.com/rhinstaller/pocketlint"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index af262dfe9bb1..76790833d926 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 1404 BLAKE2B 4a860891db48d64b9527a508ee07341e75611d6b61b8a6f2fa6d0d77271eb60937796d9bbac8183a0b25b1e416b2498ea71d52a31e793d7c5f76890167ac50fc SHA512 3f66a54d7a3454cfcb0ea891f0b3def6497d7bf1f3bf620be53ed3f52d1110857c6cb0a2d25be6a62a37e67194e7b9b65232352abdbf9b1ce71b51e8a0b7dd65
+EBUILD protobuf-python-3.6.1.ebuild 1400 BLAKE2B 36c94cae04ce83af577493a05e604db9707a91c680b9c1341f40f72bb5c27aaf3282b1224e4072845ae8036e3ed8fd0a82bcb80169a36f5cc5b6b623f6d9a464 SHA512 3f622d60cf98492fd6d2a092c352dad32960246fe139a0556cfb2c156cfde02c34438c7994ed50739d5af9f31416f9d7ecf0126ce31cc3c79afa31267e3280b6
 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 3d8397734fcd..92eb2c7adb9b 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/psutil/Manifest b/dev-python/psutil/Manifest
index 683b47aab804..76dbd8eea955 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,6 +2,6 @@ DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc58
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 797 BLAKE2B 0044cb1cc02e6fd6faa6f5608aa718810bd78c891e5794ee9abaff5efec7ec2b9945d562d2360a3f3845b80a2d2c0990a721b8172ee01ce1e78d1e33c9ca2c96 SHA512 b7449a7a99f7e522a24fff8d7c1e236e0870881f23f49de79f1a3f3a33a10fd1c87928828a7a925050609fab0d6daf38e0a2fc4e681b7d4fdfea12d452a00c59
+EBUILD psutil-5.4.3.ebuild 803 BLAKE2B d92861fa2dc7a0ffc2a6c0e8b44ecbc127442f23270ed45960518ca7685daba50e8becc3e82c9917c011ab6d97bc0a95e837670017c3053d4daa68035870f941 SHA512 4ce30f78e60eff643b612747a65c7d5664249659286fcb27ecfc62e761781d8db747a739ed0ce32e28f05c63328e5ef3d969c4c15e0a91ecf5bd011426d1f789
 EBUILD psutil-5.4.7.ebuild 909 BLAKE2B 5d085cf199dc202cd0668f7404c8647c01284b0d20f7545d7dc199caa313381bc66d014db22c7a153ab5c5d5cf535e939b2b31e82f8a26c8a6f26489c422063a SHA512 56ccca156f10670de43c5c20969c4ca8078bc9313a807752faf244c2d9ad58c7f01119bec94b4f32f3ccc9314d6f54196e11e69dacb94df229868353b62fd05e
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index a72c036d6003..110d80992963 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 35654317a040..5ee97871de01 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 54ba5c6b566859df89b59769a613b31a4c5ddbf634db442f542a5f0a39ff4e32fd165a42cd8b4d0f7453d4fefd7e2411cd1d0d27af267f21127d6cffc499fe68 SHA512 8e0f366591fdec105e7717730c392ede2c67eecfe3a88261fae3a9a5e0c92d8d991d94d9fe7ca9abac28e37447308d371cc5183ff1e4e2e815a4358ea364cc68
+EBUILD pyalsa-1.1.6.ebuild 618 BLAKE2B 1c51cd24d81e5b29bb45adce2659f5c48d6afa905574e65147f436f8bd9280dd89c7e0e297b0524543a99dbf356ac3a8e22336302688c01a70b25c82644e2537 SHA512 36d3996940be532dca31b547ec5e98b350878739d30ab5f32955a6eecbab7fd73dd67de3a5ee09ac7cadbc32a26134db9032c3568fa5a19e53e256dcb665143e
 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 9f25f2ab8f50..65b4d5242735 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo 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="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~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/pyclipper/Manifest b/dev-python/pyclipper/Manifest
new file mode 100644
index 000000000000..f4826b437172
--- /dev/null
+++ b/dev-python/pyclipper/Manifest
@@ -0,0 +1,3 @@
+DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
+EBUILD pyclipper-1.1.0.ebuild 696 BLAKE2B 743ad9c21a3bfb972f968f7ae226d3724ffa3d86a9e1afd4e2b2ed286ce726ae76d9121b104233254cd073647dbcfe6a42b9fdf76fa4081e1084cf941bfc3439 SHA512 5b6d3bbbd2e62f6c9f734f2638020634ca5dbc56673d59b1514a9a880423fca709b2844216c9bbab044865281232eb677dd7efd4e4bdb84d967760213d40d83c
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/metadata.xml b/dev-python/pyclipper/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/pyclipper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyclipper/pyclipper-1.1.0.ebuild b/dev-python/pyclipper/pyclipper-1.1.0.ebuild
new file mode 100644
index 000000000000..e639fa0cf58e
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.1.0.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_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+RDEPEND=""
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 077d1f123e43..09362bf3f1dc 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,5 +1,5 @@
 DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
 DIST pycodestyle-2.4.0.tar.gz 96665 BLAKE2B 9c847aa9c9ffa1f401595d1c2c3f81f971f69628fb34d4e572ccb99203f8e9abe8101302d61c4ae7d330c03e7d0dd5e252d658065b7ed6660dea186880030529 SHA512 cb35238291fed30f1a4363e65b754165772d01e6006e19ce31769691aed17411cd893899fcd22dfca0455401bee899097fff6f3d63825c7656f186e37b7da3a0
-EBUILD pycodestyle-2.3.1.ebuild 1126 BLAKE2B 38e17bd10ae264d2741decd3ea5ee3a8a98624626c7eaa5db0c315f64cf7090b1c1566eacdb3e7cebce6acd4d6a6abb161604ab15a7f08bf61dc3ba5974825dc SHA512 7392a620d2e206dcee4e2e2807abd4bc47b89f580b2b7f95799f4bde0d40f81eed07d2e6fac6290a97b06d56b3a9256cc184cd1ac746de78dff957c1eab54138
-EBUILD pycodestyle-2.4.0.ebuild 1131 BLAKE2B ff730f7a7ff939a562bedf599962aa408e8dbbb6f4fadeb165c5284f058ebbbb3e2b3375e08db730920df538316f9c67d00a2dd3ca70e69523bd120df26f75ed SHA512 b2246855fa69f010dd86c17fc1d8727bd8c5671c57341bdea728c482c8c30201f2047e663e307a88505bf13cd35d3bb64d5e6333b6a857faad6d643a7d762cff
+EBUILD pycodestyle-2.3.1.ebuild 1128 BLAKE2B a4e4780d696c7c25fba1f67bb24552fc15ca18b30ff0e6217e50a01ac3e206b1d52b5ca6ff9b62314f093319c45066ee05faf94d010386af6c2603d9c83c0a57 SHA512 4a39dea3ff0d0dd163265f73a5733be3ceeed912f43f83d8bd6c506c354da36698ccce9fa344cb8a3de5e9bb07efb34873dadd6865a008649d20bb1ea9f00b34
+EBUILD pycodestyle-2.4.0.ebuild 1134 BLAKE2B 9ad30ab0e04abfbd1c6a2558b77c0a988d808d1ce85353657d7396fa3b985da14ad2a02c603278c751a9f1e53a865eabe8ee743ae82055dfad0560857d0a526f SHA512 2bc421f4d0f273d32f004dcc9a06b1d48d40af9875a862f793724d9b4438c5852822e9f796c6f0a188d9f12cea3c5c6e9904359d7114b170bea63dc0b7a9c944
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 6f1be99b311c..34a76da2d4bf 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
index 41243bdcb870..49ea4806aee3 100644
--- a/dev-python/pycodestyle/pycodestyle-2.4.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.4.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 1c61717f4e67..5c126b99dff1 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B 06acd30f37ed3409d5919bdb11cd0b85a38714ccc2c1cf87ec9af1565f848a80f7fe0bba91529b0719a19303073c75fd855e48e66ba46bc8eb704599225f9cd1 SHA512 dcc8187355c079c8d6f6e9ba485b2b07a4f1f0e0f6ff8bb22e0932d953b55b7c01f2dfde5f815dc868fe8e826c163a72d2c300d9cbb0c1aa48b39cc175a399d2
-EBUILD pyftpdlib-1.5.4.ebuild 2529 BLAKE2B 0d2be096e13b7d76c204d7c441a4b2ccf41104066da347538ec458a7a2a4a482166fc59bee47ad65c41311d32bc28cb29ffff067ce37e6b3034da2c34cc866dc SHA512 bf67bfe6733a3f432a81c5c1d68284aec3c69e80fdac90c62381339c765581edb25abc8a01398104bcc5883021161b7aed918d0ad8ea1827f4a5b56cf0b64386
+EBUILD pyftpdlib-1.5.4.ebuild 2535 BLAKE2B 8e3a98907e1804a0c375dae0f7e14506a96b4e53e70c6fe593d123b1c9621ce5500401c3c4bc731d1cefb56391ed58cfbd4e931191fced6e26c87a9d8b549a92 SHA512 88ea8052ba73bba8b4368d7c050d285f8baa69a2fbfc4117033f5707ca64cb22e1879efd7ce3ff7934cb597e7d55ee1d50fd3f19030b448125c977bfb1fec7fb
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index 1633ef26aff6..d5f27bb0cb00 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 0321ca322df4..1cce9abcd36c 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,4 +1,8 @@
 AUX pyilmbase-2.2.0-configure-boost_python.patch 782 BLAKE2B eaafa48b991524400c70f9c6c156ae8abb5dc25132dde1f001b8852efc7fc6187fa27aec533c0022d15efd1ba60342c051f071d32582e0675838a8a20c8593dd SHA512 ffbba202eea36a14a9734633a9510632f8859bdf4f9791f72f020c9600a48a1941e58ea74d5f6b2b9b1e03d874f04cb6e9f5e8ef9cbcc5cd604e0b33ce297772
+AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
+AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
 DIST pyilmbase-2.2.0.tar.gz 469927 BLAKE2B 74a806f30bf8881a4c58135110c3e805b9748074eab08e9afa17735630ee7de16ffe6a797ced926bb93d122eafdeb04c5e6e80ddba1a90bc551cb87ddeb30671 SHA512 111deb65a73b4d0454454d4fb64d09165fb25aad2e5714e35510c2b7ef301dc8765041de3188c2f89c9bd2770494a55a24372953fcda8dcedb23c401137e4344
+DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
 EBUILD pyilmbase-2.2.0.ebuild 1129 BLAKE2B b3876947d8104e5dca92dc6e02780228b30c5c3b3fcf0975b8a8876b3b48e8f95990d16b1a94101626d439972128e0c4f0d901d847a93468f88592e92f0855bc SHA512 abe726f6a70ee90242eee1a9b70ca8386e09a1c7de32e30372407cf4c49ef653e260f392b15407f7d13d76b737a424699d72d0c35f92793c470bddeedbda3e65
+EBUILD pyilmbase-2.3.0.ebuild 1248 BLAKE2B 41abe6232321ab9a84d0397cd771c9cebf0cfab053a2c1aaca1570f5e2a548b2b5baa616f1f64753442450f8e3742b4250f6ab1a63300350f41e58d81d64124b SHA512 25237d6858103cede2d287d546f119ae546422aac9209091d84f50d4f68ca05a262ca1b9064131e804266ea2843e8e088107e8e67d1b1a3ba11df435c47ad511
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..bd35f87a0e0f
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-fix-build-system.patch
@@ -0,0 +1,48 @@
+diff --git a/configure.ac b/configure.ac
+index 5cbf273..9e80b48 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(PYILMBASE_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(PyIex/iexmodule.cpp)
+ AC_CONFIG_HEADER(config/PyIlmBaseConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ dnl static python modules make no sense - disable static
+ AC_DISABLE_STATIC
+ 
+@@ -20,7 +19,7 @@ dnl Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -164,22 +163,13 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *linux*)
+-  AC_DEFINE(HAVE_LINUX_PROCFS)
++  AC_DEFINE([HAVE_LINUX_PROCFS], [1], [define on linux])
+   ;;
+ *darwin*) 
+-  AC_DEFINE(HAVE_DARWIN) 
++  AC_DEFINE([HAVE_DARWIN], [1], [define on OSX]) 
+   ;;
+ esac
+ 
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
new file mode 100644
index 000000000000..878c270a885a
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.3.0-link-pyimath.patch
@@ -0,0 +1,13 @@
+diff --git a/PyImath/Makefile.am b/PyImath/Makefile.am
+index bf87542..ad69515 100644
+--- a/PyImath/Makefile.am
++++ b/PyImath/Makefile.am
+@@ -82,7 +82,7 @@ imathmodule_la_SOURCES = imathmodule.cpp \
+     PyImathBasicTypes.cpp 
+ 
+ imathmodule_la_LDFLAGS = -avoid-version -module
+-imathmodule_la_LIBADD  = -lPyImath @BOOST_PYTHON_LIBS@
++imathmodule_la_LIBADD  = libPyImath.la @BOOST_PYTHON_LIBS@
+ 
+ noinst_HEADERS = PyImathFun.h \
+     PyImathBasicTypes.h 
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
new file mode 100644
index 000000000000..fda4c62db801
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="ilmbase Python bindings"
+HOMEPAGE="http://www.openexr.com"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+numpy"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEP}
+	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
+	~media-libs/ilmbase-${PV}:=
+	numpy? ( >=dev-python/numpy-1.10.4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEP}
+	>=virtual/pkgconfig-0-r1"
+
+PATCHES=(
+	"${FILESDIR}/${P}-link-pyimath.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
+		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
+		--with-boost-python-libname="boost_python-${EPYTHON:6}"
+		$(use_with numpy)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Fails to install with multiple jobs
+	emake DESTDIR="${D}" -j1 install
+
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
new file mode 100644
index 000000000000..d02ee70613bf
--- /dev/null
+++ b/dev-python/pylama/Manifest
@@ -0,0 +1,3 @@
+DIST pylama-7.6.5.tar.gz 33680 BLAKE2B a80d976a6a5e7903f3e4aa6b36777b6a938d52980232d1858bbd602d277bce4b058f8ad404e6dc6692e6950ff36d8e698ff0e3afa44c06334a6bdbe728f15cdd SHA512 0ce2438622cdb3e85fb70d4246cdcc29940181dce82a1a641f6b7900a13f09cba0f871038992019a2e1ccc720dcd6dd5e21786bd8a2df40479a34c500a80fab4
+EBUILD pylama-7.6.5.ebuild 999 BLAKE2B f7fa24e0921f48d75ea85a06e03b968f4b5fb8bfad3b60df44618e594725278a9d80e655b0920361eb135085ab09494740ae01ad6167b8d63fb47622ec567fea SHA512 25e425b5072bdb19a055434ba80334a283d9d44853189b0d711d40b7a54ab6b77be53bdade5ebce669996477d0081dca110e90eaee520257543c82e6ecbcc9bc
+MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/metadata.xml b/dev-python/pylama/metadata.xml
new file mode 100644
index 000000000000..15091e5bdcfa
--- /dev/null
+++ b/dev-python/pylama/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pylama</remote-id>
+		<remote-id type="github">klen/pylama</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pylama/pylama-7.6.5.ebuild b/dev-python/pylama/pylama-7.6.5.ebuild
new file mode 100644
index 000000000000..6b5d0decb02c
--- /dev/null
+++ b/dev-python/pylama/pylama-7.6.5.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarball excludes unit tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pep257-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/eradicate-0.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/radon-1.4.2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v test_pylama.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index e2a9a62887a6..dfe4e433fc20 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 1000 BLAKE2B f9e2146586401d230c35cb66dd1e44826d764a6e04437905a289576e91cbb15517bad4e76fbaa90dab20e48005a25b325fdbaacaec15edcb282e608a4bdc782a SHA512 179ec01a1d9f2d4bbb72e231de0cb54d69670ac52d587f1616718501928483d9451cd8fd7ddc67589e2996b09721f5f742b5e09d45b9b1c280c34d76389c167d
+EBUILD pynacl-1.2.1.ebuild 999 BLAKE2B 36b332205b3514a87f4b1a1cc46c2ee668d440c8bfb8b1cb0023790ccc3e62a1d1dd39b36d854f8c748e6822a683ab8f87b776868f2967b0071db0ef8bc2c65c SHA512 332a2e93c943e7d0faaf89bc4ea9b7f414ee5d4daf3a26ca5404c6ed0cace5d469678635a4da483fb249c14c89c985c38d1cd9f8688af539fc44764c3335b17e
 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 c2cf1214fc3b..0ec46fc711db 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/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index acba256a9636..5f62db3ce618 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
 EBUILD pysendfile-2.0.1-r1.ebuild 592 BLAKE2B b0d05af459b4fcafbc41868b19f709df8934191b4e26689669f446c2035a3aa5c316d6f53a0d7bfaa44ffe18260b60eba01ce4247c3f064294e1529e26cb45cf SHA512 40df0045746fe5671631ae47da43e849068daa5cdf83aa4e2e5a590f9a822cdc428cba202041d5a9c2f1a2cf31e794e604c13adebf50b4dc9eafae202707e31b
-EBUILD pysendfile-2.0.1.ebuild 572 BLAKE2B 1679a3bbd2e1bbd2cace62ee8ab786b51ecfbfee9abb54cf5a2c136ed7338b1c104382e9d7d198e68cddfe0db1ae2e86003d18179310c005f8e40f8450d2585c SHA512 47d979b9bfbf1abb86d95a8481b8ffeac5e08a646895d018f806c39cea630ff234d3eb53c1218c1f8f31a441ab9a26c48cdfe1e5ea631eeed40b422e7c1939cd
+EBUILD pysendfile-2.0.1.ebuild 578 BLAKE2B 3a86ed2b905b2882e2dc79416656d9fb07edfefd5c0ebfdcc7b7de20840ba1fce111dac24dd784a2ababa0d805db2fa94e38053936076fa954af9c8911b1bab4 SHA512 f93c141225232c6e721e49434fdf833100ba979146356c6d628418b907b454db8b0c1b2fdd92e8cc8c9ac9d6b275fe3bc7cb07be7d9bdbe9450e14eff77b79e5
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index d9fe7ec80d17..303ee3a80802 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index bd0ae596ddf7..23595bcc59f9 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 918 BLAKE2B 856335847fe5e28abca710b809abd9946e66ddb45973b803463a284ce21ad615b4f69b7ebab6c132492bbd9be6a76b7610a6b6543a84dd453a3cc225cb919eea SHA512 65635a375c6f0205b2c200e57179de3c6f07077d472cdd0afeb6903bbf450edc1f42a8b0ad8fc23bb000b22ee256c743dc47cc4c431ca7ba1dfd9aee335c03b4
+EBUILD pytest-forked-0.2.ebuild 909 BLAKE2B 51505349cb3d173f3675e2fad008728c459ca2dc188c52c9f073099d07b193621b06f394972fe40c9fbac95facfba057686b5782a4be702421ee40b1d1c754b5 SHA512 988bc183386162aa2fbffcab7d7ed91ca10b8988fd241837616a6bcb2766fd66bee4498c913f4ac2cdd389ddd1ec558628415f70139422981d61dbf91893aaa4
 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 f073c8b7d42c..c81f511348eb 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.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="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-mock/Manifest b/dev-python/pytest-mock/Manifest
index eb25402db011..6b361363ff47 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -2,6 +2,6 @@ DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
 EBUILD pytest-mock-1.10.0.ebuild 1041 BLAKE2B 25bacee77a68d7ee5d4a5796ef3a947a7ce7d2cc19cf2fd2ebcc00dc92104dad75589521d4f410b1f6be699040155e6ae785395daa1ae72f9293f4d8c0f807dd SHA512 c4a5118558659a62fd7e99e3262669361c2edfc34dc5568673654442ae1992fac5fe76f565aaedde9aedf78816ede0db83f2dbd0806ef712f3912a84b38f4254
-EBUILD pytest-mock-1.6.0.ebuild 1075 BLAKE2B 09d374f8f78814ae45b1fb46373184d1f30113489ad48095f992fcc5dd34560b71428f5e328c8042bfe8df10a62a2a87e5a2045da3e5eee958d07bebbf609700 SHA512 64b7e02473459b1e6073471d160d044dec734d02c902f93ec2aa9ca4b94246906c2cfb08fa84d10225d7265a7f1e0cba3f8ec86ce6fa20eae162a83d8150643d
+EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 490ac538bd264201bf4348ce8825773069354fdc3ab26d6207f1e7ce8a0a0f92d1774101d062796d9078039cc792885edd244137928ca6fc78489e605949ec43 SHA512 b693822c82e774068a10164eb560f0e6f2b4d1e0817afb594a8402934afa91a4cdb483d3c7109290ca7ba2e0e8465362d946584493e841729401e6f650c7891b
 EBUILD pytest-mock-1.6.3.ebuild 1035 BLAKE2B b131ad6a83ca92eb5b27e09f9fbb5875ef31f55d3c36aca27c8b4106b0ab8dee99b847316a94b8f9a75879dc4952685823c0ef1ec65e43295970011792112cc6 SHA512 d44cb185efb1ebf8535080c4ae3b819b71ab91584dfc5b6991bbcd9b470e9c55e45f3406e4a24310a1c838be6572bcdef6b818cc6c4eff45be6ba338d8ceca85
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index 6f2a5058e022..bcf8353206bd 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 168b7ff677f2..5ac944e4a821 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 1396 BLAKE2B 91498a87b1aa4515af5e5841ce3f545d59b6b54ea15d03598079ee72bfff9ccf778da52a2237720041479159cd0aa93731fbb59d125d75c7aec5a46136b582f7 SHA512 683fe0e89d13928e6e4e772a06fd30cc0468c940acbe4c7854c12cd467ab4a64528c13d33d4e1dc86fc678ffc8dd20ec26b3626fc8826af459818b0796871ea4
+EBUILD pytest-relaxed-1.1.4.ebuild 1391 BLAKE2B 40e6178831051fab72fc86f01d93a6e9503811688950c674623467ad47118249bb316d198fd13a1704112ed87ce837b641bc3f6e007e74cfb89716e30d3abb24 SHA512 e333108444f7b4c1b6017eb5525a1fe045cc3232ab23244854ce4e2b9649356396af5f0a139db2679fb720f9777f7a11fa91e87b3ea0837d431b36f6fee03353
 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 683884b4f05d..85094ff0482d 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.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
@@ -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-runner/Manifest b/dev-python/pytest-runner/Manifest
index cbd6f0d15fe2..586a33764593 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -2,6 +2,6 @@ DIST pytest-runner-2.11.1.tar.gz 9661 BLAKE2B 300b63de61ef36c299a95c60af469b071c
 DIST pytest-runner-2.6.2.tar.gz 6379 BLAKE2B 4f676a4cd59309cdd0e6462c83718482622817781d302ed95a2b7cb9d92a0b0f38b411c1172ecce9003f5781cdb168338bce6f446b1c91069a2024fb75574bfc SHA512 6a993e8729d5e203986f2526d46e96b7ac19e65fc26493a55a98e858304ecde0c47576476864a0ee1817ea1a7b02cfda952fc03f79b84fff249021f140f3d00d
 DIST pytest-runner-4.0.tar.gz 11401 BLAKE2B 3be4527e68b8c1ae7e1bb5bad111367e459a07cf20de1f3b2d8ab993a7e016f9656618075bf515f576fef457aa86f99990f7dcc4c20a04166703bf9272c395c1 SHA512 a7f3defcc698f43b3b6ceec3f59dbd0e00c651167ddc76a9d1a093d722a013c9ffd2bad3438e49170688d503166cb6d8bf55bbaf7bc6f9e6d80eff049c202b08
 EBUILD pytest-runner-2.11.1.ebuild 969 BLAKE2B 462702e2c3b86a37db446b81b537e72cb215c0e6ee7f2302e06243c3072f996183a31775db1a67cc4617ca51a1486e0c2a95b029f81c5b7326812852fc8451dd SHA512 c6b533b5c045ac545ea69979103776d93c06a49a0076dadc49439a2098f3c32f8b924f17277d99838c519078f378358ae2165cdfed43740e5f879e96307f3274
-EBUILD pytest-runner-2.6.2.ebuild 1061 BLAKE2B ae7efc3d2c74b2c4733ca38e781c8e331a95446910c034cb7808f4acc7ec29f490a5abc1b34a1a34f16cfdc193d210519b5f056fb25a40fc70c4e61f1c3f6946 SHA512 e102351f0dc35bc469ac1c3d36c8d79eaa1d8d228e903b0b0a47b14696ccf2a9dee71af6b3131e5062decfc96084cfb1d192e253cfaf116b76ddca16a58df2ed
+EBUILD pytest-runner-2.6.2.ebuild 1057 BLAKE2B 57f40f0d1c2d61fb55a010a3fd5a1a528e42ff257ad1723ac0792c37f987621a7e9a1cc2532c6972665fe9b14540ea07f215b2a085c2f54f54a2cc416f374bbc SHA512 d5d1ca85369869233d95b0e7d2cee32256fad62a83ab13408e7cda631ef606d98d13adf10dac32e69d660f757ea879af4beba2c87d0918b8ac179594baab3a6c
 EBUILD pytest-runner-4.0.ebuild 1043 BLAKE2B 3040e4fc634435c7bc9907abdbd18a94c6119a699a3c71046bb82ccf54842620ef688c11d3e4479a1d480365b139f7520863652bc7a36a55db5b78c97208b4f2 SHA512 204e6f594f59e17d57e460cfa6c5a81211f572afd4285eb1d121e3d61c64d11dc04f248e655b090c814d4c3f619a6b4c0c2697873312059f34b99af9523dbbe9
 MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
index 11237d06ad21..5dae9916816d 100644
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 4a840e577054..8530466eb309 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,7 +2,9 @@ AUX 1.15.0-test_manytests_to_one_import_error.patch 991 BLAKE2B 1562721b00b0b551
 DIST pytest-xdist-1.15.0.tar.gz 87799 BLAKE2B 6990137c02f70a4ce466aeb7692cdc66adce09d475ddf31b7997abdeb54e148770fc74ee872e0f86719749705bb28ca7e56181b58f3906326c99d6051bd46fe6 SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed
 DIST pytest-xdist-1.20.1.tar.gz 57076 BLAKE2B efac9a0d96b2d4e28b078a7a88ba8df197fc122683d25577cc596f840977f4c116b8c7df1c397e03a50edc400265bae4a8b3900c22da388d0662a71858d7f4ec SHA512 f36e02062e946993bfb9bfaca5aa14c138817f1ad8a8013c5a64b416e91abbfb02502a371c4507c4babb15ac54aca2dce5af4ffe72ed0aa167f670bddabd4b3c
 DIST pytest-xdist-1.22.2.tar.gz 57866 BLAKE2B 356f9dccb7d970e6073dc724233013503939d92072c3fab47626e9ed36778ab73499a990a6f50271ae93b82891a09be811843907c18ae64bf93f76510338c29b SHA512 69a0a233fe52ead13cadd46c134c67e4d0fdcd2a77929aea3da2530cd54c283d46c6d416a1450016ba7e9127b30bd85add99b562d9ec0a49bbe1c08b7828df68
+DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 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 943 BLAKE2B 24e3baa9b12f80e0627e6f20f5ec3b4cf8b8c180d4d5cd1538fa73dff3916bd6ee704cc3ac88cc15cbe15dce331bf1e5120def1b03ed44ebd5956c6ba54feba5 SHA512 4366bfb2da2621aff32f0c84b501a9dbe7ab6d2720e73f09f0d5c13509e35485cff47862a09b2b2c2d0932913840aa4420b3a0098faff6f2ea0714926655b9eb
 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
new file mode 100644
index 000000000000..90d4f2ef9a3e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -0,0 +1,34 @@
+# 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{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+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"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	!!dev-python/pytest-capturelog
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1e8c2f292ba1..3099442888f6 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -6,6 +6,6 @@ DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1
 DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
-EBUILD pytest-3.6.3.ebuild 2413 BLAKE2B 56d11541e919a95919ad66efa0b4603ccd61116133381fac8c5ff605fc5f3b53792b611b7c40a6428d81890134c0482fba18e13575d2ffc5f3c96e5c982dd3ae SHA512 ac4a4fe08e095f1a9012346fdfae6fb926e5db595defbf1f3f5a15ef96e7325846536e277513cf3f79242dd26dd726622686bc534e9fbe53a98fd2d9c4285cba
-EBUILD pytest-3.8.2.ebuild 2445 BLAKE2B a3b8d228f33317817ddaf3e86091e17647f59279d7ec6ae34bc180c5f12aa43a1a86cc9f832112472237da897b4506daf0b97fe5e74da87028ffdb543b4f0520 SHA512 0c895d526c881e1a20d372833078efdc8ffba3bbe2b8c7d883a670ef4de431296430cf8f47bc6d2d77642b154cc44f346ead8880b891108d7bbe369e5ff1ac35
+EBUILD pytest-3.6.3.ebuild 2423 BLAKE2B 0440c961c535989ba617678c98e34986f856eb04069095f27c8cb6a0d4e4ec85cb32364e2ecad52f8f3b89e41f78a88b02eb9606f9bfe48c94c2e48644410652 SHA512 bf354801416969801698e10dd53c8c9d67d3c4947c072b9e5d99dd762de5214040fad2d150f603ce8e7b9ccec092786133de5dcd697ce60a99e8e79d1adfdfca
+EBUILD pytest-3.8.2.ebuild 2470 BLAKE2B 135acea00df46e33cbd0171542437f3f0960b6741764cf22fbc27e4b49c47ccb92bddfa0270c780893f8401ca0d70869bb0c302549b663feaebd22a280181f53 SHA512 ecf47570715cc7ce28918613c6636c3d412402ccbec280f180d3c2d463299349d88b1356c854b800504bf9efa2ac3d4e9991c58d0db996c426f531be653ddfcd
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild
index cc1697642109..24cb5009b0b1 100644
--- a/dev-python/pytest/pytest-3.6.3.ebuild
+++ b/dev-python/pytest/pytest-3.6.3.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
index 17be8889de91..9d2d6833cf1f 100644
--- a/dev-python/pytest/pytest-3.8.2.ebuild
+++ b/dev-python/pytest/pytest-3.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index c20b5e0abe11..d5a079a7ec74 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,5 @@
 DIST python-evdev-0.7.0.tar.gz 80508 BLAKE2B 9c3048d649d41b7fc0dfa1af14239a0bfbb5b85c577a8de0323cf35eff79324703987b0a5ec27c06fd277f6ddf76bdd1c7b0b2e589d03ec205c8a7eb0afcad70 SHA512 9757ce392d08f9de0446963cf5351a66dbc2373426bef26e63d71623df1f7c47d90f6e454649076ded214878e67f321380646da3f76bc0fb57f7eb9bbecd3e7a
+DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
 EBUILD python-evdev-0.7.0-r1.ebuild 645 BLAKE2B e63ee394c6c0728625f05c9d790de54fa3562d8ae7c278fbf9ce3dffbf50a9d845673e383debdd00655e5416aaf34ad609e71686b78ff7c4e971b866e89539a7 SHA512 60ec8e3d83f4be8fd85980177745e606fe5c4c2dd19a9ea7ee56c815a9b44e633ac20bba09a8b390efe58b8690ede1e25af21830138287e37b54e0aeb75e6294
+EBUILD python-evdev-1.1.2.ebuild 642 BLAKE2B 67b7f8265d7f1707926ff711b89e005667376e79bccc3e0f80a811c89abca41be7c6f6d6955e500f1ccabdc39373fc9b918dfa1ed2070290facc1d1e37b47869 SHA512 a74bf46bfe085d1fb41891aa196e17b1788e89ad9464ec11cb5bdc784e8e9844d3e12b39d5d31a9b3c0a729971b8dbafe5fa980f3bb12cc557681939c4561b16
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-1.1.2.ebuild b/dev-python/python-evdev/python-evdev-1.1.2.ebuild
new file mode 100644
index 000000000000..69f32c6049cd
--- /dev/null
+++ b/dev-python/python-evdev/python-evdev-1.1.2.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=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for evdev bindings"
+HOMEPAGE="https://python-evdev.readthedocs.org/"
+SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	distutils-r1_python_compile build_ecodes \
+		--evdev-headers \
+		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+}
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
index 953bb6280458..c07a58e1084f 100644
--- a/dev-python/python-openid/Manifest
+++ b/dev-python/python-openid/Manifest
@@ -1,5 +1,5 @@
 AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
 AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
 DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1549 BLAKE2B 1c7c42551a55176cc04e7e71abee2f6fbab0a0994cc12a64a0bcfd909558299b0d9e3d6734273c4da96231ab26f4eaff3f198136e0511148998bfefba0b47766 SHA512 959c5c7335df13084a95271c3ef77b213d49e85e0feb082ecdadebde40cb935e59554a3e4e587d08fe6edd28cbffb1c0315e641c180ba2da669cf750cf1848ab
+EBUILD python-openid-2.2.5-r1.ebuild 1570 BLAKE2B ad108ff49c65f3c6966a9728b4e5b431e5056a7a36c6e16259bfef9c0f994a6f1ce972e4e550e91e60df7b39efbbb1203bfed8a65e0e31b6c62f20bada611fd0 SHA512 c668560dff05a201003b40ff5d787c6af97b4c18737d2391c5513361de4fabebae465e17146ed462eb25e04c90d3f844a651117d8a38b97eb8553a35c652584a
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 20929ce8d3ab..895572db7ae6 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,11 +20,12 @@ IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
 	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/twill
-		dev-python/pycurl )"
+DEPEND="${RDEPEND}"
 S="${WORKDIR}/openid-python-openid-b666238"
 
+# Tests depend on twill, a broken package. Bug #285169
+RESTRICT="test"
+
 python_prepare_all() {
 	local PATCHES=(
 		# Patch to fix confusion with localhost/127.0.0.1
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 824cdf1748be..6520c9e1defc 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,4 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
-EBUILD python-slip-0.6.5.ebuild 1196 BLAKE2B 051ad41d882849722c11c3c544151ab625b883d1eac05c6895b5dc389eb5619a791266a89c71d3b4b9bceb9bcecfd6be935b025f192256dedf4181c696ca7330 SHA512 cdc08711a657dd3e0bab568af7aed001794eae7fec5ad4b307f7a6146338b67996b4e3f9e61470812efeb3b17ab89f93f5a853b8838e9eac921a898c4bb5cd09
+EBUILD python-slip-0.6.5.ebuild 1197 BLAKE2B cd08ddbd967fe01ace1f0d2fe7ff91939f1dcb86f815c5c1732a16f625e2d93fe16f53c38e407a48fb54230adc44ecc04590f0c1cbd6e857859c6d0274d1c9ea SHA512 df16c0b876ba1103abb1f75af14eecf032721cd9aeae19390ca0bb45f78cee3fe9f88512d46a3cb580d9ae72a693e9dced6a9ede6cfdd1baad6de194d8eefed9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/python-slip/python-slip-0.6.5.ebuild b/dev-python/python-slip/python-slip-0.6.5.ebuild
index f28da9d99a97..50989cbe320c 100644
--- a/dev-python/python-slip/python-slip-0.6.5.ebuild
+++ b/dev-python/python-slip/python-slip-0.6.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_REQ_USE="xml"
-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 eutils
 
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
index 70320291b032..acd5b9811d0f 100644
--- a/dev-python/pyutil/Manifest
+++ b/dev-python/pyutil/Manifest
@@ -1,3 +1,4 @@
 DIST pyutil-2.0.0.tar.gz 125079 BLAKE2B cac7ce94671dbb2b4070aac76da2d9f8b3a48640a2422e8f9fd0dbd6a61eee43636b9b8a003ee3c528ffa7e866baf0254c4a2369ba8038c63aa072e2df9556ac SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b
+EBUILD pyutil-2.0.0-r1.ebuild 689 BLAKE2B 3f6d356e13df9d58785f1505e09ef47aee954ca0771168f1bf7e2ad6e7b2cbf9595d7a12401c150c3c6dbe7fe6b810f0d2fef20a59939ecb87f36072daa72d2f SHA512 e5fee0dad5463d923dd71ff2687cd8edfc60c9cbc1432f314a1c4dc38a3568ed5813650780ebcb64b8ec567c6eea303b6c6314bfd1ff10633b5eeb431761abc3
 EBUILD pyutil-2.0.0.ebuild 644 BLAKE2B 47eaca54d26ad3da866e16e369f58de07bd9b206227f5d39f7f42d01fef18c27cccd07c6d772478476a5018c43753139b857788337a50e111c3af172b7f2c228 SHA512 8a6520c84e5f90543f19d4f412fcc3440239747bbb001e43ceedabf0d87f57d472788532ad0e33612d7bfa26258e7fa04b6b9c5f8f9761d6fde4ad2757952d7c
 MISC metadata.xml 744 BLAKE2B 92a7150e6ded208271a22f52fcee0d6402006ee4a71e97236652485aace07d35eaeb4094e6ab9ed6ae197fa91d4f5f6236f4e591ffb1ee3270e22bbbfce1e641 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..26c90066e3ac
--- /dev/null
+++ b/dev-python/pyutil/pyutil-2.0.0-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 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of utilities for Python programmers"
+HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/"
+SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-core[${PYTHON_USEDEP}] )
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	rm -rf "${ED%/}"/usr/share/doc/${PN}
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index cc330df8fd47..05cd8824fb47 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 45e4c6320d385e1653b710bfff8e085db962365615f5fdd297fa1fde160e8467b47bf5e4fef379094fe2515f885581393c7b6945795e7928e56061e68f2c4601 SHA512 47d56ca71160e66b44e6dd4ffc37cd368b97e1216703fddc30a2628dd03ca89a0507376bf9c566fd71b13f074093ef8c38501827d3cfbf947d042c05e4faa4ed
 EBUILD qscintilla-python-2.10.7.ebuild 1536 BLAKE2B f2c117e60e445d0697e41a7a526065e15dc64ade059b8d21f535f11d889d089428f50ac4358c585cded52c4e9a9ccf1525e9d79558ad4d5463d268cb84e2c865 SHA512 4851048fbc6b630f53c43b9ae4eced755d33068585e0f01ba6daed5cc7c6746ee8432394c58ef0872efc42f29f6a0f35c9349a5baa8204367886345c11d546e1
+EBUILD qscintilla-python-2.10.8.ebuild 1555 BLAKE2B 2175851a7f982fa4895bf71ed9680b02a214bf22fa8a2d0b1d0ed2059a9a42f8813ef321b29bc2762cc436a0c5cba7f94a99897cbf60f1494f23f4fe2b484d15 SHA512 0d754ec573d6e689d4bbb8c036444b5cc66c3f906f1e1cc7849763f154c0e668c4725707fecec29cd7cd1d4422dcca1bce287cd33d818f4ef298ff9acb2b05c5
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
new file mode 100644
index 000000000000..0c917f6bc805
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -0,0 +1,72 @@
+# 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 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_prepare() {
+	default
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			$(usex debug '--debug --trace' '')
+			--verbose
+			--no-dist-info # causes parallel build failures, reported upstream
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake5 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 637f4e70e462..3350d2236ca2 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-1.4.1.tar.gz 10700 BLAKE2B d2fc1b0695c6bdc7653862ca790e9f5ec87b25513a93ec058384f334b47d5080570e3511eb6680b934b345ef5562771a078fc4ced3ceed263a7aafd26af3bfdd SHA512 ab8a2cc95b852f91c614ba5a5a677d2b4b99d5f810ec8a11e69d97af58cef1f67457e1cf686a286073c85b39c2ebbeca0a459382e410c9e8eda12cecdda57f02
-EBUILD ratelimit-1.4.1.ebuild 566 BLAKE2B df2d66c46e4f034f22b058f533d763fe46c16d9675c3e1d5c726ca5985d0b97411b524892063618e67c259fc276dea7d961d17eaaf088fc26c5e63d7de24df61 SHA512 a8445d5d480db02949c0693b1e75ba44dcbaf474a7bfbd7b4aed8644c6ac1204e2278a10944ee9efe809e97cac777ebaa43b06990506669b6a899ab474e33ece
+EBUILD ratelimit-1.4.1.ebuild 598 BLAKE2B 1b5dad627c07655f69354a70114b93faf6b94cad0df5dea39284783d8a90f6f1596e8afc5f482f44ba8de93d581dcdf4ae6520401a89c5237e18ffa39964cc05 SHA512 5dca945ffe22dba01415ba5b3d9992f63d4c5aa5135450921dcc9af52d51f71c5e7a5a12f6d561712288f72058a5688f5ad001387bb1f44518a1d4a38981a451
 MISC metadata.xml 724 BLAKE2B 2ebbc8dbd58619d4978081c22d294e19682a10a159321b143e942e4a4f969400792a411fb6db3670d747fea6747927030d590c45251e753ff5183be3667297e8 SHA512 aec024dc134acf8c02150822fdd1b29ac3042aac96a5a54d5c1876e20bd4bf4bd2211374460b8dd4c19b37be44d063b5cd36ac77f196c30b4529c65bd7c45249
diff --git a/dev-python/ratelimit/ratelimit-1.4.1.ebuild b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
index 3c01b8f2c100..e91d5f08f03e 100644
--- a/dev-python/ratelimit/ratelimit-1.4.1.ebuild
+++ b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	# remove --cov args injection
+	rm pytest.ini || die
+}
 
 python_test() {
-	py.test || die
+	pytest || die
 }
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index c5f76a75d499..f6a957c6c770 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,7 @@
 DIST recommonmark-0.4.0.tar.gz 7112 BLAKE2B d0e0f95f251e859908523c90b012ef2b162823d72b87192651d08a9cb5217a8bf497caf0320cefd3e724f77d3ad4324db446ddb57de55fd308c7739b78f55c04 SHA512 30d900840093c9ee2c1a322aeaba64c06c6f236e4c86a8d7604edc7d9fb0e78d66387f844619364d9253585db3f38d212242d2798153f343bc01ad281c146c9c
 DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B 2225f8854eb92f9c905c5943c3d4db1cb56ccf22826f32101c9e8db6ac1a1658a543d58a71bfdd8650f225229be5c47658a6db9c6f535718eab5361589436d77 SHA512 4b4c3c9354c3de223c7d441b1665879d49a2f9f2328532901c69d10f4f8d90ff84e28aab3d1b4884edecd80071193ec69fbdbce735527ec2edc574b5a3d1fe88
-EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B ec4d65f0f66bc48f3081728404bb1772b93f7dbdadfd69b879e3efb50c979b6c5a8f94036e4e4b89f857b876e8b84fb7f2b97f2faa0372f7441eca4a4e56d839 SHA512 2cc8185c776395839eee64b6bf1beb7e8a1e8e6a6547c6fcef19d977318fd3b85f3c2a9a3fab2513fb462d905d788b8054ddd6cd5a970e4e6dab21f8f01e5a87
-EBUILD recommonmark-0.5.0_pre20180907.ebuild 931 BLAKE2B 20b3c54fcb6ef496e7e297ca1b3c5e4506797aad33148cf05d08ffcab49639cb8398cd22dcedcce7d38512baa752e1325f7e919b1669e8fc9a4392406ee6a1a6 SHA512 a9b3e620466eabc54db608f141667643b7d1a47eb152dce992fc5f36888d1c09241a1070a9527699cf6c97203d994ca52b1a7284a3758787e98ed99758dfa6ab
+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 941 BLAKE2B 6b742fbff5ef028531e8a5d68c8a252fb8bfec178ed290a2e178a7fa6904bd6060d27c84bdaedca68885ca9c12ad236dd81b0a37fa8d7d151f018910aacdb833 SHA512 9add07015a2a4bc6b4896ba88753073c33e912b6383c86a3ec09bc733493581185fe35dfaa9848b85b0dbfd19d29706fda5ff2d79e41ff8986d367f6442760ab
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.4.0.ebuild b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
index 70feb3a9e234..03f40f996221 100644
--- a/dev-python/recommonmark/recommonmark-0.4.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.4.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/CommonMark-0.5.4[${PYTHON_USEDEP}]
+	<=dev-python/commonmark-0.5.4[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
index 620a81e57425..1a9da7165cfa 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20180907.ebuild
@@ -14,12 +14,13 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/CommonMark-0.7.3[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.7.3[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
new file mode 100644
index 000000000000..504a334376e4
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -0,0 +1,34 @@
+# 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 distutils-r1
+
+EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
+MY_P=${PN}-${EGIT_COMMIT}
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 96172317a639..360c3c387a23 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,9 +1,7 @@
-DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
 DIST scandir-1.7.tar.gz 32812 BLAKE2B ed80775b5acca85d8829e2fb46df33fdda08d9dad6cc0e175d1270dc51b6eb4d381a5bd813e2dfd2072ac0af0d642d20ae818e569688ffbe5decaf4421f5e979 SHA512 47c6d9642938f374eb03228cdb6c8d77aa2af01a84b7efc518d223851562a615b616e92100bbeb38c4fa7455ef5f7ae4af8d406f5148d1a26a403708b4a27023
 DIST scandir-1.8.tar.gz 33065 BLAKE2B 020789b939f347de49dba6eb35cf53733a34b283a4226d91746dca4f26b0fdcbe708cb48a795085c8887921bdad77c3fd054c15dcf83b1f4624ee81f1735f2da SHA512 9c2c578cc736887e7d1ebe51f62569599e386deeac55363a84cd1abe4f73c60a43ae9849b3570ed99079016908ceab5e3755b014256d1cab535c1677255690f3
 DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
-EBUILD scandir-1.6.ebuild 558 BLAKE2B efcfb1c039107ed40ffe1939bd391b068cdf8149bc732a1c43fedba488ef284509501d1160a3d73268d69ac5a99f6ff14891c6ebbd95143e814f8cae64ca6043 SHA512 95d06232bab59651fca2bc25dd7b4d8f21dbc72cc3b41b84dd5585987853f26d72a132131e0a07638690e348573a809f2ccc3d61009a6d46f83e7154deca880f
 EBUILD scandir-1.7.ebuild 565 BLAKE2B 9d08fb18c8277903a9d1f2e38a2d5da42c095ff3c9c4e9919fd23c408d64156651188feed20df5cc03569419e8c1372f0e3653fac168e5b3de85ab0cb572ce28 SHA512 f46a08f4858fdabcdf8b0221b956aa589bffe1c0c82d16540ca1efccb4dd2925abbb3ef57a5a5a53f551023cca7abb8d17d3b630a1c61d1467de0b1cb7cdd528
 EBUILD scandir-1.8.ebuild 571 BLAKE2B 528c6b3487876b93305bcb3fd631ac0bf7cc469b35b72c5b74865a1b6faf5c4aa65f0cda1e422bb94ef6a8cc90081ea969d63720bece9fbb1b1b9d882df7b8d3 SHA512 86ce0e8898cd439682ac0e2eba784c50eea56cb9ea5266b6243dca2ec3b7ccea00abed36813d8f50e508872d7bbf721fa97771dbcae33a16d68877b6c570cae4
-EBUILD scandir-1.9.0.ebuild 590 BLAKE2B f47d3adb6f90dabe4e1a53a8fa8932355c5899a50504445b65a5670ee6e6c92122e8a102d3390465bf04120f31791a78fa7f55c9e399bceb6930acc03ce57176 SHA512 85c23ee5f97299a14e26724090dad635cc3635be77026e0fc60b60dae93ea9bd49f599fd84de5c667fce4fb3665efbcb4a67e74b3d4bb03b8568f4b70a860733
+EBUILD scandir-1.9.0.ebuild 597 BLAKE2B a134f9670038c6c6df17215c35652b57278da07cb69007126830e5d40158f621c9d92f292a865a05f95347808f9545763d46cb6121d1453ec3f6511d93c9694b SHA512 b039ba15235ce22e7d23d6d407f39a3a4ee699bf98bb38330cbb40915181b73748d3d05bf947beaabbee2ba9d774942ec1573f3e47db997d37386761ebda933d
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
deleted file mode 100644
index eee1a9dbdbf3..000000000000
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ /dev/null
@@ -1,23 +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} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A better directory iterator and faster os.walk()"
-HOMEPAGE="https://github.com/benhoyt/scandir"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
index 1638006bd12a..0f9236b7bf7b 100644
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ b/dev-python/scandir/scandir-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
new file mode 100644
index 000000000000..5147947c9299
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -0,0 +1,3 @@
+DIST setuptools_scm_git_archive-1.0.tar.gz 2553 BLAKE2B a5ed592384800585b3f58b40571edc929872908bcb5e2d012cefe34e6cd84ee420a3bbbb9e856ef0fbbb972931abb4913d245b98d54b82aaf659247b92a1303e SHA512 fd1a06c86d1a8394e37b91d374b93dd5902906795360688b49077a4530240fd6be575ee66d51c3f61931bc837711bc3c59491d7c9cd165c34e2ec1f314b4cfbc
+EBUILD setuptools_scm_git_archive-1.0.ebuild 694 BLAKE2B 803bfaec25f7a4faea9e83a10b6b1946e82d69b4bfa52a28523068c77f6559028c1d4c9a05e2ed7062e7e6434a375f2ce914fc692be20d3a5d036e8f7cd9982f SHA512 f110359330f2d953ae4a66da6e43543a019719cad5646b679641127afbfde525fc330ac4d29ac22db7f89abff9b0560a074a640b78331685d124861cda1fb6eb
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.ebuild
new file mode 100644
index 000000000000..350a0c13b3ef
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.0.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_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive"
+SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 59fef384a1ce..8506158821f5 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,7 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.12.tar.gz 1036410 BLAKE2B 11f7df2ddafe0ceb1edd75d3cc5128c32d7aa2e9a77ad4555d69bcafc87f8141384928cdf2481c324998b2e224920b50c0f397d67314370ce30cca6d7a02a15a SHA512 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.12.ebuild 2779 BLAKE2B c89ad98b6a4fc5c48440c6ce3bbac9ee1f7924b56fd481d4a5d4c092309634a8cf75e36b26b09d2b60d5b9c9dfcb7ba98507d249c3693c404fa9a0b65953e6fa SHA512 89ac3915fae1296533265b373fe554d704280b4f936cf6362f5f4e43f726b01bb057c813e4eceaf91cc2abe684c6c7684144751c74510660c9ab2af084499554
-EBUILD sip-4.19.13.ebuild 2776 BLAKE2B 16ea86519013bd7ba796e2b6c5e785203cf3374802481c65e20b300ec45727c78ac8a0bd298f9d247a8b56beda81d6e2021edab657c5624b85f62c07d11a73d2 SHA512 a401b87abf046d9cbceddc521ba5e91db9abf942e7d69037c272bc070b13fd5d788426fc5d5480066c21993d20e0ab857b8af1b530210fce6014f945e41589d2
-EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
-EBUILD sip-4.9999.ebuild 2651 BLAKE2B 9d70dd20b5e89a6652fa029e673331ef088d1b19e98a5e958fe453591f4d21420fcbd4ffb103c572b2176359d6cbf76804722983ed9ced2b7c805588af0fa811 SHA512 7157f51e4be926fb6572886f2fafbb0d23ebfaf21233a348a0abdc14400c3f5f52c3fef2e7174664b0a91cf3e33303c0e963b7030f1fb62b56a2550b7f192c57
+EBUILD sip-4.19.13.ebuild 2862 BLAKE2B 75d9a395c0dc7af9816c5952f6c3ba686c5cff2805452169de03509b9fc266fbff1f531ca5fb8a53bee0902d1810175fbf75c590aeb0b514154f883857f06f0d SHA512 1fc425205511259a8d71a9674b75b5d3478044e3a8255fe13d8a1dfcd4a0f33fed13e1c5414438c4867a6d40e566f4545022a58ab80f748151a06adab7ce90bf
+EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
+EBUILD sip-4.9999.ebuild 2734 BLAKE2B b2a2544bde99d02ee2a8d4381969c602338debbee3f1763d4be5f688a0c0a84e981e641e04292765d4338753c826b64f62057680ebeba13a227b1beb361429e2 SHA512 a58f2ff74967dd2eb605d3e99ff0418e419626612fc4d4da18dbdf211f92050dffabdde949aa5b78807efb51ce3c9d33fb9c2da1ac8b2a2f30b3a20f6ba713eb
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.12.ebuild b/dev-python/sip/sip-4.19.12.ebuild
deleted file mode 100644
index 6707912b3761..000000000000
--- a/dev-python/sip/sip-4.19.12.ebuild
+++ /dev/null
@@ -1,112 +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,7} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index 728a604c424b..3313a4fac4da 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index 973f1ae60a02..bd65f8202bbf 100644
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ b/dev-python/sip/sip-4.19.8.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
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 3fe2c1981bd0..4df03eb6f4e8 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.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
@@ -69,6 +69,10 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 7085777e4e51..a2e90ef11da8 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 538 BLAKE2B 5dd5b20e7f382157d748baf695592c48643e97af2ed8557f565b799578b11356a1785e32cdd98b2dd1a6c29c4468c2111770d8262b84ecd5dd7f7501fde7b415 SHA512 deb99fd8023fe6c8a13f694735828654fd22977b8cd31a427f6b791a45ad6e53d0685761051111e8809547f24eb8ec403bfc5d6b403e2ec0a09795ef021798c1
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 542 BLAKE2B 865fd5d6a280bb83e979d8f761541e0d4062a7a53aa97ffb62a8cd2c8484bb161874a44ef21b3b3646bf643cbe2b2714eee1b308c0323bb36609d0a02cbfe7fa SHA512 e20fd1c014a31d6fcb66ae67570f173fcb037a8ab28ff486b37f65f33e859fd5b96d887489d0473c48872ab8a8517dc6f28f2699c774ff59f01f28e311a032a8
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 551 BLAKE2B f2037a2bde3b6b2c0b6900ec49ece40056036d8f2534b6df0152f5459210e86d13f9b3a24efb0d800efbed7b0a9deab27f09e87bbbe806535aebe3f9bc3cba4b SHA512 2b1e543416b8d560910ad2da6158cfc92f90ecb655d365156afb25dd5515705f8280db65bf0d539830209e8129cb8818b951e00ad5ac2e27f3547355567ea20a
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 558 BLAKE2B 84ff9e41b8c4bcc1a708ccc2073409e01370c3f0019c3fee9668a84aa6e859af8f3079a7b55fe5c1ce791f4869489507503d3ad9ec5ec5d6f0bd9eb365b92e67 SHA512 de6aaf5456269efd67bb6cf7589c47fc2a43ecee0b1813a8154a9233f7fdcf8056d610e27a5eb54766ffcbfa1b48707828bdf79a61e75345363d2460faa5c262
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 0dcbaa7f997e..dbc301b66f2e 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~amd64-fbsd ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index bfb538339e6f..0890ab19d203 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,18 +1,7 @@
-AUX sphinx-1.5.1-fix-pycode-grammar.patch 525 BLAKE2B 67e574e914162110cb5cd59dd9cfc12abd1d2f35df556b90f163de57f7c1787bcf189b607792cc7002ad0d4d865e39d4739effe69e766954916cfd9ec4d6a8cb SHA512 9aae50a1089fc64fd0bf11890e08cc2d22f14adcb191985925811d819bcb59031fcb91e9281171ed11849644e277aadecf9b98c1b3cc2347e1cb6daa9032e3dd
 DIST Sphinx-1.2.2.tar.gz 3143671 BLAKE2B a21b2a060363ac86832a6a28a623ed410ff0bb39ca3c9c58618ade88f4305996e54c559bb588c518597e31a73fc16e0c37fc57950eb077179f03715dfee72729 SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c
 DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa883aa8a9e6c180bb74de666b45faef24a55c0bfd3aa1f22bf3e632e0e95016eb1bea54e8b5ebc7df78756763b5c SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05
-DIST Sphinx-1.3.1.tar.gz 3469782 BLAKE2B ae2fa602a7873e6ef735decc2dcdd5a2632b848bb8394ee80b4215e21bfe625645fbf905a6661c333ad062e17f15b6f2c39027b44ad827f66c6467a78e8c4490 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94
-DIST Sphinx-1.3.5.tar.gz 3679978 BLAKE2B 2a88859bfd4a3de75a7b56fce65086e1239c3c58730280df078b3f76d368028a124aa6d4ca65c40773efa4c1a83dd047ea0d647582057c63bf82dadb5f2549e9 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc
-DIST Sphinx-1.6.3.tar.gz 4674251 BLAKE2B ba13de3d72fbc5cbc3632a1062001ed287798efe5f04064d241b645d6e4c52c9d9c115aaae4ae7b94213bbddf595a93480788d66b3a54eac3c9fb415d007d4ca SHA512 d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae
-DIST Sphinx-1.6.5.tar.gz 4680974 BLAKE2B 97b0cff21985de071d29651824f2954ca4d12c5095fb8049597235c8071bccb00344e89fc4a90ca010fe79a76faf0e5ae2b09ed698f1c5bcfd8f06de64169107 SHA512 c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d
-DIST Sphinx-1.6.7.tar.gz 4692169 BLAKE2B cde46b6e9dd2c39a592802e57becbb6f61e6d370ed08fdeb41270c8177818f48f68a6e03c174b8d70453ac6f936fa25a4c2bccbf9eb7e84a008027321db93209 SHA512 bc852d4694bf433a8a1d931bc67e4c8bf50789f833be8a338eb934325734b9fbc361c1d203ecd6e28f9c0dff5edb090556372d9403cc55d4972b18bdd4b7bfd4
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 EBUILD sphinx-1.2.2-r1.ebuild 3045 BLAKE2B 315adfce3238e7b3c21465cd16e9a682255df98cf1c2289e3611a946f3642a9df204952d15a5947d1db2e4edaf909457bf78fc995e9d2d7b319ed8d82bd4ab17 SHA512 74d6530a5e4db4dc519eda8e4c9958fc54eb0767b00d6a69334a7c9e515bc878781c09b20e4ea5d7a23e55f3aa3093940be58013a42ef4507cf6fa2b3109007c
-EBUILD sphinx-1.2.3-r1.ebuild 3107 BLAKE2B cad89c3205b3987a80905a95798516a9ca8d6769aa3330bb1648b3a795b32c49a90b3bdb63335f4fb35f4ff95437588c863179d4b8817dd9ad83ede7e3a1ec5c SHA512 91fab1a458af03e497be8527a9afaef1fd97a2115eef6b8e549020701460cedb1e75b3c20f4fabc132f40faeb59880b45d13f5a80bd2c709fb949bd4863fc214
-EBUILD sphinx-1.3.1-r2.ebuild 3463 BLAKE2B 58106fef573a7bdb9e90c67a67aab596ffaaf01aa869111d8422c2e58e0a8f8236ba326bbfa6b52652b48166e7208f652ee1330a55b6d1bb9124ecbeebbd3c5a SHA512 cdb919b247a207534a1b27e7727e00b3e8dd0eeb3c3ed3aa63f59493f1a9840277d8b053a3cff4a0db53b687ecb6ba16d0558aa0697534f7adf211887b72479f
-EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2aecc626d2d4a9370dcb696ea16ee08970eb2129c11fa601a043bf7bc783a8bca8e52f04c0a3b77fa1d197feef58b SHA512 bf4e5d4d5f96d3e0114fa81cb403081a68892580c651bdd7712e0ad06b96ab7586fadaf14c83bb0fc9e5c36f06c13fee72aa4805e12895cb1eb27fb649f26248
-EBUILD sphinx-1.6.3-r4.ebuild 3426 BLAKE2B 0dcfb96abd86c6b0439250adc8004894fd653c5070a0e3a425cbaf063c6dae7da3a48d0280a2efcbd65a7d17114f2dcff27d4d970b37af8bdd498db2a79822fd SHA512 70209e8e3c8c5b463ff5320e00efd7b1761dd7e270d4991c9e43b9a360dec966a94dd83dd65ea3d0d01eb9289a4658492809109917c4490124f1822ebb7ca217
-EBUILD sphinx-1.6.5-r1.ebuild 3496 BLAKE2B 61d468b87a23ec4d6247a4ee553d3ae94060e77f7fc4caec8b009cf43ec8849cb4cad2ac43b17ea46daa2b0bc313ee16df571660c1f6015b3173cff28c54774f SHA512 bb3cbc542479b8dbd418af82b935e389fac07d19ded44fa64251c17ef26c4e5500c97aedfcac52ad341195fa278d9235874dba18044c0feb1cbe10069a86d149
-EBUILD sphinx-1.6.7-r1.ebuild 3513 BLAKE2B 60d8965d972f777f87a25fc6b458f987da321dec1dd749d8faf7d5d875ae388d00d071d0b00b09f9e5738b5b938640e2a80f0e3ecb078efebd3c9439edf9246d SHA512 a39cfc9fe463d9100c13beefc0025d8d4cdd1f23509571ad5bd867d86cd469342aa7b66a5c350cbbf7904611369868191f31239726b48af5133f7abf31028c9b
+EBUILD sphinx-1.2.3-r1.ebuild 3104 BLAKE2B 5def64661cf250461a510307eface9a79577a19f8a0c347e6c3a2b5c0861bdcb075204d26e56030535fad6a96978344c650907e15aed03a859d4de9f6709252f SHA512 2106fa9b8fd5fb65da085464a9d6133cf07bab371fcce363ed0154fb0a86543047910b571d71f8f28e523a311f6e193cd3e29d777b28d6109681cf2ada1fdd9f
 EBUILD sphinx-1.7.5-r1.ebuild 3300 BLAKE2B 2bc93273d9fc49adfa033126c59f3383754537ef81632e6b47f3707fbcd62895325869078ff6cb5a6f4ade8439ce676585be2954832a4b6d2fda5aee67fa7999 SHA512 e90d2932c53cdb9d0628083441d48cbfd1c1aa3bb215058a55dee6977a1f2d7bfd36ea7e3c220c3b629c03805f0f7327597f8bcf0a87db71228ad639ada188b6
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch b/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
deleted file mode 100644
index e72d4d45132c..000000000000
--- a/dev-python/sphinx/files/sphinx-1.5.1-fix-pycode-grammar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-environment.py has been turned into a directory,
-without actually porting the code using it.
-
---- a/sphinx/pycode/__init__.py
-+++ b/sphinx/pycode/__init__.py
-@@ -352,7 +352,7 @@
-     import pprint
-     x0 = time.time()
-     # ma = ModuleAnalyzer.for_file(__file__.rstrip('c'), 'sphinx.builders.html')
--    ma = ModuleAnalyzer.for_file('sphinx/environment.py',
-+    ma = ModuleAnalyzer.for_file('sphinx/environment/__init__.py',
-                                  'sphinx.environment')
-     ma.tokenize()
-     x1 = time.time()
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index a3f6c9baf00c..225e80dc9d88 100644
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
deleted file mode 100644
index 13bb7fcbe9dd..000000000000
--- a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,134 +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} pypy)
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-RDEPEND="
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
deleted file mode 100644
index e6be7b1317a4..000000000000
--- a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,136 +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} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="Sphinx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc latex test"
-
-RDEPEND="
-	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	!=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		app-text/dvipng
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	"${PYTHON}" -m sphinx.pycode.__init__ \
-		|| die "Grammar generation failed."
-	popd > /dev/null || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die
-
-	if $(python_is_python3); then
-		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
-	fi
-
-	nosetests -w "${BUILD_DIR}"/tests -v \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-}
-
-replacing_python_eclass() {
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.1.3-r4 ${pv}; then
-			return 0
-		fi
-	done
-
-	return 1
-}
-
-pkg_preinst() {
-	if replacing_python_eclass; then
-		# the old python.eclass ebuild will want to remove our pickles...
-		backup_pickle() {
-			# array to enable filename expansion
-			local pickle_name=(
-				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
-			)
-
-			local dest=${ROOT}${pickle_name[0]#${D}}.backup
-
-			eumask_push 022
-			mkdir -p "${dest%/*}" || die
-			eumask_pop
-
-			cp -p -v "${pickle_name[0]}" "${dest}" \
-				|| die "Unable to backup grammar pickle from overwriting"
-		}
-
-		python_foreach_impl backup_pickle
-	fi
-}
-
-pkg_postinst() {
-	if replacing_python_eclass; then
-		local warned
-
-		restore_pickle() {
-			local backup_name=(
-				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
-			)
-			local dest=${backup_name[0]%.backup}
-
-			mv -v "${backup_name[0]}" "${dest}" \
-				|| die "Unable to restore grammar pickle backup"
-		}
-
-		python_foreach_impl restore_pickle
-
-		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.3-r4.ebuild b/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
deleted file mode 100644
index 7f1d945977a5..000000000000
--- a/dev-python/sphinx/sphinx-1.6.3-r4.ebuild
+++ /dev/null
@@ -1,117 +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{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.5-r1.ebuild b/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
deleted file mode 100644
index ad810d050f81..000000000000
--- a/dev-python/sphinx/sphinx-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,117 +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{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.6.7-r1.ebuild b/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
deleted file mode 100644
index dbbac7ab54b8..000000000000
--- a/dev-python/sphinx/sphinx-1.6.7-r1.ebuild
+++ /dev/null
@@ -1,117 +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{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils versionator
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://www.sphinx-doc.org/"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="doc latex net test"
-
-RDEPEND="
-	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	net? (
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
-)
-
-python_prepare_all() {
-	# remove tests that fail due to network-sandbox
-	rm tests/test_websupport.py || die "Failed to remove web tests"
-	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
-	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
-	emake test
-}
-
-pkg_postinst() {
-	replacing_python_eclass() {
-		local pv
-		for pv in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.1.3-r4 ${pv}; then
-				return 0
-			fi
-		done
-
-		return 1
-	}
-
-	if replacing_python_eclass; then
-		ewarn "Replaced a very old sphinx version. If you are"
-		ewarn "experiencing problems, please re-emerge sphinx."
-	fi
-}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 4fcc3bec44e2..1e9f7d3682cb 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1168 BLAKE2B 1fb6ff315b60be5878bfbdfc93c3b35c04f556c5e43477f65a58fd3151cda904547443b411805e3ae3b83a3b5d10659835c782824ac5958e8bfff63fe7d62d8e SHA512 971dafa099def45c7ca298ce7898dea6b10b11e98eaa1179340accccd6e788be01d9e7f3c6ab32d42f717f3725b7c8b617856d535d221db1f93bdf1f6bff9112
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1167 BLAKE2B 544d34d18d1d074e60adbf614beeeced16ea2e8bd1427462e6cf0630a39b6ce5fe9bbb8fa4ed7766e32ab69b739687fc54ee5e58b794f5f2231e8d5c31e1fd9e SHA512 6d7bc98fdfca0294b18d9445ec91d3873c1d85106f9ccc8ab9da5e181dfe4ed90b3738ea5ca61aec54b3a3de974bfe0387c2e2f321d8f4611cb52c072f0e4d55
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 1b01a1560b5a..a37ac0142cab 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index e1ee0a5b16f1..2106b7ff021e 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,6 +1,8 @@
+AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da342bb43f1a3bf3ca68955bb4c809b5f821246963eb5afa56c7425bab0bcb2ecaa3236225ba38a61868f6fe5b2ef75c1f05f30c209dfb87b4e18 SHA512 20266450a59acd595477466df49dd430db17ac4b4010a7b247bd962a880f48e97298efb0617892ff0f45a14b18bdc88a47f6be7460ce6a931e72c85a0baa4e09
 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.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/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
new file mode 100644
index 000000000000..afb8ff6dc461
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.11-disable-sphinx-exts.patch
@@ -0,0 +1,13 @@
+intersphinx: prevent resource downloads at build time\
+issuetracker: broken. see bug #527188
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -28,7 +28,7 @@ sys.path.append(os.path.dirname(os.path.abspath('.')))
+ 
+ # 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', 'sphinxcontrib.issuetracker']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # link to sqlalchemy docs
+ intersphinx_mapping = {
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
new file mode 100644
index 000000000000..0cffbd3cae35
--- /dev/null
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-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=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="SQLAlchemy Schema Migration Tools"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
+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"
+IUSE="doc"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/sqlalchemy-0.7.8[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+		dev-python/python-sqlparse[${PYTHON_USEDEP}]
+		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
+# Testsuite requires a missing dep and errors with poor report output
+
+PATCHES=( "${FILESDIR}/${PN}-0.11-disable-sphinx-exts.patch" )
+
+python_compile_all() {
+	if use doc; then
+		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
+		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
+		emake -C doc/source html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/source/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index e38397a00a65..35de9bc2212a 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,5 @@
 DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
+DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
 EBUILD statsd-3.2.1.ebuild 614 BLAKE2B 3daf96bf745b084b2ebb1f26baff30b54535271e3d4217983b87aa357b3fe1d48e0a9d45d93b15f7b34afc36ee057972da4d95eb36888c67fd1b0ccad356c6a9 SHA512 235744f449eafed4bbbfa1f16d36aea9e74434e7643c463d3468389211f97e916d98ea07bc0a7e7ad04d2d136861cc45ab87c1cc8e3cbb2ee161d7af85661192
+EBUILD statsd-3.3.0.ebuild 615 BLAKE2B 51904273b99b60e3011f3dade216c8b006c7132fc97d6ee643e92b5ccb2c720d1abebe9c770db9ef44881832e687292544da4d5b5c754abd3938fe3ac3e1feab SHA512 847f6e0eb16eec3a10544408da0722dc1dc2ab4b7e6984b5d1c3973b524b2b34470589acb91222110f1f251fa0813b1fb038cd6957c357977c280ba51fff4903
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
new file mode 100644
index 000000000000..df10878f5be5
--- /dev/null
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -0,0 +1,29 @@
+# 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}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple statsd client"
+HOMEPAGE="https://github.com/jsocol/pystatsd https://pypi.org/project/statsd"
+
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
new file mode 100644
index 000000000000..f88b4d59e335
--- /dev/null
+++ b/dev-python/svg-path/Manifest
@@ -0,0 +1,3 @@
+DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
+EBUILD svg-path-3.0.ebuild 634 BLAKE2B 34216103b9da6974fa35995433c17419178f9f1fcf60fe94ccd868f61470fbf45fa1223732c1e88848296ef742a37888103ed54b919e2750ec35a7f5fa903e11 SHA512 bdceccaf0e5bac88b788abf7477605d99668a94f57fc1f194ec71539f2b46cc317e7c67044bc2b97c5ced41237cd327f38e7a14cff7ca4ce66fb67e701b5ae4d
+MISC metadata.xml 710 BLAKE2B e7aca93129d338f2100be70376ad2c995bd03c63d1625e6ebbe033ff69641f0a6d5f31246a71224be6b7fedb10e9523f97dbc2c7e80ea49e6848ddbdf4e70742 SHA512 62231c70791c98f96a2f52c653a2d8f3c80282ce23e445f0a4375fcbb98f797c66dbfc04127f6ffc2d13b6fef4675f83a478ac8d35110950ff21485612c96028
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
new file mode 100644
index 000000000000..e87a1113f92b
--- /dev/null
+++ b/dev-python/svg-path/metadata.xml
@@ -0,0 +1,21 @@
+<?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">
+		The svg.path package provides a collection of Python objects that
+		implement the different path commands in SVG, as well as a parser for
+		SVG path definitions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">regebro/svg.path</remote-id>
+		<remote-id type="pypi">svg.path</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/svg-path/svg-path-3.0.ebuild b/dev-python/svg-path/svg-path-3.0.ebuild
new file mode 100644
index 000000000000..7856e4825787
--- /dev/null
+++ b/dev-python/svg-path/svg-path-3.0.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 distutils-r1
+
+MY_PN="svg.path"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	esetup.py test || die
+}
+
+python_install() {
+	python_domodule src/svg
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index b612c5e1f059..b74af9afdbd7 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1011 BLAKE2B 4521598f1f69f21bc55b08bb3b41f78147b44452cf37ace367b41d849a2af93e526a94f013507a735b48ec50f0b73e631d33706def20b5cbb4f75ce72b45dbb2 SHA512 33734d9f9a60af07a27f315ae3799bc17f58b6627cf5cbf2d119ab8fd33187f8c1e8e45f4373e12b23ed364862513a4d4425e959116779f42bf986e9a0943d40
+EBUILD tappy-2.4.ebuild 1018 BLAKE2B ed5588894d8b357ff478e6bd29abaf6055c39c560b9e280e8466a046cf83bd36f78290dba4a580b9cc688de985fde4609030956b91c9c3c3b711cb1d3d04fe8e SHA512 1ac5f5508bb6e5e7d4e462c1af6d85f587071f890f4deab7b8b8d8f48e100c0ed5adbf82836a3c29def07583adfb88dc70647c3fd85612b8b09fbf166c01abfb
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index d11f0ba727b5..05ef10beab85 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.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="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index f5f40efafe69..f38ec1df42e9 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -5,5 +5,5 @@ AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
 EBUILD testrepository-0.0.18-r1.ebuild 1264 BLAKE2B 3c5a2f064654840ca87db24932e4cb5b1bef6e2a485a030d2ce84e21cd444ebb4cc6832c5ad8426c1b373c883e011844910158652be220a51359fff143ca8f68 SHA512 8c6d2b3a20fb4c58a78e466c61a153fbfeb663425978facd849987e6c8b994a9e95c944787cfb40acd88a3f46dde12609ce8610242c790e8e9169e36526c8153
-EBUILD testrepository-0.0.20.ebuild 1311 BLAKE2B 0437e9e974722cf10e76582e1c5c7e3682bb306ffad399a4180f40fc4ce14f1629fef3f29984993b75abba240566e34e6542ae2fec4e96504bdb4a6469e10d5f SHA512 f72503e471b31d583e170e5434c679fe2696d369442ff3b32729cc926388e6f61bc488ba7b6dcde8ed362ef24894deffb9cf8cf0aac6e135176b7df3e396422f
+EBUILD testrepository-0.0.20.ebuild 1307 BLAKE2B 4fa42298a4f974da9aa35b081f162ecf14aa10c86cf52e9f0d4e67a7af2c3a05a870782cd654ac31358d93407526820d9d5bd2f3a626deab3eba115872d74f58 SHA512 3953f876aa7fc1439cd9857e20401ec336d177faf10b1634c7f253a3f8fa7b4b6f766dbe28146765c6754a0c3b2d0e218d53d6d4a3d6a931b8c0dd0cbae6dc10
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index 43149204533a..c8ff477776f0 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.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=5
@@ -14,7 +14,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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 1856616b10d5..11d880545a6b 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,3 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1239 BLAKE2B f362990652e3cc7fe7b3b255e6fd6d067027c252bc8e9ace289f2f0cc245756dea39da736719f743bbcad309ba95be1e9cd9ef675fbb080ebd85794d9a369530 SHA512 c423fe8f7c4fe555230365e7ae6db68f17d1fd451de8a2782d52b1455dbda246acc50b14fe30a66bebc1901701d176a4a74762b2f79ea0a7709bdd8780048487
+EBUILD traitlets-4.3.2.ebuild 1216 BLAKE2B b5b73ca89ad3aca5ecea9324382f8ea8758120d4adb416084ac9b4a438f4d1ee2e330200d29748afaab360a71eacf8b51d6451c0af2c0859f39dd8bbe7cf5ba1 SHA512 e709552faf511130eede66caaa69deb7c3c9e363793c735ed6070c931151ab231c226e401360c9f24a2e9e8f143bf48de93a5be10d42f5f9daa62fdb21e33762
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index 51bc865fd59b..c9a8ea73a32c 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.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
@@ -29,7 +29,7 @@ DEPEND="
 	)
 	test? (
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		)
 	"
 
@@ -50,5 +50,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test --cov traitlets -v traitlets || die
+	pytest -vv traitlets || die
 }
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index eab3bd4d5fa8..4caefd01d423 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -2,9 +2,7 @@ AUX txaio-2.7.1.chained-callback.patch 1297 BLAKE2B 41aea0fac54ef4256e191d7d505d
 AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab23c063297f4ab79d3cbb57cace511b92e357cf54a283d0f096de9d3209fca266238282cd3a1e77039332c696ca00e SHA512 bcf4681ca1501dc9b21514dca68fb36d6b50550fe1760b4af00786a698b26c3fb64afebcf29c2404dd0923867da010bfa41afa9501f59f43306b55871d951a29
 AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
-DIST txaio-2.8.2.tar.gz 43670 BLAKE2B e5238e59964b2ddb3ab400b2e2819c25a9ceed2da7db4c8a6e450f45314818b5c5dbb9f6e9bacbda738cb382a5b63ddc6650278b35734e48aa0e59c5c581b8fa SHA512 8b60a64ebfa1208995bc42e6ccbc87c4c3cd4687cb431435c6450cff31e5d0dba468c3f3494902e666cb2ee6dea84ded458fd8f1b3b9c25421b440dcd3fc5884
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1951 BLAKE2B 279769adca8634a3db2fcdb2bd8d6a34a2400e69394bb04f8b5b8e9d67e73721f566165871ae0cf85d4c5585901fa09411860c52e1cb800a71293fa7a99a2759 SHA512 4648355ea28264e43599a3b924497b8d6fccc68ed80e4b126aea7e90794a87af76db76b4d3c95feb3406a3e6482bbef88150d0adf26f089d949a9857643b7051
-EBUILD txaio-2.8.2.ebuild 1790 BLAKE2B 1e07b504a86e8189dc4a188980573e0188e134d6b6bb54a11a79d10fa7e2b5b3348ffdb65b3aa40812e845349f72a87f714e98f7c297af9cd9116c9a226f6e10 SHA512 103699f096bb49daf1ffcbb974eb6b3230cb413db178740b86e61133accc3c5b8b11d1aa6e668dd21b65d4a2dd5b8dd7021027c709c533224953f21fc62ca70d
-EBUILD txaio-2.9.0.ebuild 1413 BLAKE2B 5c37bc1d4a532405b952a5cf3137a3de7127e112389aa1b11939545fb4558e8102a731fd5d3a615a84fe03eee1b6af056633cc85db64a970b0360f7f589197fd SHA512 f49b6078a4619a26f02cce30d9df4b9da63c388d748e2aff02b630e99ddf74ae6d910f8130ddb4bf2d19904a404428c1c06b3c8c70055cef918f70aa026d8ac8
+EBUILD txaio-2.7.1.ebuild 1812 BLAKE2B 431e8137eb508b5ff8f6dede4f2340777091225abf8f4bfe0b9977be8e4e4c81d5d402d1db3202f864ca96d5ec43c900b8cdf4cbb2f65f6355006455a85cb736 SHA512 904986b3d0f8c0d4e1de68e7b2515bb36c99a0b611bf18b0a67ac3b0bc30c8077f236c371e204a2e267130f859c457347d93cd1a0651acf55ebbb62a571c15ea
+EBUILD txaio-2.9.0.ebuild 1411 BLAKE2B 6f0eaf570e404f1ed2e6098ff1d3f6ba1df7fc99f9a4f8cef3de8bc09dcccc593e94c4918f148cda0769606ac503b867b9304bd4d36b6b8200a94a7372350fa6 SHA512 b461afe759d5874d5b6bd5e425a3c6696ee82f05a6854d97e15cb4593c37cea449bd2e6403fff19a55a38e7483ac66b9059bdd16f7c8dde0f88d82ae6a62f788
 MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index 0d6b45adb066..b40110804ca1 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,10 +29,7 @@ DEPEND="app-arch/unzip
 		dev-python/alabaster[${PYTHON_USEDEP}]
 	)
 	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
 		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
 		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
 	)
 "
@@ -66,6 +63,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
deleted file mode 100644
index d75f1ebb10f8..000000000000
--- a/dev-python/txaio/txaio-2.8.2.ebuild
+++ /dev/null
@@ -1,65 +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="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/trollius-2.0[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '>=dev-python/futures-3.0.3[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-	)
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/tox-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/pyenchant-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	default_src_prepare
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	rm "${S}/test/test_packaging.py" || die
-}
-
-python_prepare() {
-	# https://github.com/tavendo/txaio/issues/3
-	cp -r "${FILESDIR}"/util.py test || die
-
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index eff2bf41f96e..aed5bfe9cfb7 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.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
@@ -48,6 +48,6 @@ python_test() {
 }
 
 python_install_all() {
-	use doc && HTML_DOCS=( doc/_build/html/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/ufoLib/Manifest b/dev-python/ufoLib/Manifest
new file mode 100644
index 000000000000..8eedc868bc1c
--- /dev/null
+++ b/dev-python/ufoLib/Manifest
@@ -0,0 +1,3 @@
+DIST ufoLib-3.0.0.tar.gz 115234 BLAKE2B 0bf7dff335df312252f3ee19a365f26d43531ac2d9b5d526af24038326e6be9d3b21f631ccc85199baaa827e02380b11efbd845efdbac158ba9ee96b947c3bf6 SHA512 c9d833dc51d0b6760d41832704c502ecf114a03999e449976b15c675fca265d2c4a7b396934c89bd7e4d1c0e893c86c713bab77bb9b14c4aff4edacb0089773e
+EBUILD ufoLib-3.0.0.ebuild 641 BLAKE2B fc2cf5a7e8a4a3665e3da752e870b909429800a1bdacf7a3261f65043aa17f7b19268694664b060b0ab8193d509e8e51d76a32b7a4603392e3ecb192247a3379 SHA512 0e8a6d2b507ba39a22c572591165ef484aadd2619ac83edf8db40f6fdb86bb66984967c02ae9418954db4e29720906139443757aacb4c71bca1d5a6390bba253
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/ufoLib/metadata.xml b/dev-python/ufoLib/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/dev-python/ufoLib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/ufoLib/ufoLib-3.0.0.ebuild b/dev-python/ufoLib/ufoLib-3.0.0.ebuild
new file mode 100644
index 000000000000..d521d5550784
--- /dev/null
+++ b/dev-python/ufoLib/ufoLib-3.0.0.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_6 )
+inherit distutils-r1
+
+DESCRIPTION="A low-level UFO reader and writer"
+HOMEPAGE="https://github.com/unified-font-object/ufoLib"
+SRC_URI="https://github.com/unified-font-object/ufoLib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/fs[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 5eee93ff0290..34d2fdb87a08 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,4 +1,6 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
+DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
 EBUILD watchdog-0.8.3-r1.ebuild 856 BLAKE2B 9c906c5c618f0f2649cffbd79e5b289108ded726af922a3e649d3fe82bf320943409fff5e7dcfee1d0a5028c799bdf41ca6b593019fe02776b1cdcfa08091f02 SHA512 023d639b51945dca4f7b42e439b3f2e4844f1f6d22c49ef91182bc2b899947b133c1703ad0ecfd35f7e519d724ba77cb635102871b8c08514a2ed4cfc23794e8
 EBUILD watchdog-0.8.3-r2.ebuild 858 BLAKE2B dc7e530619d92bfcab4dfe9bc8cf0bc94a765e3f27338821e80f5b21bd913a8cd22fb6858da670457d40ee639f5adef0e6d41e909ad7442bcaf857f4cac6d601 SHA512 6dd41c3cd891db711b7367f16d1d22d03054394b6df014933c46aeb19ac6429997d9145c2f0dfc10ada82ab04a0ba9a1aaeca785a538d0f221761b1f7b63b3d5
+EBUILD watchdog-0.9.0.ebuild 933 BLAKE2B ec70f6fe2655e848b8bb5eaf8f92b2f8a3054591aa09c2bb6af63febabcaa56f3416d5279fde7305a3cbdbbfd92291411415e2140c9f744186cdddc802150bf5 SHA512 f9f75235ea8490d63808a3cdd31d6821881011ea4135b1ec0f4e2fedf21ac65a98f48feb2dc063d8a9a8caa582a775f15312dc7d64e3c897419b5e30af576cc7
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
new file mode 100644
index 000000000000..127d55400038
--- /dev/null
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# 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 eutils
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/pathtools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	default
+	rm tox.ini || die
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index cadb885485a9..89c80549b9ba 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -2,5 +2,5 @@ AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616e
 DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
 EBUILD whoosh-2.6.0.ebuild 1257 BLAKE2B 969818795f8a5179b912f79fe4435102ce101f32179a5c9ca3114818c301c86ff9da6fb633a60b556dff7d77bfd293d931fb18fb65464e5907fe0b8639b14484 SHA512 e4925f0060fd414db1555642106bfaa72872cb61ec11c8124ea07df6f78eddac663d1295f9281c347e68b2b2ac78664ce7cb236a71951661a34d48019c484e9c
-EBUILD whoosh-2.7.4.ebuild 1474 BLAKE2B d344258dfde5f4781de87d34976ff3be30d17ff476acafda5418bc21e011460bbb11b954a37f404eab3ba2f538ffdc14b0c5ca985970bbe7850de7ed9bbc449b SHA512 68af7b2d671016eebd7343073133b71d442f9a7c8f4383954ecf0c93fc5c2ecb690cf6cb4e036af8fcc95ff6839432e5f93398ba9183f5c3c81a6c65f3013794
+EBUILD whoosh-2.7.4.ebuild 1476 BLAKE2B ba7fb08eebf254e52fe70a848c6fe5d53c3ba86abb00361afc99b2c6ea03dbfaf5a3e58ffef8fca0c18bd5896b5920031b967cc48e07a63f3a36d1139dbeecab SHA512 7f6b73f0104da45948432da7ed08d61fe7b6a748c2fd767060a0fd0502a89ae5dc5eac3b33a1e185a6613f6ce0fa84ae08db9cad59db8c4714b662492c7c5640
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index bebab4dc689a..5e2191b8142a 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.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="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f13738d746b0..13eb3243366e 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 545 BLAKE2B b503b32da86afccb1907dea8a672fa28aeb803c5f5cbf8325b0ea24945b7addce2e30839dff215a1475d0a096ec2299d5e19ad1753a3c0d3e566016f6f218687 SHA512 763315e68624772ca90a35cf70b7995cefeee53af7c2ed6746573446843c6b3c6d998514629084397a36072e3fff8447f7c653c7edf059fa1f21b85ded8162fa
+EBUILD zstandard-0.8.1.ebuild 558 BLAKE2B c3607d9ebb995c3ea7feaab8bd5545daf5cfa55d1a889713ed7c3fbfbd6862cdce61ab1f43efc84f7f78c6f5c8ba3697a2c133be1840314d8689880a081a2fd3 SHA512 5bbdc89ec340d20ee47f8a44266c5fe1dbc1d533e9cf23206a52f2a11957dcc8eaf34194503310085c485eddb7cc3911b9c5c6962d3edecde5bd27cba7e987e9
 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 315469ccdaac..9c888b32c473 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="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-python
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)