gentoo resync : 08.05.2018

36 files changed, 38 insertions, 856 deletions

diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 1afa7d0dd8c1..8a64938ac16f 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 17bb8b3b401d..81f3f964ec50 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,6 +1,6 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 EBUILD Babel-2.5.0.ebuild 1474 BLAKE2B fa19a905009e0ed2b3c69a8b941aeca328e923de63b21dc1424c45a28828bf500a99d5f3680032ced396d73114014b3e8c0d52d0e5fee648e9793c102aa3585f SHA512 e57278aa11d989c671a01836089d8642a9ebf02085133ad664a6532a439259c181a69177a3e2063196d27d65056d07bb754aa4416aea60142808dcf2eca36a8d
-EBUILD Babel-2.5.3-r1.ebuild 1525 BLAKE2B 59fa2e62d11c4cf6a91ddb522d559164e2a5edb5997131a347265d92da68e7bdf148dc81faf7c3e67977a188718fabb35ba609781edf635615c4dc601a10fbea SHA512 61e755bcf3c0795c7dd56812fd79710a0adad19f0832675fd54439639fecd9680ce1ca3d9f49071a5ce75e5f93115d8461d84a427c19dac5f2af53db31c61ca3
+EBUILD Babel-2.5.3-r1.ebuild 1522 BLAKE2B ae59ac62d9d0de18309855928abbbf6ac5781b37f70d73dfa2893fa573d5cdba12200bf73abbf6b6282fb089e6a7c98358ff140b2e3d807c716049916173eee2 SHA512 b8b9fefb2bf01060dac00eaa8b9b1be4d2361eb3f181672568498db3a3ef82b0d03902d4595861e8615ddff21eb79ae330ddf13b9a0eef921acd803c98ae75d5
 EBUILD Babel-2.5.3.ebuild 1475 BLAKE2B 6accc1bb679517e07e9872ccddde886e584753a34025b62c95ccedb2dcad5005535bcfac3027b33c3ca987594a4c799cb8c8f7eeb4bfacd6d282fcbaca38e2a7 SHA512 22cd5ca8483f03efa51f8ba7127df0890ad24da1ffbee9ddf56c50e3064e4f8d78ac1244b377ea6ff023c04d4e5f10e8d11554be5c245d28faa52a5228495730
-MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
+MISC metadata.xml 715 BLAKE2B 8bdd049fad7b20c0fed9c6cb5d468468421fdd83404d73f9972bea9e74cb1c7a7bc8a268aa444b62990c61da5a6441491b31a1b02600abef1f693b385ac2862e SHA512 7623e3246442997195e57ee74ca3a60803a90787486a930d4952d06521e0ca295216f8824f9b781f27c48c9e454fc9b0c8a4a9c10de9339a27c043b97acf1cee
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
index c57331eb483e..a498ec71cd62 100644
--- a/dev-python/Babel/metadata.xml
+++ b/dev-python/Babel/metadata.xml
@@ -13,6 +13,7 @@
 			providing access to various locale display names, localized number
 			and date formatting, etc.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Babel</remote-id>
 	</upstream>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 07a105cf179b..34d603f6a213 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyFoam/Manifest b/dev-python/PyFoam/Manifest
