gentoo resync : 25.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
commit: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree: 6fce284d5bfddaf597a490ac66069d16c6a485db /dev-python
parent: 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
95 files changed, 727 insertions, 558 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ebec65781a7a..a31ed05b184f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index b0631814a7ff..93cbd3113eee 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,7 +1,5 @@
 AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3f1b97d79ee35cd0dcb3a4abb4542c56b84991137ee50a86f1a0abcb6ccddca213d8d50e54e43520f76d2f11eb8 SHA512 e6e0364a24e43682c829da0a3d2ece8fdf54df00ee4fb00927a0530f3d5b62177877452058ab67cd9006ef8902d72f863e69d9ffb3b98b49f407566f96430bee
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
 DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
-DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 BLAKE2B 5a31ecd4c4e516dc0520591313f420fa3d56d46454ea43309b26bfc00cbd7b737efd244f1377e705b1025670257c39d47c1687c76d3af1893878d8bb1834484e SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731
-EBUILD PyQt4-4.12.1.ebuild 4726 BLAKE2B dce917cd4c545ad37422e352b44ac582b7a5c346ad1176c4874ce08731ecf2e16a883ffafb5a28f9b815dc2ca342f9034a55a4b7df19e38317fa90b7ff7b818a SHA512 8814e5492d22fdc9f3e4af6d794545e258f57bfe6ffeee2903a94d989d174fb0c4169b2e3e0b676829ebe02e4f145dc94ce4311370028820ff2df17f47207930
-EBUILD PyQt4-4.12.ebuild 4723 BLAKE2B 441c0b2cfb0ff02295808a7d812cca49149ef06c7226ff95ff782ead9d90eab35af016188abcfe308d7d085058cc10aafb552dd4937af40af46090cc4fce31dc SHA512 04a5e08557d5f44c247105c9a52b3b524dc03f02e4798c7f3833bb6455ccc511ece323d3341c2e9e6213d9bd5f3d09b51258b006195a73072f5dc797ec448236
+EBUILD PyQt4-4.12.1.ebuild 4725 BLAKE2B 74a04ca3df420dc17b95bc5aec8e0d874c121a053c3018ecec8b7d3df567705ec99fe23fc8c9f567ecb22b95d74e0fea4e56b745b4af4d03619e370beca11380 SHA512 19fd9c014da59750dd5e0f5ada820ab7a97fc6f394d788f1d59d0e4d236d4d5fe2a8694e731e1200cc1fbd15854cc333f6889e6f21e2cc810f258fe6f5a8e38b
 MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 29f5ca288ca8..33ecc5f591f6 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
deleted file mode 100644
index 979f8323a03b..000000000000
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild
+++ /dev/null
@@ -1,193 +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 multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
-
-MY_P=${PN}_gpl_x11-${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="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="X compat dbus debug declarative designer doc examples help multimedia
-	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sql? ( X )
-	testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	X? ( >=dev-qt/qtgui-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	phonon? ( >=media-libs/phonon-4.7[qt4] )
-	script? ( >=dev-qt/qtscript-${QT_PV} )
-	scripttools? ( >=dev-qt/qtgui-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
-PATCHES=(
-	# Allow building against KDE's phonon (bug 525354)
-	"${FILESDIR}/${PN}-4.11.2-phonon.patch"
-)
-
-src_prepare() {
-	# Support qreal on arm architecture (bug 322349)
-	use arm && PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
-
-	default
-}
-
-pyqt_run() {
-	echo "$@"
-	"${PYTHON}" "$@"
-}
-
-pyqt_use_enable() {
-	use "$1" || return
-
-	echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--confirm-license
-			--qmake="$(qt4_get_bindir)"/qmake
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--qsci-api
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt_use_enable X QtGui)
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative)
-			$(pyqt_use_enable designer)
-			$(usex designer '' --no-designer-plugin)
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable multimedia)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable phonon phonon)
-			$(pyqt_use_enable script)
-			$(pyqt_use_enable scripttools QtScriptTools)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webkit QtWebKit)
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			cp -Rp "${S}" "${compat_build_dir}" || die
-			pushd "${compat_build_dir}" >/dev/null || die
-
-			local mycompatconf=(
-				"${myconf[@]}"
-				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=
-			)
-			pyqt_run configure.py "${mycompatconf[@]}" || die
-
-			popd >/dev/null || die
-		fi
-
-		myconf+=(
-			--sip-incdir="$(python_get_includedir)"
-			$(usex dbus '' --no-python-dbus)
-		)
-		pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
-
-		eqmake4 -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
-		emake INSTALL_ROOT="${tmp_root}" install
-
-		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
-
-		python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
-		rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
-		multibuild_merge_root "${tmp_root}" "${D}"
-
-		if use compat; then
-			local compat_build_dir=${BUILD_DIR%/}-compat
-			python_moduleinto ${PN}
-			python_domodule "${compat_build_dir}"/pyqtconfig.py
-		fi
-
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index cdf7625e1927..62f37d8fa114 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,3 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
-EBUILD asn1crypto-0.22.0.ebuild 609 BLAKE2B 0a892fed6845331e12bce9e53838d94ff1d5747a6b845fad9caa8142bbb13391dcd371915bd1d62fe640e8ba94a786c7e3802c541975a3f8b768ec0bdb9c49ea SHA512 7fc7d0a4c1ead7bbeef4d6f54a5b0f52d714c942a29fdd41beb87fc629e9a72505e9436f25e2e597d9a0a02d5583f6b44822662a0ea1af18c12a2f9b2a04caf1
+EBUILD asn1crypto-0.22.0.ebuild 610 BLAKE2B 562ffe89a03cd014c14fc4dc9bfc453fd24a3a5fc910fad1a70cabbcac24445211bc1b6eaeef8211642c58ba820308dd9396e820fd9905d80cd02549669fef54 SHA512 c99ccbc6fd5f5b4d6c0c87d4332580e0190de21789cb82b99eda16a9a741beb5d37e6489a469fd46bff693bc1313822cc1a4e2281d99bcc509534a70f6752f64
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
index ec5211d69f06..7d17ec13ec63 100644
--- a/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 24828f7d6667..65b6d7b99adb 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,5 +1,5 @@
 DIST Bottleneck-0.8.0.tar.gz 1634340 BLAKE2B 9ec38acb7d2415139b144fd4985d801183e86ef6f938d4f5d6232201e50a2d447959c2a7cde00a13d5455da9292739e4f47448ad5e9c0263e0a8b03fdd70029f SHA512 5b03ce2d0df9d177534d3f1fa02f147b12b23f5fbaa3b2685d1e8b86848c96c54832e0b0b6364479841742785c0b23bcccb51a0ac95675c72efc39693121dcaf
 DIST Bottleneck-1.0.0.tar.gz 363223 BLAKE2B 6dd8e18d14675c08010850091343856f2599de71ef57ff1b0bf1b748bc7f2e6d2d0fd0ad8ae1bc00dc38b9dd92676531b4564558b7ec0f9b79d2ebe4061a028a SHA512 b3edeec0b4c2beeebb08eed8cb7aabb92f736e47c657f1fa580ec36d839941d3d1955209b2286fd9d41c4941b46b97a27049c51bcf5a098d27a19881f570d2d6
-EBUILD bottleneck-0.8.0.ebuild 831 BLAKE2B bda00fcc0cdfbeb48f7f2baace73426fe8282ee7d9ecc5565a484ec21749a8c6a84ab280ffb4c6585802acc780c1094a9f3ae9d929bac2ffc5e05b0fd44fc4fb SHA512 7db15dfec34df6b82db102aa665ae8b7c5dc19e220ba74ca7cb15d70fb04b989c300dcb57aaa8de003202583e9dcb917be2c80b07f78d3b1f554f46e0093e84e
-EBUILD bottleneck-1.0.0.ebuild 863 BLAKE2B 20539e2620ee5b9a741ffb3136f25c8283df9bd9c611f8d528cb71d9175b8b135d09b01d70e0e60fb5605c24e04f252a3c35a1924772907a98a0979cbc801b62 SHA512 959d7c17a2c92bfd9b9ea4ebebc03e23ca36faf08af6a9c125154ac1f3cef0b5f5a8e07b45970fd6f9c0df0404d353ccfc8e8a76c853a3d735f7ef5a2ab6972b
+EBUILD bottleneck-0.8.0.ebuild 831 BLAKE2B 103de6a29c0440201cae1b03582dea6a5e5b1be592b7f69a13bfd32341dfc717803efacf5a52f662b5f0bf85a0fa72b0c87e1e32d84c9b432b99ebfb87752263 SHA512 3ff934b2313285266689f5add87173244b76745ecb22e222a483b7fdb616f8e50dffcae3630c0112a7459a743e4dade7f68c726c431fb42e0b201f072da121d9
+EBUILD bottleneck-1.0.0.ebuild 863 BLAKE2B 2890747f60f36d38a00c4fbd6802f217a99897e4f4d93819c4f5f5c50ba9b769d2ff791cc8c9cd79b964d825889352e5b3b42cbd5368e0dcb2b9835f8f88c77e SHA512 27b9c5169abfd6434a957aa423302cd34d0faedbb288974854bdaa763d736470663e30605e616322f7aa407d25bd6789903db3a629747712613b494af04b85b7
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
index c23ccfffde69..122f38004509 100644
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index 3a9f09cbd62a..e8418e14afd5 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="http://berkeleyanalytics.com/bottleneck"
+HOMEPAGE="https://pypi.python.org/pypi/Bottleneck"
 SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index c2d8cae5b953..92e76ecb6cf6 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,3 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
-EBUILD cheroot-6.0.0.ebuild 923 BLAKE2B ec9450c391457226a1449e536b5c9694488cfa02dfb1c7e51fd6ff04959dba7b115396ded4ba0a93013d5c95c39ff66ab4a8ffb180c3b11e543307ec3420f38e SHA512 cee1e51b2d172505a0e1fee09910fcb7d543048b55c167d433a5d16cc30b5355bcc3d97c6eb4255a53193791f2aa5101fb57a8c975e3c5620c2f53a090248eec
+EBUILD cheroot-6.0.0.ebuild 929 BLAKE2B 06bd6d597c356cf67f11c59ec5581aa8329755f0aa567fcd52dee2a22563ec91d1b821ee8d3ab857995e993dc84bd6b7e848052a630a8082e4bd4cbdfa23f259 SHA512 f81b94e434e4f9a20a6ded0673788444768a497d72b9a18e3d15400daa380358c4c633abeb3b97d9186a64d38410a1fbf1b204e0ebc75132bb38321e7e3d0fdf
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index edee3e0ea2f9..87d8ebd8f061 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 462f2a4cf71d..499a9f987ad7 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,5 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0.ebuild 1307 BLAKE2B 595b0e151246b7a46af2f6ddc6af41acf57a391a1c3d9efab668f3237e01fe770a98ca0d74161e654770cb9b45a7af4faa16dfa8725cee3c89cb99573d379265 SHA512 738e33a7fbbf4eded1362f184ab5a0a8198cbea3428b7bd30b245dd8c13e879fad0abcf90d41da9d1fbaa6846c012054a149aefacbff034c6ffe01425cc137b5
+EBUILD cherrypy-13.1.0.ebuild 1313 BLAKE2B 9223217ec3a6c44569863a2f2b3d3adb14877266cc5a0be1460a58351dcf8bfc369aebaa30ced963710ff970e42da5f32d6bd3c10a3d37e366d12e84a98f102e SHA512 d4e5491995b2e5870002936e239efc743b835a4d8be4c3ba9f0b8954a61452c1027bf0b3e5764798c7e9ef9a3b444a24311c07d0c125fc67e79ffbf00d0771da
 EBUILD cherrypy-3.8.0.ebuild 1661 BLAKE2B f3ebb5b8bf5ea529d9a3be6041b93f1490249e88444d718ef095511dea4af4f97c73841bd2301e5b084ce78c6b76b547cbd9ce72351276c6b411d26e4374f51d SHA512 7149cfa87ee95bed2f95e0107425e476155902f411a7261b4b05e8eb002aa3f4730d3c3469aad48ead90fe5838baa14b2e4e441e0d1848e013c88e9e8ecbf195
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 13a80e2b9df4..55d7017fb48d 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 00332c3e1adf..4b3fb7aa1aef 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,5 @@
 DIST construct-2.8.17.tar.gz 705812 BLAKE2B 3178f7f59fb893bc521c88b7ba51d6bd83cca37c1a243e602dcc2ac41a2cb7335e2cf69e7dff3b130e974ff9dbd01a12004423c3a88fc8e88c784c665437e901 SHA512 5bca40d7f33f336ab2a66546027c8bf24bf1b0125bcf425063b3bab14b1e3a96577d602db1eb73cb0ee99f90d92af6e24fcbd228912c0a70de6b2bd7d33e75be
+DIST construct-2.8.21.tar.gz 706022 BLAKE2B a7fb81185b380b444bede5dffce11158d93f0076cc3fbd836cdef3cf8425e2bcce0cf7b8e2d2654effc8beac3d3d0f722dd2786103f9b85f05b98216fc7684cb SHA512 f8e2c8d0f437cce760b1439fc68e2b10dccf852e1bf3c42e0569a3e32fe218d2a4d4cc662229455a910fa8a7cf0fc0500cb0d38ad0485f1b9fd954334f343562
 EBUILD construct-2.8.17.ebuild 708 BLAKE2B 1c67690079a5c288769c30c8717d0ba83c8df1e22fbfd84d81427364fc8c7c19947d6d231cb90b08a1137f16ea26f2df126872e83be210cb4893e33d4f90e4b5 SHA512 74633e9f4beb1abd73ea78de7e6ea6821f0ca0d0d0e429d9b90105aae5bddec5f7452a15e48824e16a2cfefc379d3a0db26b163a84a722367583d61ccb6f758d
+EBUILD construct-2.8.21.ebuild 712 BLAKE2B 2ec3795f5ae5e9e2afd3f553ed52a8d633dec54db08cc51248db47f8e73235ce7f126499ca590c8da4b6526068909da589fe86971f360742ea0a7abf62a47795 SHA512 04c172e06943f59b2a25365475605ab55f37e930f24f2bc199614ba1bd1e7dd9e4a40b19b99e4d1c49ba3c5288ac760200111b219c725daa9752e7803313e120
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
new file mode 100644
index 000000000000..70ec0fd0fff1
--- /dev/null
+++ b/dev-python/construct/construct-2.8.21.ebuild
@@ -0,0 +1,27 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful declarative parser for binary data"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.python.org/pypi/construct"
+SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index aa45e33e9907..b507604a3537 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -2,6 +2,6 @@ DIST cryptography_vectors-1.7.1.tar.gz 26652514 BLAKE2B 5aa670b4d52b010964465091
 DIST cryptography_vectors-2.0.2.tar.gz 27011827 BLAKE2B eda02ca72a4a6a608050c531fc649a9843a9b7083a0a7a726ac89201f37016e258538671b15d4197deaffdb6902c345ff40e1da604e2b6034148d9c204b0ab1d SHA512 ab14bdf664e6df08c8436eb24c4465d3080aacd4e6cb47a0113b0877f869cd91d4184ad9122a428b323e91316b686eeb167c4e932773cac1e7b2adbc9309ca36
 DIST cryptography_vectors-2.1.4.tar.gz 27255711 BLAKE2B 6c842b6366d794e9986110479e2175996b344aa191345c85a5cec8c0640b7a67b157f310eca31ac8e6487739357b11a2b86b9832fc680318e754c4751414c754 SHA512 74c2c1e3924f848488a3b5abdabda1a0089ae7d070b94e65f9fa2bf2da057ad27a37e46f90de4f2c3e9f1cc96c1c179cb5dbf0f50d5166a02846923e3bceb165
 EBUILD cryptography-vectors-1.7.1.ebuild 632 BLAKE2B cf2ecbb63c20058a909c1de56572b17fb8a96fd36ee35e81ee8163422508dbdf6c31d21e317bff332bcaa00bf7b6ab42e465210019ea70a25feebd3ef2c5a030 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b
-EBUILD cryptography-vectors-2.0.2.ebuild 633 BLAKE2B 5ba6d226f28599a4d150471cfc004c6a1c9f36ffa7258c19be485ded145266a6558e47fc155506e20e026ea0ccb139b2d8866a319e30c2ece6061c837d23ca11 SHA512 245ab5c5b17930fa85039307428ba2138484831b8dea4afb382425ce13043d66addc3d4616e5b40aec13d11dc8870c9e0b244d2b5abff87ca43b4b6660662ba6
+EBUILD cryptography-vectors-2.0.2.ebuild 634 BLAKE2B bd08d78ca9991391197a5924358e514cb34fc04e295f74611f7a7ea852defdf9ef3186efe13d5385f742d3850171213eb818c9f7bee9815466ba412d9a9c26fc SHA512 fd846b4ae8994bbdee8d0833f43bc6ce44efeee9036ca348ed0630256756b5766e2d6990a4b77f0a7593f333af805cd64eba73192049d59fee0042e2999fe45b
 EBUILD cryptography-vectors-2.1.4.ebuild 642 BLAKE2B 47e99fbbeced4ad390da0539b70e52b4efe9b9ff92df72a2eff2d3eecc1f639eae9be3ef77635b6117765f41c31b6ae7ec290dbf9c32e86ce90b3c786db78c5c SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
index 926b73996f8a..2ec39af5a885 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 5e06f9fa152f..fa19cf25370e 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ DIST cryptography-1.7.1.tar.gz 420673 BLAKE2B 8c0257187f29173bae610f191f6ae3251e
 DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
-EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B b1da2d228a2b5804435e978ac073d15373d4a1ce1bb56b277d3eb8f66ff99410d5b8903cc0ffc620ac933f556b7fea9ae932a02db5e249c8384ba7a7990c3f59 SHA512 ab34101a8b2556703dfd1d4947aa9c42b85489c3556e558ce0e78b0ed685c00d836f4a349c623b78c5e1d54f92156d982bcaa9f54b04c8f960f447b5be390bdd
+EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
 EBUILD cryptography-2.1.4.ebuild 1749 BLAKE2B 745980a56d43ab82ba6a1a65a0918acee64642d5c5ee95b343c5c09ca6f68cf724e3effaac2ad8dac4262e6aa98386dab00feec2dc327b6e7c497429fcdbcbcb SHA512 cb0e140e6159364a1eec79eda27563638dc9ef8cb13278f1fd99d12c3b969af4f8abf4a3090b8ae5379a3678c482af049ff3df77e95cc46810c5b761f9ab3eba
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
index 1ad0041e1fda..e1a1c26f4aaf 100644
--- a/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 0235832e08e6..ef6fbfd546a2 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,6 @@
 DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
-EBUILD docutils-glep-0.4-r1.ebuild 1172 BLAKE2B f24fd73e88f9f598e4db51b58b248096fb472180d752c78bd8f2ff80bad5d9b2222b0ff3a2cf834b4aa61d7f1a1409e4b48c2c6824dddc56eeebeb086c305f2f SHA512 28f60c997dfd07a32141ead50c9367d7448b9fef9056a8e138df28d8ce47fd58961d2bd0521654a6fe31623d85f4ce2cef17d2ae5439a2419482d2f14e1f4a48
-EBUILD docutils-glep-1.1.ebuild 852 BLAKE2B c81d443caefac67452fcda6b69c545f627a7e41b1d7255e5037b093b884edb4bf77634a2350dae42cffb4fc4be745f50a4b276e3b2175fec98bd1cce1833ca1c SHA512 c9ad08e5ea30c2755054e81ba4516b0581ad2b6825906a382cbdb6ca60738f4308aa1f2d639a38e47908a2fa5c47b04b0844c38ae0995f77f1041d02c366758b
+EBUILD docutils-glep-0.4-r1.ebuild 1160 BLAKE2B dd01498b0945f97833ca83fe44b72be76200d08b4a76394dc0b8265de641cce0a85d094e245af02b7b1590afc211a218f52324a57683feefb17958683d21bf22 SHA512 083901d85a132393ffb1300bef09fe3f797580a41f3e74fb4dd6f6a23e621a353f262fa03b642a34f5a73b96c5be39bcaea6d531ca6881e36c7fd891078312a9
+EBUILD docutils-glep-1.1.ebuild 840 BLAKE2B b9dd7da733b58fef60c1f0d2765ba998a8fd56c513bd911739b50996597af14f98b7857a7fc4da938028899cdb6d7542c046b148fba5c6d4f0928d0f33836ec0 SHA512 b810f77716d42a9959cb2817b8fa55379becafcf2bbff53037a9136df7b415e89d8e7a3504cc0c98fcc897dd23410a24a9d8c9aad770474431a9d776dd7da66d
 EBUILD docutils-glep-9999.ebuild 573 BLAKE2B 032fc2bb940904ce0602226f004d4d8990bba9ffb35ca3e81774ab101106aaa147ead13d9e6bfbda48b7f48840fb4c0afbe5578a5c8e8070bde87afd9a7e164c SHA512 200f86c1399dda6276e98c83a649be7d1eae49fec9976f1b04234e61aeef73bb6f55a50d50b8add157e844061f7da7092e25e9136eb0acf059d1ab2f32200ce5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
index 3fc69600a5dd..c59e4ea50dfb 100644
--- a/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tbz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
index 76ae3b34e333..12405e0cd3ad 100644
--- a/dev-python/docutils-glep/docutils-glep-1.1.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index ce9fdaa437aa..837f6eaf56b2 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -3,8 +3,8 @@ DIST docutils-0.11.tar.gz 1611755 BLAKE2B 78e377bccb949d5ba324b90e0a316b38d8874d
 DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