deleted file mode 100644
index a0b023ae542b..000000000000
--- a/dev-python/PyFoam/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyFoam-0.5.4.tar.gz 4492783 BLAKE2B c94fb46ed4c0efe3aa0d0572716475efa9109d17a170adc02b3607fcd7d18f92673f093dc91c94393e098feed11c3616dd28440d6e18eb171d60fb1c1d4fda0d SHA512 97ba7f8a10e6d408f4fd4bff0e28ccda36ffced6c6c945d1c20737a1251e61331b9fdd3c4e60b5fd95a4d80bb9816cd384b72d1f39fda8da32c4cbd776dec642
-EBUILD PyFoam-0.5.4-r2.ebuild 731 BLAKE2B fba7a6b72c753fc6cb7a88cda0d3d0ea3ce50f6f5b335f4ce0fc256f7b3bbdb73dea79f5efecf3078127f8ad5c9bcfb4449942b5384b9da8a33c8b07d81e4ec4 SHA512 34d30128728866d7146daa86b917794bba451fe85a6c9d8df44452839d0a9c47d656275dfe4346f2e67742c35d58eb7fb6834efb60e235909d86265fed5cb8bb
-MISC metadata.xml 421 BLAKE2B f5f392bc38759c5497832c41bd029b840872007b4c5080c8f0feacb7f1eeffc13d466fca54b8f673e98245e59269d45cc41ff7eddf1c1422b260ebbcca53f775 SHA512 41f46283096484e408c1fc2f612cdaed8a482d318e456ddd1363d6c17fac8672ce5eda97deeb7e09e9b62f23cec4c564f6c3fa16e19fb7d47b51c81a36316218
diff --git a/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild b/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
deleted file mode 100644
index 7b864da0de4c..000000000000
--- a/dev-python/PyFoam/PyFoam-0.5.4-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool to analyze and plot the residual files of OpenFOAM computations"
-HOMEPAGE="http://openfoamwiki.net/index.php/Contrib_PyFoam"
-SRC_URI="http://openfoamwiki.net/images/a/ae/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="extras"
-
-DEPEND="sci-visualization/gnuplot
-	|| ( sci-libs/openfoam sci-libs/openfoam-bin )
-	extras? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/ply[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		sci-libs/vtk[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${DEPEND}"
diff --git a/dev-python/PyFoam/metadata.xml b/dev-python/PyFoam/metadata.xml
deleted file mode 100644
index c096fbd43ae5..000000000000
--- a/dev-python/PyFoam/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<use>
-		<flag name="extras">Enable optional dependencies</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 92ea8fe48ce0..7e7a1c596f73 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,5 +1,5 @@
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
-EBUILD freezegun-0.3.10.ebuild 870 BLAKE2B aa80183292882defdd403dc057ef6602f6be60f9ba8da775ebd2388d881e1b654db90e5aeb043a67a2f88061d2101fe9a11de1531db5091041d464e0a82e0cef SHA512 fb8f25c1b29d0c0192e51da335a27b5881411cf7c74467a39ac0a693e1d2d06bce5173f5f8e365844e5069320bdf90be3fa2b3399e37d75088eb15fc4bf5d6c1
+EBUILD freezegun-0.3.10.ebuild 903 BLAKE2B 03dff316b20b26b151cd8747d3ccd91721ef45911e99ba546bdb1b9a58850a64c0fa954cf83d4a2282041c2b8d1ffa255737311edc15add9ae440532ac2bdee1 SHA512 df1e8dec378c4996535f37846ae0e6ca620c7f7b43b07b5e09f7a55eba6255e6366c26d5a3f8c673e3e16798185ddb96f8e372c1786ab2ec9a90c6418b77743d
 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
-MISC metadata.xml 368 BLAKE2B fb6f96314188337bb64e24955ca9c4830ef82b11443779d2daca5dd124156db58efc27d6f28f8497b4308526459634cd3d32d7e1698cfdf943d987f493f5e636 SHA512 5d268015dd8be027059e5d405c47c0bf48ca8ead3103031e29748e63a9aa132321257b8f9963e557829a3602fe078933613e70b07b8291d32b7ce2da14b6bccd
+MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index c9305c43c92e..cd858343f8e2 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -12,12 +12,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
-	>dev-python/python-dateutil-2.0
-	dev-python/six
+	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/metadata.xml b/dev-python/freezegun/metadata.xml
index 4fe09364c008..31a19c19064d 100644
--- a/dev-python/freezegun/metadata.xml
+++ b/dev-python/freezegun/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">freezegun</remote-id>
 		<remote-id type="github">spulec/freezegun</remote-id>
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 6058b0d11548..19733ea066df 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -2,6 +2,6 @@ DIST iso8601-0.1.10.tar.gz 8405 BLAKE2B e9831b9a4cd8a6fd8bb1717c182f46250017a84e
 DIST iso8601-0.1.11.tar.gz 8725 BLAKE2B 7eed190b8876ae86f8b551676ce69e8bd3a09156ac44567bbbf48d77229f9b52f9fec62ca3c1fa620bea8c7afe2b62d2d6c5ac22a3e5d88adc6bdcf2b6bf0b89 SHA512 19f5443aae4e3f93b0521a7215318c2833bcca5740ea05f9a6d5771bff2aaeb5626ba26e5ba64efae135bf9420a1810854969dad845aaf67089d5e6898a254a0
 DIST iso8601-0.1.12.tar.gz 8868 BLAKE2B 5463af17cfaf2c1f256790ec11dc50f808857abdf0a341f2c88033e9e94f09069ed570223c3743007e0fff8fdd9a714bce0ef3e88a961c2bb131b79e88a1424f SHA512 d64f3a83fd3a678446e17fb35265c0487491a53a2ec306fe2332c59e9e471bfe8580b3280da7ae13664f07f7f29edb0347196351ab698849ccaefb52d6ce6613
 EBUILD iso8601-0.1.10.ebuild 755 BLAKE2B 29557ba50d8dc89fe1f04e5d250d347ce37c0c74ffd8b067c238743f865f18556375ceaaaa668a4e10a0c6405f66d1e2859358271b3cf7ebfae63cbafd73eab3 SHA512 685de874de85f1259c94445360a484458a8688c4ede8f2e634c2f523cd2c67818be4587f99790732b02a973c734a2124aabe5a8d90932505c375a148e96d77fb
-EBUILD iso8601-0.1.11.ebuild 766 BLAKE2B 176962ea3459d5492712b6bb40d01a445320d9843e402778c8506102adc18efc830cffc94015c5d6f282fd990b1961369b91a378dc6f8e0647fe6482bff2b83b SHA512 ebceb0658ddba9c4ae78f4fc31dfcf7c4e976cc31849d6c5b9f7c6b408fc41f004aef4e3fdd38ee60eb1235e6b5fcc953bcc05c3994079ce5094b99668215cd2
-EBUILD iso8601-0.1.12.ebuild 780 BLAKE2B fbf4a072b7a922d8d61b447eb3299c1df99abe11d9fb1867e9562a72d19265ff5d283146dd812caaa94a2626b8a69d28b3cd5392164a1036e509c76d602e7066 SHA512 b9861f84b516af609d43575d78795d9faab08f6ae24f9a0fc182b229e28984a1ef04e8e2e78b532fc86a13bb79660eca24729647b2e3163693276891c3ff2f11
-MISC metadata.xml 310 BLAKE2B c5b269170fcf59cdbda79298c936fcc4bca9d9e5f0d53ff142c619d5499a2a195197e8cb4cacd01c77f3ec9eb8d0fb549625e41f42fbf721f69716e670187f72 SHA512 1676ac1d5e3486d07200637f9160cc54f6ea25174a12d53dab6300a366d71a918baa9c464e6e00a1f68d2408b1ebc179436a5aef0ba022a9fd03f4f5f073870e
+EBUILD iso8601-0.1.11.ebuild 765 BLAKE2B fd8db489bcad09e7d2182b725dd14f02dd0a648b9a8ee5f2864f8c8442091c6c4548260158c635f7812bb0eea9417ec36219df1d07115932b72ac53b1c60ebfa SHA512 dd37c0cfff09bdd6de5e61c562a58b02f9818dc32246d0561a2d3487ee1299c7b50be68de5bcc969284dbba9b6e205f8b4929f9044bc2ec264930a79c74163e6
+EBUILD iso8601-0.1.12.ebuild 767 BLAKE2B 3e6a28120fe944dd39f2aa7c83787b8e339a423f54f0d3ebcfbc1b2e09e93e9b8b3e50ccaad0819c3ab9661b40a40875f923b779c5e024cbf54bee4c9bf6ca34 SHA512 4b6a9018ed52d935b15c08d29565151e7adedf935dea0d035331a9983f9d2bfe9f57b76cf8dc055bdbc85c9bab45fb1102c7c9abe6af723d609b220a80c53592
+MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index e0129397f678..9e904942dbd0 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 77e38feb6cf6..56030ced21d4 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/metadata.xml b/dev-python/iso8601/metadata.xml
index 95d315c9a408..7320caf6f361 100644
--- a/dev-python/iso8601/metadata.xml
+++ b/dev-python/iso8601/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">iso8601</remote-id>
 	</upstream>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 3291930aac5f..e4a8341efe2a 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -5,14 +5,9 @@ AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e451
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.0-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
-DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
-EBUILD matplotlib-1.4.3.ebuild 6156 BLAKE2B d48cb0a36a4655ab78dc43f7024d7e2101d042f3bc6db3413115cc6102224f436f442ac920777854682051c6bf6b80b4c0834e6203a6fb2818e288da99be1784 SHA512 669486c2f6554f9c133c2c0daabdfafc50de420deb8e0d25c1c3d1f8a1edabb48b546e350285ccb41b297443afd085d3913a1acd5c5f8eccac79499db99e4ab2
-EBUILD matplotlib-2.1.0-r1.ebuild 6174 BLAKE2B 678a2e9c1ba7069532359a556ff1ad21a107d7efca8ec698d160e2737a6378fd25384db32684e49cf2efa2e2fe3eda63faf4f31501c535b3353eb2a54677481b SHA512 60642db8338159374b269b0bc8c3d98afe2148f5f4febdc84f90860addc12b4e1b959f3688f4bf9abd6d6860c70eb984aa3854a83c78b194be8a81ec5e46aa18
-EBUILD matplotlib-2.1.0-r2.ebuild 6231 BLAKE2B a501deafac7d4b5c942600433a8a358c1a4f3e72bbf0c78965144e75653381f14de3f060c4f6fbf3ef637160aa28970ce2737e5820e653e66f46ea252f40161f SHA512 3e5ef32f5fdc3e950104ba143d3c9bc17063051e6cde6aa74d6717689f6f19fd887d324e0da448e39e9ab3a7b41d6c0a9c8b3e07c865b3299a80caa43aff235a
 EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
 EBUILD matplotlib-2.2.0.ebuild 6397 BLAKE2B 5e6a31c01fa9d822d6a1bf64d8cef33a4f3486a5882f4f7073336a6c4bda81fe10262c748cfd792b4a88325a4f08dc3b34a13633940ff1a2f6b336403fe860d8 SHA512 7f4e6b0532710db8397b623721c2280e688cabe7770ba78ea6b7d5a00d801c1e8e94f886552b75404692394a64ea128dd6eee6882e1f563faf1ad979dab7a008
 EBUILD matplotlib-2.2.2.ebuild 6392 BLAKE2B 9eefa8e49d717b89d48a8d85bae1faa5be1eeafd11113fad727dc1802cdc5db3e2ec713b5da7e3d975439e44f293d1171c6601ae226622e97c09774abdb238d2 SHA512 b172e8ea35842e74172067de9c3d8245f49223b60f4e7fe22f9dea99e8a0006f4f5692bced392bdc99791f36c14fc6eb8126bfa23a79c1352a7eebb47fc5e8ed
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
deleted file mode 100644
index cdd7616e4db7..000000000000
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
-
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-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 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
-
-PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
-REQUIRED_USE="
-	doc? ( ${PY2_FLAGS} )
-	excel? ( ${PY2_FLAGS} )
-	fltk? ( ${PY2_FLAGS} )
-	gtk? ( ${PY2_FLAGS} )
-	wxwidgets? ( ${PY2_FLAGS} )
-	test? (
-		cairo fltk latex pyside qt5 qt4 tk wxwidgets
-		|| ( gtk gtk3 )
-		)"
-
-# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
-COMMON_DEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/qhull
-	gtk? (
-		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}
-	virtual/pkgconfig
-	doc? (
-		app-text/dvipng
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.3.4
-		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}
-	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	cairo? (
-		|| (
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/cairocffi[${PYTHON_USEDEP}]
-			)
-		)
-	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${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}] )
-	qt4? ( dev-python/PyQt4[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
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-backport-GH5291-2462.patch
-)
-
-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
-
-	epatch "${FILESDIR}"/${PN}-1.4.3-cross-compile-{1,2,3}.patch
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	# suggested by upstream
-	sed \
-		-e '/tol/s:32:35:g' \
-		-i lib/matplotlib/tests/test_mathtext.py || die
-
-	sed \
-		-e "s:/usr/:${EPREFIX}/usr/:g" \
-		-i setupext.py || die
-
-	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
-		[directories]
-		basedirlist = "${EPREFIX}/usr"
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[gui_support]
-		agg = True
-		$(use_setup cairo)
-		$(use_setup pyside)
-		$(use_setup qt4)
-		$(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
-			six = True
-			fltk = False
-			fltkagg = False
-			gtk = False
-			gtkagg = False
-			wx = False
-			wxagg = False
-		EOF
-	else
-		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
-			six = False
-			$(use_setup fltk)
-			$(use_setup gtk)
-			$(use_setup gtk3)
-			$(use_setup wxwidgets wx)
-		EOF
-	fi
-}
-
-wrap_setup() {
-	local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
-	export MPLSETUPCFG
-	unset DISPLAY
-
-	# Note: remove build... if switching to out-of-source build
-	"${@}" build --build-lib="${BUILD_DIR}"/build/lib
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-}
-
-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 \
-		"${PYTHON}" ./make.py --small html || die
-	fi
-}
-
-python_test() {
-	wrap_setup distutils_install_for_testing
-
-	cd "${TMPDIR}" || die
-	VIRTUALX_COMMAND="${PYTHON}"
-	virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-}
-
-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
-}
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
deleted file mode 100644
index b7315f01e482..000000000000
--- a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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="https://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/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.0-r2.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
deleted file mode 100644
index 1dba93750f1d..000000000000
--- a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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="https://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/ply/Manifest b/dev-python/ply/Manifest
index 3c7654849100..19a2d477f1bf 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -7,5 +7,5 @@ DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e6
 EBUILD ply-3.10.ebuild 1143 BLAKE2B 8338bef39aa812414d6a9405735716c4719d0e2bda61a9b15d30beeddfbc2f51c5d22fc8e7ee5fc3b12177008e8d4536ff3c042b6042cc2b21c7155407fe90c6 SHA512 3df256e8a340609e7c326ca85ac96bb034ba1ae6f27313a6fac05270395cfe29fe9776072e3ae22f0781d73ef6c8bb76f88050920bf6e7b7752fd9e6fcfa6ca8
 EBUILD ply-3.11.ebuild 1143 BLAKE2B 3a519f0a254e936f9319abe93632e238c4d7af833146d412df8f2c3be9bfb73605f7f3df6d47090bf175d8d9ae6784486030e390d88dea6429e8ba7dbfef888e SHA512 caf4c5ed9bf8f4e2e692860a2d49e4ab9ba6ee45143e97b65f511e526d5285f22547eeee88135f53805421883e5fe18368cd67e422e779bb8184480ac15abf64
 EBUILD ply-3.6-r1.ebuild 1144 BLAKE2B d84fdd2687434f3d7ab84b680b2fd798327165612453568344d734a879a625b10fdd2c4c7e5387a0b274176e2056a5e1444cbf420e3920daf0edea396b7a3cf4 SHA512 24730bb33a83ebc834096c680f55590ce65fd8d6f2e9b699703ae03787d44efc8592f60608e8b393115ffd72f0eb826cb6be8c3127680e46a847ca4d4e40fef7