-EBUILD docutils-0.11.ebuild 1880 BLAKE2B cb81f64a2f83427415a89149e2b15e75f1fbd1fddfe6abc5f25085094ce6ed505cf7a9ecf34ed6bd9165414cf3d1f9c3cb196ff1727ce627fffc9ba90ac1cbe1 SHA512 46663d7ddab4817db565b0c45893796f09535d8f529e93758ecceace6a6c8b4b3fc7f466ffbc596cd20deb393bed8c9b347e8a0adc285c380d80eb16eefa5d3b
-EBUILD docutils-0.12.ebuild 1830 BLAKE2B 06d2107c27fc444b1ccd911c9f2cc0b648999d0146d9d8492df281def832dc3202599c58e84a3c503d64d5017880ba0d36c585e3a99afa81573cbaa7c0d0a5a9 SHA512 d6fe937fda326cc62b6e747f5e9dee812309539ccc3990b74d8ccfff66e8c8a470e57872dd46c8dba93dbc3cb721ab490765704998ad75087c1b602449f1f64f
-EBUILD docutils-0.13.1.ebuild 1844 BLAKE2B 02e2aed44725407bca5fb8469d612033402b111f28c9aa23c872cf5b4a607e2c6cfd501f08d5f300d355196966494f4e87de8f8e92075180d9b85f34c621bae1 SHA512 f72cd90c9d34825a1a310759cde12e9b1b815e2a6ff7680410e8f3a2fe0acc3975a73356c67596b412074b4d576cf26fedaeabdca3c7149b815072a978028fe3
-EBUILD docutils-0.14.ebuild 1854 BLAKE2B 424dadf3186c003d0fc1bfd8e9511cae06393e977b54375ad9c8598f919700eceb24c8335d01a735a7abc058eab7b82d85ba1965a55281f5b66d61adffba73f4 SHA512 66e6f8afc471b48ce3719cb435fdcc450e997b2af9a97b595662cf89f8622fb2593591a8d425972e9d074cdbef68a9f7f1304c67a86b55ef1a5cb0bda1cce7c1
+EBUILD docutils-0.11.ebuild 1868 BLAKE2B 2aef1d2091428c1694f8b46b8a7646394154d317d79cea4d1c141ba0ac2f99b945a780459d63941aedca1901735132e04cc0743d9601afd825a7ba5b61c7dfa4 SHA512 9da01a07787b013bbb2c19cb94098af8a96ab77d8fa4d875cd4c36ac6cd1e295b92b8e09e5966802e27a6e84c659f1c4419503ed66214027112ff82076f07ff8
+EBUILD docutils-0.12.ebuild 1818 BLAKE2B 0a5186b912d7589b9be20990451277b47873055fa09e06b3a435ad121ac58734230bd185ec0f473865588b2ad3983dfaacf6c25b6ac1443cf9bcc603bb3d0502 SHA512 05e85b00c77a37f821fc49272d2e8c4bc993a60de2de873eea5539b88de1f94e57c42ed0fc88fddcf0c314a0508d331fd89372b9f3745b64cfd2d9471dad3d57
+EBUILD docutils-0.13.1.ebuild 1832 BLAKE2B 72c8e80a995235365fd867022e987b398ac38076d73474606d689421a952417be960f7cb0e75289c83b1f16a4387c1d90485c5c6cbee58958a5656492ff22acf SHA512 e2df1abd90dd34531a3fa4e1a053097bed114d5a02e05c482d297a2df7553d2ce6d360fdc47f06928b34dd07289d5462baf5ac7f793a482d94e4bb00de6a88af
+EBUILD docutils-0.14.ebuild 1842 BLAKE2B a9c65ee6686a4d2d4dc4071227027fbfd0525ee426ac353279bd183b1f1d82b415ee8c850910cd60d9e365793ecec91f2da76ca7c3dfd8613a3643c189fb18cb SHA512 dfd0c911ecda2699014909ae264f481a3cd0b881f4bb6f1f85ab07d0537c6976cd43fd7d93d74c69b92af3cb449a6e07bedc56ffe52969ce88976d63dba47637
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
index 74f4ef82f19b..ad8c2c982407 100644
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ b/dev-python/docutils/docutils-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 76c56c7b0a09..16f246c118f8 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index 2822eef75a65..527811c366ab 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 47f8bb06d9fa..42fde788ce85 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index 2d9c0f1957da..b1ba7327c921 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -2,7 +2,7 @@ AUX egenix-mx-base-3.2.6-tests.patch 1024 BLAKE2B e1c8716d4fdd5b97773fe46f647c93
 DIST egenix-mx-base-3.2.5.tar.gz 4575752 BLAKE2B f113aeac32f9d648d4f90124397e03f6cdd173a23a64b8572cbbf4c01a78c66f6853944616ca682e88d605a248ec9de6144f4430559e8d99c65710360df8107e SHA512 707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42
 DIST egenix-mx-base-3.2.8.tar.gz 4597088 BLAKE2B 8f74031d5793cb04a930bb2192f7173e1c4c0fe32a3c1915d1feaf5db80711f2cd7344614066a60ef4d87ee2b3270197e706052bafdb7c6ea6f2a0176f14ecf9 SHA512 26a8d53c2a8ccfe088ac201d0b50d9becc402220746dae2f4fe67b55a1c0cff29b6b7f635f689752c4d444bb05b5edc30972354301830ae24e13b845596dcff9
 DIST egenix-mx-base-3.2.9.tar.gz 4611603 BLAKE2B b27afe2c06458d94b560fdfc1559a5afa68aa904d0947ac972ed08a3194eb7a99c7a1f7b10f359fd46407f0ce02b7edd0833e05ce2faffd62ca924cb7f766981 SHA512 ff3b6ba90e9729004e7b18511a69529698b7d6089f08b686a0930d8f065323933e9fb97f2ed7a5b24c4bca0ddad1983773144b5dd9ee401859a2ffbfcfc79025
-EBUILD egenix-mx-base-3.2.5.ebuild 1511 BLAKE2B d0f851fba7127ee3030e8940cd1933444d30483dfdb161c204e6b9231e077c282c159f0c1d7f1bb44aec80d28fddd052128b90f5b4156dd3a7ec8eefd2ac60d1 SHA512 76e8306ca68d0970b69fa326c6ac24b953ebe3229b8af07623d373f2f097ca43392e78d67d56956391674a4a51afb49d6e5853d903facf577beb2b13a2283756
-EBUILD egenix-mx-base-3.2.8.ebuild 1615 BLAKE2B 27ba0704a75ec65c4ba4c0026a2ed36314d2c41444f99ae51ffc9999d66609ce3626edabface884f4007e01ae7c53121b025133d6dd882d77829fb17dcf03e93 SHA512 2315ae69d136c70f6198c9130a69ac240cd0f49fd4efe4e3d6e0bb2b05df77aae5fa34b7d36526a1842cd7e8278f1cfc9e15282d25913d5c354acc595019390e
-EBUILD egenix-mx-base-3.2.9.ebuild 1617 BLAKE2B 6f6c8a24b4d9f6366bf971e93994bbe5b8b7e135fd562d0a1a7a9060446e411b535cdb384fba1280f4cfd690aeb8284832c798b54adc3cf820ca54c9c9688950 SHA512 505f59c196bc9cd593cf92184f8f5957f0132c77d486fd8dc6dfde966e1c6778d6d5658a9e98f0da139efb826d16b3236c06754a2538e49e14361e5da9af17f2
+EBUILD egenix-mx-base-3.2.5.ebuild 1499 BLAKE2B c7eef1b0c94931ba47f2bce4b878d81b0ada13ee21a089ad2875775d8a23703c8f1f7f7e60bcd36da6e34738663ea48cb51602929688f82b0b2d33bc1530bfad SHA512 ecd254e1a4947c55c8b3af51825746bd87a8653e9699e8ba9e695c10487bd23a5c2f564cd8181605f4e23dffc0be8709f5baa7c29c73ce404f7b281f03e93334
+EBUILD egenix-mx-base-3.2.8.ebuild 1603 BLAKE2B a10fc2356a123e276ec6dd63c9a0e95ad84e67fc15344947731d204d84c71298c2cae52cc8f5c9b83f7b36e17a893ba201c272319099dfde6190b685f3d70d84 SHA512 408558e2216a1c798529474c8070001aba2873d6437418ac94f40795bf0bab138f22e8269ff3feb76cb46b424e71abfce305d437b71f7051d555583682a5188f
+EBUILD egenix-mx-base-3.2.9.ebuild 1605 BLAKE2B 586b20164d9dc0667083ea0db26236dcf97010ee02b442305e49db9d738455fbe4cfd792aeb0161cfb7121e5197eb5a5c114abd7e8276f9c09be12567fe8e391 SHA512 6a78ade99b00b230039d82b388061620748f5eeac241a65c207bf39229c5ec3f27e51794d21a8e2ee7187a28dbe623478f8dd5c4afd3b27b9757157db1351b84
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index b985a149ba12..5254624f8a4e 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # distutils.command.config writes to CWD, bug #450516
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
index cc4b4460693e..9b41ca58a425 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 # Correct broken tests
 PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
index c0345c5a668c..b2915766ea6e 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.egenix.com/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 # Correct broken tests
 PATCHES=( "${FILESDIR}"/${PN}-3.2.6-tests.patch )
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 35c563707114..149c28eada3c 100644
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -1,5 +1,5 @@
 AUX epydoc-docutils-0.6.patch 1190 BLAKE2B ad424efe439798076d99e3eb5c516277eaf05fbc73a24bb07ac32d4199d537d1a93af15660543ba8a038edb2b8539ce2392c7f8d008a13d5ff8abbbae870c901 SHA512 d1366440fb3942d307508e2a629453dee1ba53dc01dccb6a424bc5486a34dd714cc5d502262ee4fa9d8191faabae61176592a950d0d7cfc0d037ca0fbd5abfac
 AUX epydoc-python-2.6.patch 2425 BLAKE2B 9eb7426637243073fc0ed93975e2ad77631f11243c5d22b5fe8bb79c7379ed0771ab3af244b10d88333394e4f9690fe117e60e2777646eed9e40d436af49ee48 SHA512 b1dbc9053125c770acb75a236a32475e98be41d77dc9c1816cc194297cbbb6334e3e4cdfb1b50e37ec37a18285be6675be50f8a029ffac96705c776c0768d173
 DIST epydoc-3.0.1.tar.gz 1785792 BLAKE2B 405e58132f4d0f9c40bfe58ada11618865e29c3b7a1eb41954f4769287ff780b4f17e57b50214fdc0f38a269093e35d11c83629e22c8ba854ed78ce299825826 SHA512 5c4011f0018ab956c0e1fe5fe0c1608fa2416439a60b5836a9d2d95e359428086ba403bcb5ed53e64d9d4979441ca6d537d9e5b8d6224d2202e7df3332d9ea83
-EBUILD epydoc-3.0.1-r2.ebuild 1141 BLAKE2B 5cc5648b1d68f0ac4531eb944b81ab71b2f9bbe3ca949a6a2145bd8a17cc096403fb016a313b1e6c8c0cfac88fb3b88588e5243e5335e33f6414ee1d536b45dd SHA512 2c679dd207b5670e0703d2c517bb89b32ac027e6530349dba6e0e66d81e49504fa0503d5dbbb679066ec06c80d965107a26b99f68a0bfc3e787fe7960e8d0e47
+EBUILD epydoc-3.0.1-r2.ebuild 1129 BLAKE2B c3364a90b101419b4d207d61e0716494196349737385a49b68f2aeaf7d4b0199e37ec5ce532d07c2366b550d82ca71b8d20e6048b1b5efb80110ade58e49099d SHA512 7d2b1dc5a3bbe28a82594cd63e43643f46e010df26071a8d154f91a1ec20e8b1727bf67e3ec037f0b8867c2f87fb2efae26bae42d2ab9d026342f318da4da3ca
 MISC metadata.xml 1217 BLAKE2B 89ec592e9bf635d08b60cede28d77fc2efc5674eb409120a51f107676c3f87dffb7ce57269ef936b723a55e32cff2287affeca88faedd7fb90264f52ada262b8 SHA512 3a8b0a2194a7899b9e7fedf2136a587e38947d395fda15d17b9ce6aabc65adae91783f8e4ab37acdc5b2ded8281615dd9831f5dafaf7e6c0d22ef771ce253c39
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
index 63cd3bcba64a..1cacbff4e908 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex tk"
 
 DEPEND=""
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index e9d0d79e650b..cec8ab328548 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0.ebuild 750 BLAKE2B 80621d904c627c29ebb51f5a2339ea63e45e1b149378cb3b6d8d3d8d16ae1137fd13c892cc0e458dd973e62239b99f12ce946902e0b87904f11785f3a86e25ee SHA512 c43aa4d3d363be6020c9cb13d2fcf28752cc78d3c0494101756983572c3c7104f5c7c7d93cb1f262d4ab035a7029494aa19feb4e9eaf6bec76dd7126aaa6c590
+EBUILD fields-5.0.0.ebuild 756 BLAKE2B e7c5e97e7fbcdb5d757585a0b3f0679c43fafc9a345078af2a0bc9f09f393101f26360ddb34189037bf7e0893372986b8b91d846d7d5b1e36d88dd3db85ad6dc SHA512 b6c076b20d2dbfc16f2a0a4f89d95ead53012a58d1009bb652eb5b4095cf4096851ebdd7ca649cb7a76af9279fcc549ce053f20c3d7b895f9cf4cc5dde8098ca
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index 8df43bdc4bb2..91fa01a5e63d 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index fedc1220527f..057c98c3e994 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,5 +1,5 @@
 DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