-EBUILD ply-3.9.ebuild 1110 BLAKE2B 36614b0a3c212650d5b5e4ec55cd222dc8651c086ef4a3a0e1a34e15e5b979d9131d7a17b2b78909d2ef7ec4b7e237ae09da58f5d2f2c71a234160773748958d SHA512 59adbfd41fdc4e50a4b41cb61a3bac35a6c95d932906684be4daec955639b5963acc051ed6ea8d8c9664a661ac8dbe8f7e90a44c3de76ce446c3f3b5a8ab8203
+EBUILD ply-3.9.ebuild 1109 BLAKE2B 2b977f3c9439f4de810c2e57bc18e6dece21bbef2d436bc7df420fa94a447f1d1feec0e7ca96660aca8420b77c362cecf34ee96736d0131233d0fb0cb374d414 SHA512 4bb9afbca93e4fc1ea9bc14d67c0c0a3eb2d9e5a71f110fe8242968a71ef8de93712c89afe59dce7eedab1a651c99268d2eafcef1b65675f5a420942501b9844
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
index 80720fd928a5..2fc447353444 100644
--- a/dev-python/ply/ply-3.9.ebuild
+++ b/dev-python/ply/ply-3.9.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"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 4281fb884ea5..ebbe99dc27b4 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -5,7 +5,7 @@ DIST pyasn1-modules-0.1.4.tar.gz 65552 BLAKE2B 5eb087cc4d930f39a651e3b8765ee8c41
 DIST pyasn1-modules-0.1.5.tar.gz 65690 BLAKE2B 74f3de59a8388527e885e04e4eee56c3d4587e697c980e1f9c23604101f367956bff12dd72a34cd4135b49c968f22b69ed70bbac9989259c1dcbc5bf711a96d1 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a
 EBUILD pyasn1-modules-0.0.10.ebuild 902 BLAKE2B 5a44907b5239bd3676fd814731eaa09330f7532bd3239232aa58d34f5078e27702d945f41042362698a24c2917a80397ca12e0087ba803de7daa7738749955b8 SHA512 b908c7f48e77f9cfd8a3e29a25b3de450fb052ea96829abaf8185e63380d53cf578a0f4099e9614e348a9c071daa393e567f5d4159b2502725cb28ddfc57e895
 EBUILD pyasn1-modules-0.0.5-r1.ebuild 908 BLAKE2B 488da022066fcf25cab9df7333b0e9c2d1bf9ca20e9cfe62133d0a542955896fed6d4d7199a02092623fd468e7adc7e56d308c8219e74490386db23e504a261a SHA512 f7b4d0e20fe54732c7e4fe9caf3d22b7530734841ded3f663fe972c5422c535dd1235c538f0f26dc1e3fcc4b9841c83de56861e6250797bb212d8fe33f00fdaa