-EBUILD html5lib-0.999999999.ebuild 879 BLAKE2B 5c40d502b03171403ab0bbee8e24890cfcef366e537d83128ac6464675162817db53b089b1c6866f2296ada8c55fe6a842312b152faaa4391a43067ca5736db7 SHA512 b97ad3d5d8953fdfd5527a4f04e67c67eb9131d54c3d5155600a03f115c45855853e1061f5ab9ac6f747ed980268258726ef3ad6aa15736b400e95428090dc55
+EBUILD html5lib-0.999999999.ebuild 891 BLAKE2B 68f8c063fc19c261859aefb91624a712c8da006c939301d46c77d6dd050f940607b88e9bc82d5d2f7f615d8aaf427ccfce1deec046e67058aa590ed47701e1c5 SHA512 cd6f737f856b1b9d6fece5da6416b0bdb4eda80d3fc494a426060041c6b10e1d93250aae093f0297ee6e0a7011302d9009cf98d316d9d04f438478a9ef9ff987
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
index f53420c0ca0f..01deadfdd3d0 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 8a6aba55c60f..a4b2640bf36c 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
-EBUILD josepy-1.0.1.ebuild 636 BLAKE2B bd6bb2ffb5a6f76757c67152be8b38ff43530992cef53708dacdb5c6ee9bf42a4ef6a06ccb2238f0282925e03f17beb786b4c3fcff99d04d8b19378bf501e631 SHA512 f5f2a5921a848b092f92859d5ce0e51fad53641efd0c202fc23d366e23d37c3d71c9917e23b45a97be4a2fc97cf5871c6d6fe24907407377ac65be85eab5972a
+EBUILD josepy-1.0.1.ebuild 680 BLAKE2B 7762326b20ff3307cf1ecf66236e30e98c0d361fe9eedd9f37d6708bbaecef5deff77a86305565c7fe9dc4615dfac3ad681f1805c737d6b4b9f0367928f1cbc3 SHA512 2dd2979cda95190d23cdf94a80f3837da846862384136e1a6aa853d427949fe977e79c220d7098aa4b55627a5f958f056e6678b23e1def498aa8ae0201c08c04
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.0.1.ebuild b/dev-python/josepy/josepy-1.0.1.ebuild
index 115d502f9d0c..3cfd2a6f2aac 100644
--- a/dev-python/josepy/josepy-1.0.1.ebuild
+++ b/dev-python/josepy/josepy-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,4 +21,5 @@ DEPEND="
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!<=app-crypt/acme-0.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ad21c37ea4a3..a7c97cb9dd1d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,6 +8,8 @@ DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb01
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 EBUILD matplotlib-1.4.3.ebuild 6150 BLAKE2B ab34b10ad72a013c9ccae7c6b34b2f624169c44df8a149dde10a6fb5448f928bdfb107e39cc220b54c5460be1645d3bcbf8278a37b20f3906776aa0f2094b715 SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46
 EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
+EBUILD matplotlib-2.1.0-r2.ebuild 6230 BLAKE2B 32fd252c9c94b28951eea2bfc76e9acc763c584484934a4b01a86515592a11dc23e476cd1714d1b47b05ba792ebce1f63d62b7729d2333488cf7ce889618614b SHA512 7bfd228192a97f11b7e44f7034abd11fe52d2820fbadacf3e2398804d86af7c4b9b28a508339aa122fb9d63c5f933aa811d1dac18d9b9bef1c6942e619dd3752
+EBUILD matplotlib-2.1.2-r1.ebuild 6284 BLAKE2B 8d94e2799442b4561a5a1902f6ac3a7d2d008bdb331310f617ba368e349e3ba49733da2aca0462687ddf8e987520fcde5a43d568261daf6c60ed219173e6f67c SHA512 9001327a0669e7a8a18a8782d1f0744e0b9e5663bc138ed8ac509f5432c809eca206fe1d6806f10bd50dd26eadf536f124d8ca268557b5807f25c6102267d8fc
 EBUILD matplotlib-2.1.2.ebuild 6229 BLAKE2B de1955eb1ee57e9a64108f4d79ee4ba4ddbee244176f94885deacf2870d0940e15528c254facdab50bb036d42eeb1dd9feeccfbdcb86f041e3db0a8ca7165ec7 SHA512 0b694d982e432f5566b2f4ae075a8723d284ce5d9e334a8a975b1641e21410f0d35a6cddcc9d2ac62effd7e2a5012c5d49d2eb80d9bbc41c76353c50b42b11f7
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..0e4935861800
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
@@ -0,0 +1,253 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..b7615416dc61
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
@@ -0,0 +1,255 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index 80767d21706e..661bd0588d59 100644
--- a/dev-python/mimeparse/Manifest
+++ b/dev-python/mimeparse/Manifest
@@ -1,5 +1,5 @@
 DIST python-mimeparse-0.1.4.tar.gz 5228 BLAKE2B f98cdea21ad015e65f638cf5828dffb006ab2f142c266b54f851faa3b38885fcd29ef8717d62235e675a8ca3fcc91fdc8d8e594be2c6404a45c3dc09b5401f1c SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
 EBUILD mimeparse-0.1.4-r1.ebuild 1158 BLAKE2B 8222072ef7a7e7b24cd2f849bf1ab472d7024fc0258ff47dfe61c81935b3e291eb625eb14879b6586adee63e4b11c17813a44a7516d46d8417ad77df2b3a777c SHA512 77250c17a627c22853db5d2caa05dae861ade7d7fb0859997035e1163730523799d6cb0d2facbd6932390be40fbf38dbda61df086e7cc5519b733982147560e2
-EBUILD mimeparse-1.6.0.ebuild 1195 BLAKE2B d604743fd117035e6d6724bae38a247314e343aca66531a8d3a4cbab16db27834dafe8d4cf92a105e08333a73b8d6f69d9c70f87a591261205c9b7233fe171af SHA512 773a843d5e3bcaf05f8755e3fc19574229346177b70b126b64e278150b5e227627ca9b9e3539c8549a35afc88a104b9faa7616d0a40ea63a438ae3eeaa04363d
+EBUILD mimeparse-1.6.0.ebuild 1194 BLAKE2B e78da00488122ab6283af6ce25aca72f9008a500dc7b6c747d9fb6bb488f4e1557eff6fc1119f4a6e71ac9191432da9a5b09590124212f9f4e9ba17d806a7ec9 SHA512 2af2c2ce0537e5747db45c2f271196a7b4d86c0a24ccf15ff9f96b6de001611fdf1c5089a917aece22ad88307791941d29a9f15134c4aa3267504b11c046d744
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index 6942247da748..8e2527bd6836 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c121661f1889..5f6580f7eead 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
-EBUILD more-itertools-3.0.0.ebuild 932 BLAKE2B d6ec11c510198390910ffc62c56bab5b593231c5cd48f654e4dc7394b0a0c4d23341ddaaf458efde82261a0c790d5982585139a3faa6ce8cac7e175ae9527ae3 SHA512 a8a11985e3684e3d9425920cab028e620d917a38041051039661046d4a1f696e619ef9b5e81ef99b4b33c3e77aa21687a93bf0b90e5ef1a690603636819ba576
+EBUILD more-itertools-3.0.0.ebuild 938 BLAKE2B b9ca9ea14f323bba0096c463bf9b78defc0bf099bdda8d072115aeb4689b8c11263009d575768c22f1d300acc6e422cd2354237a12e6278858bf26e876ac4e55 SHA512 6d34438e310ab1f9b2ac8be045ebce01e4fbdf2f2d2fd7b9c70346b0b8c8aef5f6ee50dd37e84316f523b2ec6a4fb32577275fe1639327201ce3631e4c5ccd1e
 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 0f707a6f089a..d609a963b321 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 00c13f831b3a..7fec5c04a09c 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,4 +1,4 @@
 AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
 DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac12498be4d15cd0f5c52c80435f8ea513589e8aec671cf88b10cc8c98555e7cac7fe9a1e0c67f4625fce83f80f SHA512 d1a7b65472c7c02dd758f0c469d6c6aeea34de7b798613f7fcdf45fcccbeba1e9085cab113fa89b392a60f758f8747d13b1c265c809566990c22e61ca8db49bb
-EBUILD packaging-16.8.ebuild 1461 BLAKE2B e84f2fa0a4e839008794b5d8a6bf8944e8d4c73940e65728a951426b65fc0c2856aa1f24e811d47bd51d768c1e9f7a4150bdc06b6c9ad1cb6722769aedd0eeac SHA512 07a982c089274c472bb4ff5050bd705aa9333fdf9267f72ed1fe79bc1a305bfec6db2f4503ad0fafd6e145f7caefc074438504872f20ad3e13dd0d29c5a8b464
+EBUILD packaging-16.8.ebuild 1449 BLAKE2B cbfd2dbdbc5e5c6cfd0c0afa144e43a74a28fc5b79cb93db7299ac12521ed48e12ab91590ea24d48a0ef69ca913266325219875518d806860eb04c8c2e449ad1 SHA512 ff504a98f6843c0c28512618ee1aaf52ba42565215fc3b91a83116d531438bed2074b64c1aa3963e4b743f67f33daa213fec682c91a8a41f15a57c37f7d1dd07
 MISC metadata.xml 366 BLAKE2B 62088f9e06b99999bcb0082f1ff6d6e243c8502a7e3f399699cded85fa65395f558e019b08342c73e4f078183cd0732d88058fab8fba984ba0b531c19ff6560c SHA512 f326b75f4603bc9e4455665dd526e381eb1973c8edc319e1d69b824f93ee885931fa29e74f9da8582f5af78a1ddba2fcc2d983fb98cbdc4cfd87b82c7a0f3ba4
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index be9240f517a2..a15cdbbbd337 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 7e676cebf67c..fd198f8a5c56 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.15.tar.gz 22334 BLAKE2B f07d41d212192281008173f6314c4868ef993dd7c8220d21e2d45d461cdb5377c61acbd8d5bf7f915928fd007e844cd50f8b5ae9b87d1a6d7eaea97f0529b1b0 SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b
-EBUILD pocketlint-0.15.ebuild 480 BLAKE2B 544e03cdc085b0956558c5434f4a325dbcf89537e53200437b7b205207f93eb53b9865e77ec408a18c1c05b21208d85345f71cfeb450c684bd91d39f9f0b5a53 SHA512 d7e08248c944413c00271bcd83804119983a91feea6489de4439e8f9fdd6d93e20fb68c1664fae23fa43675ef7e91145b8f8ca89b16b247b05202bdd193b0c62
+EBUILD pocketlint-0.15.ebuild 477 BLAKE2B 36f05154d338d4d9159d7699b81003dbeab542ec647adaa7823b7e82e63f6800b9933abad3a358f782385e98d158431824566e8f3c59168b44ae0963f9735c9a SHA512 19f928f63ed333700b4b9799695349979376049dfb35cb35a50b3350f18856b0c2804870ccd508ea83c25e7643227d29bfe159629c0c48265cadf7d0f84c3a57
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild
index f951396f16a8..293e9d7a8e81 100644
--- a/dev-python/pocketlint/pocketlint-0.15.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.15.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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 382340548ee1..efeb1512191a 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,5 +1,5 @@
 DIST polib-1.0.4.tar.gz 151634 BLAKE2B d0f28ae50e1c082f695867da2b65721d161b9df56b4978feda59388b20fee3c3a060438aac0f1f08420d5133d1b5425715a3c0cb00dffe0e7515d642e287d2cf SHA512 a38d57acdaded0371be83825a28f14f178aebdbc0435724f33eebda109adb2b8210e33659ebec88d2d9e98aa60c482d7f8a958ec18f6769fda7a2fb14edd2744
 DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d1749752e1c9a563d9285670db5d43d7c5015fe266f78c89d1ff7a334bd2afe2d7d8b68fb376df35f8902cb0ed SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e
 EBUILD polib-1.0.4.ebuild 754 BLAKE2B e21ccda996b866c4e4aaa37aa6290ffc897a6910b2c9cb3d7415b6aa3c4316f7a04449ac0f7617eaef6e32a02f1c6cd9b74c8f2adf0817e145ee0807e9c5fe62 SHA512 7ed72366cc0bd3b039bf9492143c9627ff9213e86473f7e98004d9f0aa4869cc36d939678ea30fe83206b1b5c19e1df6441d4bdf34bf7958c638d5225fc5e3ee