-EBUILD pyasn1-modules-0.0.8.ebuild 893 BLAKE2B b07ff67c20e595df302dc15f6857ef859417ace29177599e792bcfe62bbf56ee0e1673428c60d722d23be05da4ea74a7a54f4bfa01d6f3b159eab8f70edd8f4f SHA512 d1bc9dccb51ba10b36d655bba240b2cf447b77b79efa72d06f7b8715feab3c3b6d68c71e6bd3479063d325a0b35e3def5f6ce66a8230c2dde7b4a0422d522ce9
+EBUILD pyasn1-modules-0.0.8.ebuild 892 BLAKE2B 299cebff6027f0ba5caa5648d238b8ed5feb3217eb9e301c3e0ceb22b2fac18d6b1c355732b484d06c542abb1a5ad87ff95739037d2be8588a41eba3105d81f9 SHA512 abb1072d75da7f8fd1dfdb2301c21cdc1dcd21fba2ff40cb79bbbc69cd42317750e44ba6f06a0ca8c330a57d76e54f51e418463d34d7d5f0f17b0ab22cd072e5
 EBUILD pyasn1-modules-0.1.4.ebuild 902 BLAKE2B 5a44907b5239bd3676fd814731eaa09330f7532bd3239232aa58d34f5078e27702d945f41042362698a24c2917a80397ca12e0087ba803de7daa7738749955b8 SHA512 b908c7f48e77f9cfd8a3e29a25b3de450fb052ea96829abaf8185e63380d53cf578a0f4099e9614e348a9c071daa393e567f5d4159b2502725cb28ddfc57e895
 EBUILD pyasn1-modules-0.1.5.ebuild 822 BLAKE2B 78239b7086acf41aaf807817296d0b8765718647d01b0312eac03da80814c90c48616a7a9a64288181a0461e6c3754fa892027513a457f8d42aba34796819497 SHA512 d32d9b4015ccaa10d311e333e61b9d92886a003d71e7aebc8e369e6c7f60fee32e389eb7efb28cfeb519667e18373db4e78d11675ce914bf3fab1adcf98abe0e
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index f6a76a1feb34..466f6bb885c1 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 13c65762399e..9ede9d0e20c2 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,5 @@
 DIST Pygments-2.1.1.tar.gz 2114190 BLAKE2B b0e5d5a62849c97aaac6f0edf26230d5573715fb759667ca888372666634ab68da4580b1337ec4ada013b643411c221c572651c6fca6745b976794d5c6246e5d SHA512 7eb35865074f573ef7d41a1f1ee7576a83c32855018d03570eb70fd6864ddfbbc3f93ae082c4ac7e4a274a0ef387ea4ccb0909423e01efb6bb8e4fefea8f2807
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 EBUILD pygments-2.1.1.ebuild 1673 BLAKE2B f2e938831fbae9675bcbff7ad0451b460f9fcaf2a0b2470392eaa996957f4a380703e7c03b0ed1c275d5a9b7d9ad3d50bd9a0d2ca5929576bcbc9289173cb77e SHA512 11b1b1905770a620bf97d643bd107b05308b53be963b77d121850c5796ff8a49ff6897205bac700feefdf287ebb572a5686b0c408de49d43c8942985686c5d40
-EBUILD pygments-2.2.0.ebuild 1687 BLAKE2B 44ecc55def9b5ea59e3217418de981ea8d11bb52351b0e4727dbc4aa699b0c9033fd2c02743fff7df0f5dfa4bc859514defde6aba3b7c34eeefa3ead144d7b27 SHA512 fffacf64511fa1629e5330ef709fd37b114be0c0f2a31e02e2b6a7d54a4d4927caee6868c6b105cec8caabfbda7128d629ad1bfbfcb49713348e827ab289ab34
+EBUILD pygments-2.2.0.ebuild 1686 BLAKE2B 74511aa12a773613aa6466b525a1e0ea05fa09811a86c317315584c60abae85fe9482a6852f4ad600cd0c5f0523822f23a931bfe5248a267831ae17966a9aa39 SHA512 98b7c603c151952ebd0a7b36d840661229ddd94345d90ff3c8ff18c63d4a46d4d5abc3c83a5fd621f9a0103af2d754cfeea35572e7f645df363009c69dd52197
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 0ea8a1b1dcef..413fa9ed07c8 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index bd398237e246..7d187cf31985 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -2,7 +2,7 @@ AUX 0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch 3504 BLAKE2B b26810
 DIST python-dateutil-2.6.1.tar.gz 241428 BLAKE2B 93b1d43dacdfbf528b085864b04231c1a34b37b23bc64a58a0733f53ace0f7e0258ca58fbc725dc2aae15eebe8ed1f555b02862a4dfd360014e7ee9aa8d6a9f9 SHA512 f16dd29fc975629f594dd2683a525e2a86acb020bf8962558d19040b14ac6f19d4ab07a910d6bb55c9db3cc02b5472774a3a05ccc86cf624ca5e5144463646db
 DIST python-dateutil-2.7.1.tar.gz 298061 BLAKE2B a6bc2a3bf83ff234ddc53db5a3353b19303dd9e0c6d2d702537643e134508f96ccc69b962fd957d4cc754b07cd24b3c3c2ce07becc0add7db925b841d6a32b5d SHA512 3dbadeac3dd22bf51279c4237df96a925ed4063384a82e756a41e314c216751f2c90f8909a20ba96fdb065966034e9c7e40c1ea152876ca733a2176893c4deb2
 DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa27973b2dc4b2c4f79eba2afb295fce7b6c21a8589d4643ad5af212900f55dc4139711929d5c7c4a2b094ac749d76125761 SHA512 b8fdc867aa67c4e5602bb3e9bf906dd4d32a6616fcdfd5f39d146d849a46d13c266bc9c2eae28490399fe608ba19dcb824d05ce96d556de07999449eaece7dfc