-EBUILD polib-1.0.7.ebuild 800 BLAKE2B 16ebb715904e97e70560006d1712a3ae057bb585b5e81225a55b823b5131990ae8b31f8656a6d4c4449ca60b70a32a61aff2deac30a8d8a80bfb74c8407668d4 SHA512 252c214ecb2184e678a3636e5b508a1f845aaadfc1acb897a3038637a43141085adcaaeb58a001d586b463bb6f5db3b69d83401dd4f7e6311a52767d266cfab4
+EBUILD polib-1.0.7.ebuild 797 BLAKE2B 5c1255e810ff817496ffc262b5ea04299321c93f9ff9950b47cd8d499774818ab6d916efbb276c57752a54754982a36ff2c77c4597c081ad682e6bcac083a92a SHA512 3a14e043159afbd6ed30ea9977309245186f2a627e2cd237feaa2e16a7faf40e6df867a4beb1ec278adb3065725eaa6ed3d30e7d95ab031be274bfb5691b28f4
 MISC metadata.xml 388 BLAKE2B 49be94fcd86aefe8e2c4ab2035478b470236492908f7d08822a4e035277c83d557f78076d72cd96d6320ec08276c629dcd52d04380518cf694c10ebdee0bce16 SHA512 7afe518c98f3cbb71d13aa4cea16fe59eae8f711a1d1dd58c982c1dd8946b0a69196e0979612c995d53be215148d05615226eecc4be457adf8cd35b96f3f3f57
diff --git a/dev-python/polib/polib-1.0.7.ebuild b/dev-python/polib/polib-1.0.7.ebuild
index 0495d83fe99a..73369498a496 100644
--- a/dev-python/polib/polib-1.0.7.ebuild
+++ b/dev-python/polib/polib-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 8db746976034..9e6adcce1898 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
-EBUILD portend-2.2.ebuild 713 BLAKE2B 8373a2a22b28185f5546ca1d33d75c0e69c7ad7a16e415da3fd2e3904590ecedf25a89a1d41738842920600a5b9ec5c1ae63077d265055fee330081223039270 SHA512 580e2db88eed8356a627af8f9ba9e9483e3009564f01c0498d4e367bc9bdc2d9eb0f291ee5e5d21f95785b56edefe31603e01289fc4a91db6072393bc48e3ba3
+EBUILD portend-2.2.ebuild 719 BLAKE2B 868fe2b8b3b2d8b8a9bc34692c7adf3c30b9b282b496a11646b2e72d16a74a63126846fd1d201e00d85bc7a960cf658caef614a8903eb5216a5eaa4d285c1e3f SHA512 36f519767a24d7971b0ea5845a733487cbd7bc7f5b524e8d1b490fa9633ded90ccbb6fb3eaa798ce44bebda0d0e9c0b936edbde711094e0efadfbc9a0d3bdfdc
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 5c7f4e15219a..136a42637fa3 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 953ad2f067a2..dd8724665554 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,5 @@
 DIST pyblake2-0.9.3.tar.gz 130641 BLAKE2B 5165f104b5d6bc10bf8b72177b4ad08db55e1a92ad1f04efae2c3d73b6f3f52a0962cfb23832a5f5c1ed9d75c7c3a04be9c37643e381abfc7a2f843fefb43151 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
-EBUILD pyblake2-1.1.0.ebuild 781 BLAKE2B 8d0ba783acaaa3bc5e859339409b678cccc14906cd8703d273d2cf2d9a96c299be625a37c780a4cbdd37e98d9aa33edab51c60db6ef1621b29c96c054c0fc805 SHA512 c5247439cf39631e0826cc380b9ebbee49d4830b44d9a9cfeed5e138ebd147f76bd517d5f3b4e46722af41172db09a9666c7b55252d87e3d856e5da173d254b6
+EBUILD pyblake2-1.1.0.ebuild 805 BLAKE2B f1c7beacf65577897f7edf2617b9cc8e3f792c82a0c9652e62b282b93ea84a3d3af38b1c39a53dc9adaf681511dc9007e90c25f66e2cbd68d7207265a62d49c3 SHA512 f122c31a9f37dd1388f01c4adc8b6b068ae179e4b7bffc4d43985831dcba6c98d36bada89c1397d7afeec943773d6cc28375c3c615738b56d38445b53c0c65df
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 41255bdd959b..f9dacce78ea7 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index f8f00a78d8a1..098eaf38a9cd 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,9 +1,5 @@
-DIST py2cairo-1.10.0.tar.bz2 402070 BLAKE2B 77a0c85d687f286bc77d6c8f05b50d534c7d2569cdd34fc3455c3d1e46580ba10131253ee94f3c5bf8bdcef433b09e75dd7d5f35f0c344cce571ed64979d6c35 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc
-DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 BLAKE2B c2e0797e60b17bb8a871607abe51ebeb49a34de2036d5fde062abee532f5589156a80c8b6bd8d8906d2ff694a5736e28c6566db4d472a824aaaabd2c006dc297 SHA512 c367a7d8fa771ac900ca3363cb7dfd50de045cf67c73c6e552d05018c6933b13dd5660b033be59e1acf8af79f16253a8e56aaa3f135a262a8148711ae8b7a587
-DIST pycairo-1.10.0.tar.bz2 246556 BLAKE2B fd04135ef5c4591641cd3ec29aad4de70946962cb0473e737b7cb4ab1d88295cbd920a598923e0c28af44175a69ecfa194a7a64ca27dcc109b93f1571cdf2fac SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
-EBUILD pycairo-1.10.0-r5.ebuild 4801 BLAKE2B 9ded1e263bdfa4ffb0c3191372936a674afe9f54daea7f322febfa800360d81e0dd5e828307afc4d89b0a1229ebbcb15855f5640e49868e78313afd5adafa1ba SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a
-EBUILD pycairo-1.15.3.ebuild 1608 BLAKE2B 4749c1ad1b98be907999897783bdc3e576457c0c9a678c45ddc12bb39a7c44aded89ba8e2a0ecd4d709a523d64239386748d788260f625d60fb4da36bd1e350e SHA512 5feda5dc1598b37eacac9a93d2d59fd99de65575866f2c98fe911295225c1fa15aeeeaf41c0187ccac170ff6628e431180d2570daf03c5207a2399a6769b1358
+EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
 EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