-EBUILD python-dateutil-2.6.1.ebuild 946 BLAKE2B 87e2b3da1842a2c64c2315e448d7cc7705bf82a61220ffd7d371ddaeebde0e7d9c0cc7c2dccab7f2bc43bb5aee3661eb2b7fddf2237fbd1f7b1a238f4216841e SHA512 ef220bd6b6992bc4fbb17ff5c283c3d8440fb7d8f67a7f713f2d7fa39bfee6ada17d9c3e76e62cfa8495f3be21b5946aa8c5534742fa824117ed205409cc090f
+EBUILD python-dateutil-2.6.1.ebuild 945 BLAKE2B e76a7b5013c9c5bd1d4839b8b96a74e26bdba1845b33264959f892af6ba4ff7613721ae8329c350656a706406a33a0d95af2cba6044f8123c40c4e937c3fbbe2 SHA512 47a4de4eeeace543f6ff2763a6adf29e1eaa3b1e8724dc462b8ef9290c20dca5276be4a6a639ec75e1932ee87b489e4bee3be8efe36c2ada86abaf33c4094b2e
 EBUILD python-dateutil-2.7.1.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
 EBUILD python-dateutil-2.7.2-r1.ebuild 1225 BLAKE2B e3b6f9bdc559eee10d1302cd72c93a0da4572bed28aa1b3d06070ebe42391d0e3f8d8db3f48e36c69e426cd31f8632cc430cce15c2dc52bd8f2bde491fd661b6 SHA512 1fe8740410d118b82a8820af806912368f368adb8d58b4583e044c555e20e90fb839cc9693bb68c166c47752cf3e56bbccd3191b93d06e89b1030ce23b875469
 EBUILD python-dateutil-2.7.2.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
index 188fffa35f60..c50f4f28b4ce 100644
--- a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 4aef4ab0164f..049875e0dc15 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -7,7 +7,7 @@ DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be12558
 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.5.4.ebuild 710 BLAKE2B 1840f937188bcca2fa283e7ed73033105c7e11d0fdd6ef9c72b422ccc52f901702e8c7feb5c3adf3159757e16d43014484b88cdc39e16e202fc54a11ea92f931 SHA512 5582746adb5d6e47f7d285c606effbb40bf00a4bdb96af89f3133348c01ec9513de8ca8659415fb0212e6d3f1213d37604e3e2e5ec664b309c0629d17c22105f
+EBUILD python-docs-3.6.3.ebuild 711 BLAKE2B 0876fd40cbaf7e49edfc731ef3f6e2cc5c4f615c8a049e4b6f09b23ef27451b16bfa0c4adb897a2143c0bbaca329e385526b8274dcbd5e8d46b201258f6348e7 SHA512 5aa90db93197423cf6e9ea158f00dd51d385ca847ade0807f8f500718d7ef68077cb90b1cfbb9869ce3e83b2ebc816a8f6d607fb491d1319aa2695bc6914bbc7
 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-3.5.4.ebuild b/dev-python/python-docs/python-docs-3.5.4.ebuild