deleted file mode 100644
index b61eec3973dd..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
+++ /dev/null
@@ -1,149 +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} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils python-r1 waf-utils toolchain-funcs
-
-PYCAIRO_PYTHON2_VERSION="${PV}"
-PYCAIRO_PYTHON3_VERSION="${PV}"
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
-SRC_URI="
-	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
-	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-# LGPL-3 for pycairo 1.10.0.
-# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
-LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +svg test xcb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/cairo-1.10.0[svg?,xcb?]
-	xcb? ( x11-libs/xpyb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-unpack.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-101_pycairo-region.patch
-	popd > /dev/null
-
-	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch
-	popd > /dev/null
-
-	preparation() {
-		if python_is_python3; then
-			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
-			pushd "${BUILD_DIR}" > /dev/null || die
-			wafdir="$(./waf unpack)"
-			pushd "${wafdir}" > /dev/null || die
-			epatch \
-				"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-py3_4.patch" \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-80_fix-pickle.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-81_pickling-again.patch
-
-			popd > /dev/null
-			popd > /dev/null
-		else
-			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
-		fi
-	}
-	python_foreach_impl preparation
-}
-
-src_configure() {
-	if ! use svg; then
-		export PYCAIRO_DISABLE_SVG=1
-	fi
-
-	if ! use xcb; then
-		export PYCAIRO_DISABLE_XPYB=1
-	fi
-
-	tc-export PKG_CONFIG
-	# Also export the var with the slightly diff name that waf uses for no good reason.
-	export PKGCONFIG=${PKG_CONFIG}
-
-	# Added by grobian:
-	# If WAF_BINARY is an absolute path, the configure is different and fails to
-	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
-	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
-
-	# floppym:
-	# pycairo and py2cairo bundle different versions of waf (bug 447856)
-	WAF_BINARY="./waf"
-	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir waf-utils_src_compile
-}
-
-src_test() {
-	test_installation() {
-		./waf install --destdir="${T}/tests/${BUILD_DIR}"
-		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
-	}
-	python_foreach_impl run_in_build_dir test_installation
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir waf-utils_src_install
-
-	dodoc AUTHORS NEWS README
-
-	if use doc; then
-		pushd doc/_build/html > /dev/null || die
-		dohtml -r [a-z]* _static
-		popd > /dev/null || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names; next to waf producing dylibs (not bundles) and
-		# calling them .bundle, it also has no idea what it should do to create
-		# proper ones (dylibs)
-		fix_darwin_install_names() {
-			local suffix=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')
-			[[ -z ${suffix} || ${suffix} == "None" ]] && suffix=".bundle"
-			local x="$(python_get_sitedir)/cairo/_cairo${suffix}"
-			install_name_tool -id "${x}" "${D}${x}"
-		}
-		python_foreach_impl fix_darwin_install_names
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 3f400cf8083a..7866b76d519a 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 5e3d697ab5cd..7e816b2051da 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,5 +1,5 @@
 AUX pycrypto-2.6.1-CVE-2013-7459.patch 3808 BLAKE2B a13ec783c0a99f06efba4caa2f77cc101bad577c47eeea58a53aaca343fb6caa4ba6e617c5ff07808781c2fe71a2f48fd9a3ec4aa18d504d56ab0e7a2ec9f40c SHA512 b34a28fa886ad749878aee17459307fb3006f392304a368e9c80b9beac78b1bca2f35831664e504097996ae1be4e1e81eae5e68b211e47fbf11f2b05b2379fb8
 AUX pycrypto-2.6.1-cross-compile.patch 489 BLAKE2B e4505725793379547d13a3b08b3621471ae0828915c48253aba778b576c3b379267210e5e763ce9f78f3f9ff992b2521c9a9940c744042d16ba992b9e5728b17 SHA512 fbf1f5b6d065725e84594c1493d0d795a9f8c73d9e873f28b473ebc6bf2f346330d5a92362e1dc09f465227f0bc839ccfaf8dc0011c21323ac80931f74b16fca
 DIST pycrypto-2.6.1.tar.gz 446240 BLAKE2B 89c9cc5b8cbd446364bd56c170c2733b960ec269a6691085392b3cc0ebc2eb244721f6763ed72a1254f90bfaadee2cc1a8446865a95fca19ffb36700d89711a9 SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847
-EBUILD pycrypto-2.6.1-r2.ebuild 2105 BLAKE2B 1934496680b39cfd9b6cf5065a743ee633cfcabc836aa244dd3fb394f97c56bb878ea18e379ec91ed54b43a8d492f475e11ac04583a068e7b4762afbda4ee965 SHA512 122808e523aa259994f6b729ff3fc51db168caa9c95ce30d09ee76ee647233ef0578bca6f6d099ac420828b3537152ac5ca309c2ada25a5ab27ab94f74a07fa4
+EBUILD pycrypto-2.6.1-r2.ebuild 2093 BLAKE2B 54768a4842e8a1c71ff169f2d6dc85edc7d6172482439d13348f24260368fdba5935d2eb1d65c859d1aa5107a01726b426ba19b5f53ff7998eb42a14d7ed1186 SHA512 676a6bee8c14885bf8b523e5704b849f4410d7cd159c3b9e600288bc0079c429c92114799312aa8c51bf08b8481c395d04b601bdf3ae2bf5fc25cb59e0312e8e
 MISC metadata.xml 1797 BLAKE2B 0880d583a65ca52fccc51fc6451205ad5ff2bdb49e861c8abc3586e396fdff72fb1b30082b44eb6a48c4e5be32895a5e4a74642821b9025e8ec0b1d81ee7620e SHA512 63afa4bd18299965a4e5ae4690ece849a00d568cbae5bc4d7983f4299fa0755c5cced81a8d160820b3b3f1772c5b40d0e81d8ac2b4e784f4017400acb592ba65
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index d5de62ef8300..d29462284470 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 
 RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 171dd93e5f5e..c94a75120dd0 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,3 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
-EBUILD pyelftools-0.24.ebuild 916 BLAKE2B fadc7507a61937c8f9faac5519db03fef3880444c3bc6168065f106a82a3f6e2ee036efec66f68520ac681906736f93414e92f21b14a9e253ed66f87c2070c22 SHA512 13f55deef148eb1522ba8dcb0b1c090d95fb61a72036b7d918a5cd08703c935ac7a83d60022965d28709814da98ee1ed3a1ccad07d8a661f2a5199e4d8163cab
+EBUILD pyelftools-0.24.ebuild 904 BLAKE2B c5bf1c570fbacfb2561365c361c9dcc0955a13168eb905f94467f2336fd9ef8db9af74340c8037109dba8e38262f272b63df159de45f37751205c0eaa5f9a72e SHA512 b6a8994f6d3f1d31d0fa7770786a058a67adff181bb978126af0dbbc5cdd41b099279f87de5717854e5fd2d7326c9d5a134cce40e1aba436dc92d933fa1c12c7
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index 57e50c588117..bab6324ff1bc 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 9171640d314f..fb2ae5f906f3 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -4,6 +4,6 @@ DIST pyOpenSSL-17.2.0.tar.gz 170816 BLAKE2B 10abfa61ff329d23c99897c58a02a487c28d
 DIST pyOpenSSL-17.4.0.tar.gz 169362 BLAKE2B 87a51efaa157b4a91a48edfcd9348402b6734e1c9f78e7ed638e3d245ae3922083c625e3d967e7513c588e131f96b06f110ae528cccbbb820f685afb9dda72ef SHA512 c3c791b15f2245d3c1381f84471f9e1b07b4a01c318a5a4012ec70193ba055fe948ba150f9c88d2dabe30b37f2025fe26ffb95c01682ca656d561014d41cf965
 EBUILD pyopenssl-16.2.0.ebuild 1596 BLAKE2B 2fddd33669aa0bec3680851737fef5be19fdfef10dce644afe2b3e07c8e1bf452263555fb4dd6e21759e7416fabdf7e470bd3a8c7a255d96feb10401d3f52bc0 SHA512 f91345bef67ef4d002828b6db8cfdde9ea1bd2e502672e2c29be7cedb814127a0d7f08ac0ab1c601b7056a406020bc3569c5a6b163fd3b13d92b6290afeccc2b
 EBUILD pyopenssl-17.0.0.ebuild 1606 BLAKE2B 170a0d141beab15e063bf6137e7ffb052265676e9ab9134748f9cd608a1af8c1c30354e0b9f29ccb576a7449ba7f96bde4900b93a220ef04d7e9c31110e152bb SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f
-EBUILD pyopenssl-17.2.0.ebuild 1572 BLAKE2B 7275d0930b1816d76ad8afa99384eb50b8d68d705e6b5a5dfed999a592a92840e8140eee12447eba6637f169610b4d0a2ffd2069c04e3dc8da62a971b5afbf76 SHA512 ffe07c7353cdc75044cd5460cca76ecc7a73dfc4c4b942cbbd409612f61e58e05e2089b7ba9b02176e7db33479a849740320c8bdae0104a630aca59807322f80
+EBUILD pyopenssl-17.2.0.ebuild 1573 BLAKE2B 178c8cc77f28ad47c854f60689bdc25378c32dc3cedf8bf4ff1c1692545a8a49618f2b19235c8d60cb3c57520d0e183c2466a85b594902d9cb9fcb8539e26120 SHA512 927ac59c13d8b688a27f49a56ca719656755930eee39de29ff84e3206af271e8b0bf30b3aa3a623aa9d14cbabd4cc03cf2724646161834d2d713d1c00e98b4a3
 EBUILD pyopenssl-17.4.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
index 16630e5d7b90..d8fe4c3aa6ac 100644
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index e663a4534872..f41fad330a30 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,3 +1,5 @@
+AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1238 BLAKE2B 09a52183ab978fc941cba857271228ba036832a2c7b48dbdde728d6903c5eecd865f9ec9d04730fb5c0e5e9eed5f12bc062a64e0494dd3031f614fc5b75770c9 SHA512 2de86ee403ecb209a5093575aab31f7aefd39ad36f2b745fea393f83c340eb2ff15872ae0dffbe3bd29adeb1956c53bedc0f0b10462ee6ca9f2e3dc686f4f5d5
 EBUILD pyqtgraph-0.10.0.ebuild 1222 BLAKE2B e0daaed27a5710a98e09508fd047492c89ea01fa8303cc4c1f370148d8b530da6905e7ffb51d6c4cdbd7df9ca24e6c07f66e366a7488a36fc92a7d3a40af4ac4 SHA512 8bd56a0d401ac1bc1d5ed34e258d912cfac4dfce5ee5f483710716de73bc072c9f94a342478bfc77c50140b3bd90bc4fc0141dcdd568c5aa3fd7a6d4aa58bff8
-MISC metadata.xml 334 BLAKE2B c8fcfcad89f0666ad4d69bc47faf07e9834a321839064177fa1d35904be17625dabc122dd467736854513d1f481a486f880993fbe366404aaa73b2ab9b813c35 SHA512 0508e3e04125aa9ec46c82dd47593ad3055ed8769d4d1499d892986db40deb9f5405a57546e48f06149c0298bd44582efb53b4b21d67d15e8c3b3fb3aee63eba
+MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
new file mode 100644
index 000000000000..b74df26df5d3
--- /dev/null
+++ b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch
@@ -0,0 +1,10 @@
+diff -r -U2 pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py pyqtgraph-0.10.0/pyqtgraph/Qt.py
+--- pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py	2016-10-17 23:22:41.000000000 +0700
++++ pyqtgraph-0.10.0/pyqtgraph/Qt.py	2018-01-23 22:52:19.503525554 +0700
+@@ -25,5 +25,5 @@
+ ## is already imported. If not, then attempt to import PyQt4, then PySide.
+ if QT_LIB is None:
+-    libOrder = [PYQT4, PYSIDE, PYQT5]
++    libOrder = [PYQT5]
+ 
+     for lib in libOrder:
diff --git a/dev-python/pyqtgraph/metadata.xml b/dev-python/pyqtgraph/metadata.xml
index 1dffaf00842a..3f66bf396f36 100644
--- a/dev-python/pyqtgraph/metadata.xml
+++ b/dev-python/pyqtgraph/metadata.xml
@@ -5,6 +5,13 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <longdescription>
+    PyQtGraph is a pure-python graphics and GUI library built on PyQt and numpy.
+    It is intended for use in mathematics / scientific / engineering applications.
+    Despite being written entirely in python, the library is very fast
+    due to its heavy leverage of numpy for number crunching
+    and Qt's GraphicsView framework for fast display. 
+  </longdescription>
   <upstream>
     <remote-id type="github">pyqtgraph/pyqtgraph</remote-id>
   </upstream>
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..d69ef3721ec0
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -0,0 +1,47 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.python.org/pypi/pyqtgraph/"
+SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples opengl svg"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+S=${WORKDIR}/${PN}-${P}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# fix distutils warning
+	sed -i 's/install_requires/requires/' setup.py || die
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 445c0b3fd8eb..14fe59aabd61 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16c9f7c59a47929b8504a7e6aed803cb1fa07260ef8fbc5ebb4b243a52329a5a9976ca947c00243fc5dd3bc9e34e8a SHA512 6bfb657841382c4ad402c383cae5092b83e93a3dde0b905f6cb8ca8a50b8acbe0f3241e9cc50cb83892c0d59b13145764faa2a3db1eabecbe6606a35d07bb5ff
-EBUILD pyrsistent-0.13.0.ebuild 912 BLAKE2B 5c977d1ac807d385b039287c84b6098d21cab68ffdb5267db7bb9464d623f557e1588f3734ca5ea4374506e6e44f9184a69f6795c2b03fe38edeeaa0a6e2750f SHA512 89ae8ed3601e5f0573eb10211149e6319e4e397bbd92834343725f7a64c63ab2e64e59d6c32b089a5d0476619d77987ffda22c4de257e12aa8a0877efc7ca620
+EBUILD pyrsistent-0.13.0.ebuild 911 BLAKE2B fabbaa90e2e8f6914ba2d77139e38867f16b2b8028f4b854bc67c20ad3bcfc475c314b23a01cfa763afc210ee345d29cfc54269a60363e4d7cecad3f693c43b7 SHA512 36c94574a75fd0de857daf179f8daac3158186654da97059e77ed38bfc4d642ebb36e389e2e16a58c69b2b39806bb495e830c8423dd48e6a6330e2b5c916c27a
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index a3ae27aee016..1609a504f549 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 573d607ebae2..7bc52a3f877e 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,6 +2,6 @@ AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105f
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
 EBUILD pytest-cov-2.3.1.ebuild 1539 BLAKE2B 2ef33a3cb6cb07cde3e5a756a7b25c1e81847675a409b35a3d81a4b77a7c5baa5b50dc98b83e3590434a2fa690de006fb4fb3a1e3de9eb21b339bc0c2a5e4a6d SHA512 4b2d0235e1affbd327df01544c6db6b807752aaece33f38bcbcbf66121e05967d8355784e91015b9183b51932008cd6ec984b90be2871b0fc6e3f70e17de2065
-EBUILD pytest-cov-2.5.1-r1.ebuild 1492 BLAKE2B 065f6e33f8d6e18f0a2555797e1743e85b2daf06124b6b0236a0872ddd1cd241ca37c93f4527e54366c9a856cd7dccd8cea653978a1c510d62290e6320cbbd8d SHA512 93b3047688f7084ab81d3e93320122bf8df7a5385b5542b50f66a56bb0c0b57e64563faeed959eca6fb521e8ba084b444c8826602c1f222462a1b904fcd79cf7
+EBUILD pytest-cov-2.5.1-r1.ebuild 1498 BLAKE2B a6aa711f8346945aa366c26ac59569b5ac0b0488d5b85aecc099b055770e006ab3f795f0b81594b5cb918333ca7b2579ae26c749818692f9dec702d8866b74b2 SHA512 dbc392ab9ae9bc5561738835b594d33dc948d562190df2b1314084e5d6054678e8c616e3ef2d7d2b1c7db1db1346f169332962ab946c8eb03313edba0f38abf6
 EBUILD pytest-cov-2.5.1.ebuild 1509 BLAKE2B 04b63690469fe1d6af9ac85add37fd75f2f90c4bf95b092efee26e2f85bf47ecb8693628f025621928b26887312a85202c4447708e0f6b116aa886373a01ccd9 SHA512 741f39ad5f2d63ca64cfdad5a2049783d79b1402184a6bb3ced95c894ef332f5b97b23b9c4224ab168f7965af13ce8ea0bfb766fefea7e7d7c153e2b9924230e
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 4d2b6d45fa0e..6a553e46e149 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 550db0cd7580..4aef4ab0164f 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -4,10 +4,10 @@ DIST python-3.4.6-docs-html.tar.bz2 5517260 BLAKE2B c8e605a3b27358c22e2047241a4b
 DIST python-3.5.4-docs-html.tar.bz2 5747840 BLAKE2B 013791c8d0023ffa3d3e07ecfbb82dd36d2fc3e14514f4e14ba90e3d65d05aa4c3ec7cf7c86fe88090dfa0323c444acdefafa36aa315c98db1b5f7af9c0bd5fe SHA512 b1c6028e91bdb0a85a6765ab66c50574804f0aa799c6d13ed4163e6aaba98eeecfacd8576fbb6a721028fe84049ac1718497ad491f993973e3e410a660a10084
 DIST python-3.6.3-docs-html.tar.bz2 5945784 BLAKE2B 88473f63c6a0d533d568184b8459353bea3bc49c24a0a0e5f3ea240556971f3a76018f08f18371b8c7cdeaee93c4cf466fb20eb774db96ad4e63fb45ce730e26 SHA512 ffd6ea459ba36b19c788638f7e2f72ecd286218ed7eb29493819137c4bc25c02714128f07b781ad642eb08826d00924bd1b90a236ba46107bbe17de6633fa1ad
 DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be125586cb5757a34e2b342358517d62656734545fc221812f3c54cdbdb877188648551c3e1cc9331f159d011ca2b0bef587847a471 SHA512 a4cf51ec0e7127f417b066e2727258395954dfc5f1aaa0ad1d25e81dae40ace0d51b18413600fce0f5b1002e4b130a3914b7c9244025375e8fe5332c8d86635d
-EBUILD python-docs-2.7.14.ebuild 719 BLAKE2B 4f97d7446e5feb44d657f1136f9dde82d42be3129bc776f0024030b324f497e28d41d291b77329bcfa0ea9bb09efe3a491edfc87878b49017090697ef8b9141a SHA512 313940fb52cd7ff642add74be1703ef6b0f0cafb081222923b382925eb56a35293424852720f126fa3dc4711cfb3e7a52fe4182e4b6d824b7db721ed82ab08d6
-EBUILD python-docs-3.4.5.ebuild 719 BLAKE2B 4f97d7446e5feb44d657f1136f9dde82d42be3129bc776f0024030b324f497e28d41d291b77329bcfa0ea9bb09efe3a491edfc87878b49017090697ef8b9141a SHA512 313940fb52cd7ff642add74be1703ef6b0f0cafb081222923b382925eb56a35293424852720f126fa3dc4711cfb3e7a52fe4182e4b6d824b7db721ed82ab08d6
-EBUILD python-docs-3.4.6.ebuild 732 BLAKE2B be089c896b261457a638075eba5194514ac411582d7736a737bf2d663697e2e37a3e13329d0ee8810e09cb47df5b5ee7e0378c17c5ac4586114b065355d2d5f6 SHA512 7e8e8c6a97c6e6f4ea56178f64e358dd9acd50a93b25da3ff1b863e4705d7a6401e52e89086eded1462dcbd3ff196ddc4600e2534c856170aa993cf60eb61073
-EBUILD python-docs-3.5.4.ebuild 723 BLAKE2B 24c1db0cc259a1bfd8075fa010c9af99a5fa43f78aff523263c1f53bfc3c443e10c05093d7ebb0bdd04f2ccce2cc35202c3656e532de0d32199310089348b6b3 SHA512 622be7aa469f51762b29fe86778429b0ba5b1ce91c4bb5da10483f0bb864b00e7722073f40dceb3eee1fcc500539804386b5b6299c862af9f65fd9eb483a654c
-EBUILD python-docs-3.6.3.ebuild 724 BLAKE2B 72a6de8f1b2c27d6bcba786b3b15536f6294b79ed37d0d5cb39e615308fd8ae6a3be437c7a1a102b64a8f06f1dd85214c91df6c25b930f9ea31496b96571bd85 SHA512 def7a830826f1a46bcd04cfd14a0c4cb7807be3f285f26a1fdbf911cce2f8621e6b527f28cc4ddd876f5faccd0442c73fc5363ef05c3f58aedfc93479535d4c1
-EBUILD python-docs-3.6.4.ebuild 732 BLAKE2B be089c896b261457a638075eba5194514ac411582d7736a737bf2d663697e2e37a3e13329d0ee8810e09cb47df5b5ee7e0378c17c5ac4586114b065355d2d5f6 SHA512 7e8e8c6a97c6e6f4ea56178f64e358dd9acd50a93b25da3ff1b863e4705d7a6401e52e89086eded1462dcbd3ff196ddc4600e2534c856170aa993cf60eb61073
+EBUILD python-docs-2.7.14.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
+EBUILD python-docs-3.4.5.ebuild 707 BLAKE2B e304a34e57eb6a688e1b263a04638c740b59bf242389ef495c8fd02ccc0bcea14ab5c194b9ff2944157d82885324d2c445292244fd3fe82d55e93e46db2db2b0 SHA512 0b89cd37eb48a503b365f4691c60155b00735d92ae9dc9f137051f640e7a57d1983505c9675f2a6eeb486c5a91c3115d2fbc44ba07a357ec0e5a0977c38dcd59
+EBUILD python-docs-3.4.6.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
+EBUILD python-docs-3.5.4.ebuild 711 BLAKE2B 96a7d98d1c93ac3fdd84c4e3e012e3ab4c42b0f44ba02305152430c369975ab8bbc3415f4e77cd60829fbe7f849b37df1c10ca5e1bc78ea9004d4bee03dcf84c SHA512 f61b84c8ead4496abcb2de42173f1b9597f69488e0fc52cb7fcacb9d4d1a6fba85bd88e17d900ef3409bafdf753302dfade8a571503bb3068197bcaeb22113aa
+EBUILD python-docs-3.6.3.ebuild 712 BLAKE2B 2726fbbf972789556ad12704c1613bc84f8048e7cb77d570528a1ef290b196b1ef79d636b72b57c5432a6a7cb30e7a5c995720264ab1253e1820703f58382429 SHA512 063898eace0b5bb10a1f808805b43ce619331f81c6d8d7283923cb9813bd315f69ce617b9ee98e2280857ae3c68378e6e7e8443edd268d5481327f13b4c817c1
+EBUILD python-docs-3.6.4.ebuild 720 BLAKE2B 34c99f8347cf43e0ae636ceb61ba8f693baffa3bf0008609ad630b7ee2851a2944ce38f8b1a3ff7356fb58c22d1021f7def5000eea1ffd8e260e88dfe093f4a4 SHA512 8e5ed3fa70c0e7fe9b1dc82a72a9789d793207d01d913f7993bfe6b7ec743a3378b8e4c111ea4d287203aff0f2311cdd7ee6a2ad5c3807630207897bdc474a80
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.14.ebuild b/dev-python/python-docs/python-docs-2.7.14.ebuild
index 40bed4bfb9f9..16ab1890661f 100644
--- a/dev-python/python-docs/python-docs-2.7.14.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.4.5.ebuild b/dev-python/python-docs/python-docs-3.4.5.ebuild
index 40bed4bfb9f9..16ab1890661f 100644
--- a/dev-python/python-docs/python-docs-3.4.5.ebuild
+++ b/dev-python/python-docs/python-docs-3.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.4.6.ebuild b/dev-python/python-docs/python-docs-3.4.6.ebuild
index 8478819dc0c8..065d7091d1dc 100644
--- a/dev-python/python-docs/python-docs-3.4.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.5.4.ebuild b/dev-python/python-docs/python-docs-3.5.4.ebuild
index 0725faa64ce9..10ce6019a601 100644
--- a/dev-python/python-docs/python-docs-3.5.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.6.3.ebuild b/dev-python/python-docs/python-docs-3.6.3.ebuild
index 3aff5b480dab..c867a73eba85 100644
--- a/dev-python/python-docs/python-docs-3.6.3.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-docs/python-docs-3.6.4.ebuild b/dev-python/python-docs/python-docs-3.6.4.ebuild
index 8478819dc0c8..065d7091d1dc 100644
--- a/dev-python/python-docs/python-docs-3.6.4.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
index 60af19ffcb53..d34a70181ad7 100644
--- a/dev-python/python-fchksum/Manifest
+++ b/dev-python/python-fchksum/Manifest
@@ -1,4 +1,4 @@
 AUX python-fchksum-1.7.1-md5-align.patch 699 BLAKE2B 6a1f30d90caa64cdf353a8c264da5794d3fa2098bcb4454073e3c76a87e7799dbede7f050b77048f711462dd6b4c915a7f107cd9e1e2d290b8a8c9f4101b564e SHA512 53b32029e211ee374c8b3a10680959af36a7a85b2b243bfc13fde6b195236fc2a6295e2d3b66be621773105f709467f48a711b2bc8de2342245a300aa55c557b
 DIST python-fchksum-1.7.1.tar.gz 26724 BLAKE2B 63385862b770c30098f80912c37b9e559fa4a1f400dcc30777cc8af4fe8abc2f658e41fc33035d7c6f04624960b499b04ae03257656589cd24986cd7f8273f5d SHA512 59b561e2938c41bcda2b98eb3fa0670be3fd85f8cb67368132ce239cac21760a5e9a5a05be2429992fa480ccd2e2aa457df7b4a07e709acbe42be9b1559f3060
-EBUILD python-fchksum-1.7.1-r1.ebuild 690 BLAKE2B 095d1111da701d731520abbbf5b5e0df0fd77545f819862a468da5a4b88d76e4845f7b980fdbdaea560dd4eaa365492724393a79401b0d49a61b1266f2d5fff2 SHA512 127e5626f4928c20809c1820981e2e3eccfe3e5cac70fda95667e93184c3a39502c3080b97fe286b31bebf216b16d471a63284e0480f51e77667f1887a1d7d4a
+EBUILD python-fchksum-1.7.1-r1.ebuild 678 BLAKE2B 4181e0a13070974d472bf6119ddc7bdfb6010629a5cf16eb71d352a960d896a0be6a73d0f0a3ddbc6e9afbfdafa0d75cc69ee17360f4948e73c47917f69b0748 SHA512 3e0a99d09b9a61740ec63e9f9677b755f22772fb1ffeb610068dd483e9cffc095a78222279f75e386e4ddbe9b5391e9d431991625abe2a8b152477575591aa7d
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
index a80d84cefb96..309636264d0e 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index acc513c30810..fe95d3aa7142 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -2,5 +2,5 @@ AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d80
 DIST pyudev-0.20.0.tar.gz 93217 BLAKE2B 9426b3f012be0b1bcacb7f3ed8b33d7965a2a8d7c676f032a0f2f9e6013f52090ddf82434ba01411cc2886796d34f736dc3d2e1abd6f45ee7ad516e9d5f45f90 SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
 EBUILD pyudev-0.20.0.ebuild 1667 BLAKE2B 6b20c4b6ca9e7d6436bf661df661825c22bf8aa6eace1b48d42a75cb5fa235187675ec91899c5f8b8aa33fc795ee476dfb23dedb78ffa22fe7bbad4b3e730093 SHA512 592c4d063140a2946bd029d1a6df488e839b9ea75b506266f21f1d5d394487db5e41a5b6d0d3f06ae96472982affb342de65d0f7e810a94d9a895447369dce2d
-EBUILD pyudev-0.21.0.ebuild 1526 BLAKE2B 6f83d3951951f329932debca4462f39d91878b04407bd9048b3476049a575274bc5761256770b0b34db9552661eeefbb4d57c696e15ab025c8aa53de790a256b SHA512 7ebf671fb1bedd1b97fba1c6531627bc46a36697f8599fc0734e0631180d88a9579fe092595788f4c80dcbc772601a8378f9252c11db675edf2dbbc053eb2d9b
+EBUILD pyudev-0.21.0.ebuild 1525 BLAKE2B ca472c816a357daf4426590711f9bcb188695b3d63c6a37ed880f35e288635ec5039f42f9d1ab2edde7437233dd316d69ee6c8c6cd89ea6a47f662ef44b8615e SHA512 c70510eff13ce50465258b0f031a6678e5959b4216670285db390f1a4b89e5ea9af4611054033c7eaefa0ef1bda9bf9afb081d84f8daec16a16bacd415bb5bdb
 MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index fa91fd736fb4..a991dfbc1103 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~x86"
 IUSE="pygobject qt5 pyside test"
 REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 39313796aaaf..ba0fa51132d1 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,6 @@ AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da737
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.4.0.tar.gz 1995779 BLAKE2B e1111e784ead913f803ba8151bf3585fdba9fb5e0c1d568c839d5ac08f5e6757b608c8049644264dd1f0bee5b4bb0c1750640a70feef34eff8e276d9929377e9 SHA512 7f00074b93be49e1aa7650e61381e285598599911b12a6b63c0f12d6eb64bc59afb6907b683350740b0a81c99a3164373b27e18cfccc0f9da12405c3dacd1ff7
-EBUILD reportlab-3.3.0-r1.ebuild 1666 BLAKE2B b40ec2ff01a2c64bf17d58e04c626253c728dbfd117ab5be78fb01b56f6815b081ac6e8b75d3f16edf9d4b1e685d0fbdeca280a22bf92f1f0ab9c2e7b70dde12 SHA512 3a14bb37721c8cfe9e0b97b185aff26d7300128c1f47d6723a56378bd1a7cc63ea9a6d4669af8ef55a2ea589a4e1db66553d5f4f1235f7d37cc2c678510f1945
-EBUILD reportlab-3.4.0.ebuild 1697 BLAKE2B b9898f40d64c1a0146a94a1cb2c750e4ff50158ca3ec8b34c11f4c5ea12b5cf95ffbf2949d0f44eb4dfba591544ec6d13025461ed4cd14ec1f8e5d380e93e0a5 SHA512 9b7e35d4ca25eec9576d62c426cbaa2d3aa2ef87eb5ba50c9add55b6bfc3b1bdaf5b79177af700ab498e455d2357dce27dc6a79ab99427ed392be7255ca69dd0
+EBUILD reportlab-3.3.0-r2.ebuild 1666 BLAKE2B feaa5cab8351bcdd953ca8eee04bfe94da9d6b46d76818e3f45f9dabd7a4505ee774a0d4e7a2bf0dcd9e2cef49278340c8f51f7372c866ac9f8109dd6a841a06 SHA512 368eb6c3688f99ec757ca3c5d7ce2230ff642e8248b6be9bf312b7d985ccc9c2acc0e4eea773419c5eb9ca944a0cbcac0cccfa4455ac39858d74873303ed91d9
+EBUILD reportlab-3.4.0-r1.ebuild 1697 BLAKE2B d040d66bc8029ea9e94c7893707d8f61b0ccf410eb6feb547dc2a6cdd7a86f82a5b0223a44975e83ee81762d4b44f1053bfc494dd4e4ac47ed42fbb99fcb4af0 SHA512 30a2e5b2cfbe2a9a69ea2fac355791a97f6b60f3eb1c7248b793970ba8b9550c73713fa711dee51b56ddedc9903709d98734f877e3cea92c9371d03baeaf5413
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
index f950134c4fd2..b5246ec3edf6 100644
--- a/dev-python/reportlab/reportlab-3.3.0-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/dev-python/reportlab/reportlab-3.4.0.ebuild b/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
index d9aff09004a9..86a8de6dbd08 100644
--- a/dev-python/reportlab/reportlab-3.4.0.ebuild
+++ b/dev-python/reportlab/reportlab-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9f2881c18cd9..7bde6a34d05a 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,8 @@
 DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
 DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-EBUILD setuptools-34.0.2-r1.ebuild 2038 BLAKE2B 5a53ebc2d8195e9e4ad48a742ee07a3459a0521197bbc23120c593cc8e13024d9fdf7ea2d0bad613343ad48c3cc874de05fa424c3dda1cf186905514b5fb5127 SHA512 69c22798fa9845772e20e8eb3b5a187bfdaf2868a3cc441b99cb5afa84e13c88bab0a983ee0784d4b29e9b2e7b937cb50d9fa014ce15b656fff16c6efa27f4b0
-EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
+EBUILD setuptools-34.0.2-r1.ebuild 2026 BLAKE2B 0999ae1d1ae5bdf8f0e8d98d35663afc7af8d3d4be637a239e3811607dbb2e34d2428c24055de7d075732e9ffdc45b8af12a50e1e2f605674b545733f240dd08 SHA512 eaa7f954938b08b580448455e507046b080bc2b804e0d5bb007e6d485418afb7638967656aa33872b773684ac9c4c84d053b834038f555701a33500f502e03dd
+EBUILD setuptools-36.0.1.ebuild 1890 BLAKE2B 4bf0f275c01a08b3358a5ab34fb8fed5fbee7acdce432dd45695d0e0068a757dfecb5645f12c5f1bbe7994e885a32ef693b3e012a7c8049b2892e7e7385a4d16 SHA512 8cd5f38fe9dc164e5440fa6fce425a64ba70c240f1c5a965f9390d3aeae495db08f05f7eb70789fbe32326068c35bc5eb125ac04ba12ce0262cfaaa73fc4c4e2
 EBUILD setuptools-36.7.2.ebuild 1856 BLAKE2B ff81b3c14ab0c70033aa7524fdeb43593eb81db469e57dc830fac23777722df420939b01054d616c4afa142e4656f77e5fc8f73216e6d481f90e9f395049055b SHA512 52902140f245ab92b96651116754e195155fcadeb5ac97a255f939e5f613234311b3c11ff8d2646acdc997002c5a4db3f58f113039842cfcf450ae348ef8e549
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
index fb4aa3528d18..ab4dfdb73300 100644
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
index 7d871ec24b2e..cacfef117a0a 100644
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-36.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9fc2e20fc036..96548c0dc9a2 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.1.tar.gz 1000644 BLAKE2B 7cb0362a60184ef4e5ba2b53d29c5ca70babd4e81f328beb24e7b3b7f27fc7a3aef3432a4ca599aad6833e088382ae2b705334dc2925b3c98d943cd6f88b1559 SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf
 DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
 DIST sip-4.19.6.tar.gz 1019295 BLAKE2B 107bc63b8c0f200c292bbf465507602904383a1d3fd0b76da907cda2dcf0e79edb9cbf835bc15dbefd991db6a7eeff97462965d88704e3c926ce9e0dd5af829f SHA512 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7
-EBUILD sip-4.19.1.ebuild 2113 BLAKE2B 24d83915451e1c3fddfdce81a571eb4f2422908f1839911d994cce96d03d067e9c7f21ba3a930cefb6a434561506b961bf1710100a98ee175ab2d09d907ebcda SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa
-EBUILD sip-4.19.3.ebuild 2121 BLAKE2B 37583e4ffd346d260d70f86fcd1cf7c4c306fb42fd8a903a87fd2ec78a54a43a5db9cd41fafb609b8361b1a1057734649fbbea5d13906f7d656535528f325a39 SHA512 a2c51c20fae19fb984251cdf9ca5b9ec49b62f25b5e6b571f1043739f9f017eadbbc19da2edaaf8f9c2ae70d6bd8de44c889cc4868706689d03f1a13a77ed718
+EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
 EBUILD sip-4.19.6.ebuild 2776 BLAKE2B d1fbabcd47a7b90975c684020df39eeeb5b5975e541249046bd297a8b42895415bcec6390886e9b88c747354cbe1cdb8293a895f9aca32a2fa91036d4b8ce0b1 SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.1.ebuild b/dev-python/sip/sip-4.19.1.ebuild
deleted file mode 100644
index 21a766bf9cda..000000000000
--- a/dev-python/sip/sip-4.19.1.ebuild
+++ /dev/null
@@ -1,87 +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 python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm 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}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# 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.in)
-	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.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
index 4debf53e1542..f8b510397e55 100644
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ b/dev-python/sip/sip-4.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 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"
+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}"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e1e085d9c1e0..191c89d29354 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f
 DIST tempora-1.9.tar.gz 12469 BLAKE2B da18fc066cb9cf7ee0fa7eefb39ea2ac941760144c7efdea66a05780ced43d574757665dfad6088f98c135e7b14874aef0c8243ab338fcbaa5a515ec27507f52 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f
 EBUILD tempora-1.6.1.ebuild 1192 BLAKE2B 775920937225e50b4335b4d4bb14bead8bdd8858d9f7bde262bd609e8c9b81d102c6b3035906133dee7ee6a07db8ccf53c8e90e9838eef6b31bc2e5505f4092f SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