index 10ce6019a601..fa449a9e526a 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 ~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 c867a73eba85..85d8bf627701 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 ~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/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 44c66c9405e0..bbae4129adfa 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
-DIST sabyenc-3.3.2.tar.gz 16601738 BLAKE2B 90d55d23d785746666d05d1a674abf08e3dc0d913bf2f80f5f3e5e9007c1b6d1c0575e699b46ac4afca293dfb6b0357508652fee74ef3af18d2e317f01c0f982 SHA512 82d86007ea6802909203ca4fb08518426ce91723ede7a5c0b2a56d65f67ef00e8322a60b6571826c1aad78717b68398ece67e23ed910f7afd6db8adf42dc3ce6
-EBUILD sabyenc-3.3.2.ebuild 711 BLAKE2B dee9e5e9172716d3ebaccff763f4d86fc3364b165984d11b8d23ca5963e3fbaec8f33fe618851c6159b999ee147868f6ff0e3db864f0d090424087484fa8e2a1 SHA512 b8421c6d0047479caa00dabcd944f1f7ed2daecf84777a3a168efe82e9119787b81ef2a6219ff57aa950b051ffd170c956e33e751fbd50a343d8ec0cb6e248cf
+DIST sabyenc-3.3.5.tar.gz 19578318 BLAKE2B d36182074682a00cdca15be12d9d1424f9d3a8f03130df905e53814135cb0f685086d643ad23f3aec47b56b50b3ca43925a0fb4a3ded14cae2559fd14b6beeaf SHA512 94b5114be111feafc65f75d6461e5135bc1b8c8a84d8501f28e1035150d5581e901e7290f5b4cc6cb5426fac5d4971d138c43f6a62ec3bfe43ea9b5f269c0a89
+EBUILD sabyenc-3.3.5.ebuild 597 BLAKE2B e57c4ea1bd7c5c089ea5af28c70c1adae83e6e77070d5f478439fdab6cee9a1c9c6dab738022125765b50bbb775c5cb971906710c93ec36de265468dc7b52e26 SHA512 75e4430d85c7f676c6b63271f82600b2407c98a83c3c309203c15e2f211744f07b2df9880f49b4afc561b91e6bfbf68d1db8a99e1681de62c0764c76a83b62dc
 MISC metadata.xml 220 BLAKE2B 59eda2baee6ffd0773806bfb555f2784ba2f8954133a6339cb3d3d6fe1360178bd789d0875262ea7904a299cf0bf36e9795264f42d7319463488375ad9cbade3 SHA512 878b4526d51f7901900ec97fb85bb90e0d1099d29bc8e49dd7cea6258da0737e71aec3377f1bc2621cf96fcf7c5699e424bbc5fb721af2f365742725612fe50d