-EBUILD tempora-1.9.ebuild 1281 BLAKE2B dce9d5716c5760c16b44f593f10527b09ffe90147087780b80142b7db4162ce5d8da6a03ae0325da234a58b302096c4e7bfacf8c7bc83c0373e99393378a29a7 SHA512 a9266c5e3581c13b072f986bff2923c102481f983648ed26311670d0ce5a6dddd7f4f651ed19c2588ae6abada87e1f3f75886d6652d5d12f56f564284f894d87
+EBUILD tempora-1.9.ebuild 1287 BLAKE2B 81e16d6e66ecd6550eb80e0096ab3877d4ef0328643983d4618eaf90e873a08bfedfc5c9b3277b8c52aec0fdcaaf8a84cbdc6ff0caf7414db057492d45da079e SHA512 c20e86eb4e962ace556056ec18cdb326983ef4c436a38c806bb9335c3820022b6397d64b34e728b457a550f53838f8be050f65af97eb66a47beadbc9a8274df3
 MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
diff --git a/dev-python/tempora/tempora-1.9.ebuild b/dev-python/tempora/tempora-1.9.ebuild
index a619b0f986ba..0ae039b43846 100644
--- a/dev-python/tempora/tempora-1.9.ebuild
+++ b/dev-python/tempora/tempora-1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
commit	38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree	6fce284d5bfddaf597a490ac66069d16c6a485db /dev-python
parent	0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)