diff --git a/dev-python/sabyenc/sabyenc-3.3.2.ebuild b/dev-python/sabyenc/sabyenc-3.3.5.ebuild
index f464f4481104..7c8c926ed06c 100644
--- a/dev-python/sabyenc/sabyenc-3.3.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-3.3.5.ebuild
@@ -21,10 +21,5 @@ DEPEND="
 DOCS=( CHANGES.md README.md doc/yenc-draft.1.3.txt )
 
 python_test() {
-	# https://github.com/sabnzbd/sabyenc/pull/7
-	cat <<-EOF > pytest.ini
-		[pytest]
-		norecursedirs = yencfiles
-	EOF
 	pytest -v || die "Test failed."
 }
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index f28ef7c2c5d6..431be5c20b23 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,7 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
 DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c23982c6e1fcd3f8b2998ee360f1ac42683fbd0e3a371cb044a682c326e00e907db0961aebc70bfb6b583ad2bc7 SHA512 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
+EBUILD sip-4.19.3.ebuild 2121 BLAKE2B 697bf3c96b0de9bfbdce8dfffdaa3fb9e598714c98f0478767c8644990bc578ae5d1a2de1883df4d0b9ece9a9fce131080ec37f69f67b6b40b84dadb52e9468b SHA512 53029646c58a07a557095817d08aec6122ee7fd840e6c865da5cca77e302fdad3f1142f79c300bbf6d62d3b2a1f710ed04f8920c0a220015b6e032534f31bf98
 EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
 EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
diff --git a/dev-python/sip/sip-4.19.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
index f8b510397e55..38c05afc2964 100644
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ b/dev-python/sip/sip-4.19.3.ebuild
@@ -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/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 86d8934069ee..e8ece3e01b7e 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,5 +1,5 @@
 DIST snowballstemmer-1.2.0.tar.gz 49639 BLAKE2B d53682e63ee1ab2776ca6869e109f364e4651be182908968c72db143a739fa43bfe387147cb9381b68057d9870eaaaad46720954458938ae83d15d544e820d84 SHA512 3359657867b9478bb58e6cc67a08212a490d5af07fed7098871b1e6a59def0031bd0c2a846cc9a0d70c94c64ba4d2ccb2f41afedde61d4a7235d26f68374bd02
 DIST snowballstemmer-1.2.1.tar.gz 49626 BLAKE2B c9967c45b008808bf9f5a12a4dbfcfc970c5878d9b10b37b4e5f1a4bca56ed6efd72ae4395b6a4d1a19d642786b6ccd1d01ec6e99b104a8237935ec8e64c1ee3 SHA512 09f860f383d84d12a83c87ef6654fba4ac10bca07e8d2ce88dd428c72754110d56a4b698e125a18818699a289455bf61cf67ea68e349ee8a12d6dfff0a3fbed9
 EBUILD snowballstemmer-1.2.0.ebuild 525 BLAKE2B 34f659dc5978356ea7c5cffcca0f2d24a8141adbd69a54631c2f72077af1ef671ebab81d7a2e6bc96539bb1cc88ea9aa666d7e1ef1045ce9e2fb490f75bf2291 SHA512 4715ee71ae558d4d336a41577b88171ec2a550ca23a10ec07f135866f876f9191f9a29eb3fc60bfc5d8d5edf91cd18a5b61adc26a627ba0a1e8bc1b762518d99
-EBUILD snowballstemmer-1.2.1.ebuild 558 BLAKE2B fa515428d87bf2a1896402276fb7c6d75922b068b42623b38b3fd0a9a18c24e58e4e8a2063dc124dca143dfd2e0e788e7a8e126d9282aa5dea63a21ad903e92e SHA512 a52c41718040897a5cc4d6b95cd26ef16b0f1b593c6f827711fb85d6bdf1d8d1fbd84f51bbc463b8d978a69f9133e30ff3aa43a087e5d76b4ef18e0231146a3f
-MISC metadata.xml 391 BLAKE2B 35d529a165ee9615cdc8a2fe104d7e6f51a9ef2f79a5e947ae161aabc083d72af87b406732b659ba8cc830f88c3b57bb63076cfccded6d2a8ef6a343310397ad SHA512 2cb0d71838a3b58a45d09a14f4205388f116011372d14a14d092a0674f4a9288609a2d7fbfd108302983997ff03f5f056e64903f0e6daa89b313df1a43891f93
+EBUILD snowballstemmer-1.2.1.ebuild 550 BLAKE2B 86a999f0d157bb008405e5805497b6f0bdc6ec4e0bb60e8c61ac7c8129f6a760c705d418183ef79316bf4ed4de6f55ce5af96c4d4268d053c0bc3e9e354d971f SHA512 03cc637db3d6593bd0ba511af9029fc9a6ff3b5092c02dd60d5fcce2138cfabd1a504253e5bf853cdf03370dc3c80c0e73cafb915648a05441f45d31b5d62346
+MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/metadata.xml b/dev-python/snowballstemmer/metadata.xml
index c13062f17f29..707c683d63fc 100644
--- a/dev-python/snowballstemmer/metadata.xml
+++ b/dev-python/snowballstemmer/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">snowballstemmer</remote-id>
     <remote-id type="github">shibukawa/snowball_py</remote-id>
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index 35a5e288166b..540cfb090851 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 IUSE=""