gentoo resync : 05.02.2020

1983 files changed, 5800 insertions, 8059 deletions

diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index 1b7993291546..97b799640078 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 892da8ad19c9..874d265301f3 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index 87a7e4cc55f9..f7f8ed3fbd8f 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Babel/Babel-2.6.0.ebuild b/dev-python/Babel/Babel-2.6.0.ebuild
index c79338ec671a..2befd155de20 100644
--- a/dev-python/Babel/Babel-2.6.0.ebuild
+++ b/dev-python/Babel/Babel-2.6.0.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 49da7ae98696..b5c767deb31b 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -3,10 +3,10 @@ DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906
 DIST Babel-2.6.0.tar.gz 7960433 BLAKE2B 0edc3b3391eb3d479eae9a223668af96e1ec47b84b13d0bb66c0e1772dc5de8321ee06f0d0dfeb6c9364a724286d0ee50a3ab4c2ea789894057fca39bb11dc46 SHA512 a87f26c25f1e48a64d1e7ee112bc0c325a6268e0e716a81cb6814a53f0add8f3d579babd2ba064f160298ebe3ac9711aa5d28f112582ee287767b6ed8427b6e0
 DIST Babel-2.7.0.tar.gz 8244870 BLAKE2B 515f1e033d408e4f5fdcf1d1720a58e429523611a2a01d62bab95b96a2187ed0594e4c05678ac3311d6570bca2bf90b08818c233bf28a2fb03fdba923f5e6401 SHA512 96314c7b26f6915a825e0344fa06e4f1d9a71b97a52b16f2f696c2e81c69318974547620135912b11edb95668a717ec49f1be68eef5a4753092d8e4cdc39a1e5
 DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
-EBUILD Babel-2.5.0.ebuild 1463 BLAKE2B 9afe674776b7c6a81913c1a61bae7d1d8c713aac3ef76a00ea80d0646fd958e91f906dcf8ef7e3600abde0882ac1b6a53611b4ce00fa4c1962fc01ce04f48c0c SHA512 296e2e936ce4046623e4a2bfb46193ce64dfe16bca41ec829b8e8f27dfb7ee7b639a8e30479623fcaeabd3469e4990a0bbc08fb93742870d911194b7a0b56222
-EBUILD Babel-2.5.3-r1.ebuild 1526 BLAKE2B 9b483506c98f7b5545ea555c8e2be7f1b85cdb7c1cdf33c40654a5258c33402f569ff5593b42fe920ea6a3749520004c3884e0988009354e04bae0d5529d85b9 SHA512 674622e70c23be8724cd65fac069bfe203a6029de9d6ee03a9697a1e16b864ddb5e6dddaef195921f776f4210433a16d0adc3e033de260d3da23b9c6ae83914f
-EBUILD Babel-2.5.3.ebuild 1464 BLAKE2B f7ce30d1c80811e4ef4eea18182ac6cfb1ed8b11a26393520b510c2a9a5b7fc0c04c08248a145f4dae973b8f01eadb4998ec903fbc10fa0ca217e47ff3138aa3 SHA512 75f35ea64d06b2201d10ff70d03c9a0cef4f14c58f9d6c7815607c670e938ad78787ed968cf8fa409dc13c1e233cd4a47ae4e016cd0c75d9512bf7facc6eeaae
-EBUILD Babel-2.6.0.ebuild 1462 BLAKE2B d778bd8dfb52e107d2650bbbe44bdf3ff167ec6c430400bacd3058cd69cb9c36853737077513351c59d25526bc1ec7167a133a3ebb10646d536aa61876614224 SHA512 a7d20ef7bc354055268f92f9ec841fb6112625b468b0dbcb2c3ba8cf25383a24e3cbc590cca219abd65e7393a54f5944facd3148f9f56ebb6f49e4c1e94eed1d
+EBUILD Babel-2.5.0.ebuild 1464 BLAKE2B ce80e90c1217ec30b80a19ddc0d4cf67072901caf948924ba55154ea11ad3d5a94af5ce178da8e15dda005c7546bd78be7bbb9d70434ac59daa79fa85ed40e10 SHA512 b004b7ca8660576dd2574ccf1bb23b98abce41e27d5cc693aead50dc19b20b460236f2064162a0f841c9f6caed241b5c663a8738b7fd9ea207e5af81b1c9baef
+EBUILD Babel-2.5.3-r1.ebuild 1527 BLAKE2B a9d04c8ee8b1e76b7b483eb22d0094344eec25f3ff1ca1cab2482d2e49b2a47e2024ff1dce922b2041d8c56cf267ca9e2e3f9763d4cb93709d2ab754cfa68c5e SHA512 a5e17cce811b51f244b56f8af450af787571d6b5c5aec06aac2d01789ea734106188144748fe7ea4e7084f222488e6b27a30ccccabc3116a412f9c61934cee84
+EBUILD Babel-2.5.3.ebuild 1465 BLAKE2B f8794d2bc25d250a1bd6c7cc4c4fe7c8ed724c34bf40b545affebf4c1095203eb6a25a82cdea46aba90f125654bd73609553107bc23cd01cd9ebbfdd47a81302 SHA512 be4f71205977fae78da1bb2dbaf055f61d61a8fac526da8480d4c33cb0f3c1842ab21b500493f6477cd8c5cb3395251e175d3616dc156c605c6747b56d66c117
+EBUILD Babel-2.6.0.ebuild 1463 BLAKE2B 081b26496e6270df6e783dbfc7ff9083e7bcfc53c8d1424796a0ebe256da725553374e92aa131b3bd3e5eff57cad94a631b9637f9c974c799f03c9ee4f949ac3 SHA512 8840f0784d069431b4ab9e992c526c962b4a8d9f86a3a6036ab3f635106cb88042d950536148b2799528aebadb08584cb2d0b53d206b49f90a47d9ead42d9760
 EBUILD Babel-2.7.0.ebuild 1320 BLAKE2B d4e045f9ba204312145087e35316aff7904eb5b1f78c7516424ee5c4fef2be67f76b53dad428030e2ac3feebd3959b8c78d34287cfff51c1510e591b704bb2f3 SHA512 a10fc839616239843862f5abaa6322b2cb614609a1bcf9d1d6a6a1d60d9bc8754fc862ee0eff0b934d49bf14b71f213e42a9f0bad1bae64d452bdb1f87a9f05e
 EBUILD Babel-2.8.0.ebuild 810 BLAKE2B cae9e5a7ed2efa7549d7d0daa5ce25faba1e4130be727801fae5fabde0f88bbafb3bb5d0008614baab6bab4699c555399d797306a05c7d60e48c32654bfbaeba SHA512 b538ead11d8a19180849c0f9542ee6ebc034c6d7fc06c38387ad7faec9ded5f5ab599b1484a044a2179559a5014e19a607335843139978b457f31ceb07d59af4
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index c415fdb1b5ee..87c20ff57726 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/CacheControl/Manifest b/dev-python/CacheControl/Manifest
index 3fb215bd88f0..bad17d5f9fd0 100644
--- a/dev-python/CacheControl/Manifest
+++ b/dev-python/CacheControl/Manifest
@@ -1,5 +1,5 @@
 DIST CacheControl-0.11.5.tar.gz 13104 BLAKE2B 460d963e7459f34d8b1ceffb9d971e3690c87635e2e88aac0ca6b54f7b5a7a4f1c3887e653af7df27d66551e1db869790b48ec9a27c48fa548b1a31293ccf19d SHA512 2acce5a8be2e409a1a18254cfe71314074037bce3341f8b8fdec52c43500c90bfdb6063b2121c5cf6c8a2fc7c0903e4fd0c15813ffdfa547810b33571d211deb
 DIST CacheControl-0.11.7.tar.gz 13902 BLAKE2B fc363357631efe3d81f53060cce9c71f21aeedcf285b40c8f9b3948155b8aa6e327ca51864073fb1eaf91bcc2c4c2d586baa73ab2b5776dae6574fd243b80c94 SHA512 fad1f93140dd6fcedb3797f4dbc1587045ade8dafe6cbc6774bf62bd635fbc1ba08b2dec124745cffed5259606b55f0e2edee036b5b5e34156d3114f6bf63493
-EBUILD CacheControl-0.11.5.ebuild 870 BLAKE2B fd202ae83b0ebcb45ff24d875b1b41e037413a0e2a87d5ea99a56d603e08fc85ccd9f0ee0a810149a80e0fed6466ef5f3889abc97e8e96192d4f7f7249557fc7 SHA512 286102079ea0a954cf692d1a64bccc79153f0b58687a50286bcbf326b51948c7d8158d395e0fd11a16f5b085623b78e9886a2cb673d1ae38797e2ece069e5087
+EBUILD CacheControl-0.11.5.ebuild 871 BLAKE2B c47ee03ecc331e0507e301237ac3287a8c25adc0021fa2ac3b8895c1f0281e09b764dd9243016ca97f141b110a0441f5db9bec4896c9f0a8c108405b77657973 SHA512 7d199b867a686ae9a0f1e5b631001a9579bdc5f54aa350c6754f554f80881ea7f692deb51f0d3a10c0cae50e12e49c967216b32ce5066db770c6768905b577e9
 EBUILD CacheControl-0.11.7.ebuild 879 BLAKE2B 7d2c0602b12f2ad7a064492e409b557da0619bdba24fc1cff7e2d42db312f7cf724d24e7145f6cb1b97d55b8e23054a23ac8037f08dcb6a8ca522669533b967c SHA512 8129502edfadbdc20c7a079a279e99864789127386488310fd4f57da0df94096012ebbc5c9ca94cfa7ff86320ea043742bbdd64c682a5453ca27a444d378a15e
 MISC metadata.xml 387 BLAKE2B 6061a2460b3bb1c6f1c8aa6d9227897a61fe36807e51273d3c1aec337a345b6df6143bb1d20a35c2bd877257ea04e7f79be5f4a58843bcc5879fbc2f03b23328 SHA512 c80bc300402e7cac33d5350aafda6c93579b3d14094ea34bfe4dd898ca498ab0139c428f01e4917544df64a1aef0022a4868650e2bb66f2cf9606c28fe885f65
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index 5d5b77283bad..be45f0d9d826 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/HeapDict/Manifest b/dev-python/HeapDict/Manifest
index 5196f1b79871..c224c3582679 100644
--- a/dev-python/HeapDict/Manifest
+++ b/dev-python/HeapDict/Manifest
@@ -1,3 +1,3 @@
 DIST HeapDict-1.0.0.tar.gz 7713 BLAKE2B 19aedc2e7a61c74b93aa8883603520bc6ffeebae4ac4c4a4003023bf6b1c65ff55f9ef571a3e61ea92620a18eed281ad603a61e1df4f03a8811096e9f0964ab9 SHA512 1210acd3a6f3e091132d8b87963ec46c81d3141e1788c2a127fe348a9052d73225036aeabffc6a2089c7811b8571a43477055b746df6b128a645123862076bb5
-EBUILD HeapDict-1.0.0.ebuild 476 BLAKE2B 2f85def0a76dbce0e9a6196b5156e73be919ba5e4f4d02b3adeb2c0cdb520a087cf6b7afceb5cb2d818448c504614b4477b13d08e73b02ef79f6dd5ab6f0c080 SHA512 8456f031294371aab791927fb42ae043d2099d3d348f43be0510f6480b9bc2ddba4655ef6982d4d4ee3cd9f05370c9800a2ec5caf06928c4b0a9b0ca5cdc8c06
+EBUILD HeapDict-1.0.0.ebuild 466 BLAKE2B 6c939c57a0e98fda91e31af60e85a8a808e86a662a0afee7e9e830a13f95df282bd20536210f4c8cc17394cfbea5c87964ad5fbcdb5e392092793bb64e5f055e SHA512 a3bcd29071ad2bf55e54b3d283ee34beb843ec63218fc5e0d8c9f713272fa5dc0d7edcd0cf9e91d68d529d852dba1f8cad385d3f51ce959d66e7b4576e730224
 MISC metadata.xml 522 BLAKE2B a4feb2dcf86b348f8e07a76c82261db274d46668bcddd36677e8896eeb993badf321987a592ddc37bd85a9f4e237bd12c6df1cbe289fe3b3354b37352ab70786 SHA512 aca6d43cfb9d6eee3f47079bc26874f12e95f8efbdd4bdcf2685b65374b5a6500de2f12d065bdbce12b82496b931c3c00ff9ffb7aa1e040c11ea033e12304be8
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 97274b15a6fb..2e30b25e3daf 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index c198f8f3220c..364b302f3516 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,3 +1,3 @@
 DIST numdifftools-0.9.17.zip 363422 BLAKE2B fa57ef2b9cb6dcaa669f14720f3fd1ed105f48b16549acd7bb6d7633b17cd45355022c9949a6099c3cbddc6b1a74b0f669344c4dd5e6f5ad56cc640549f4650c SHA512 acef3865861c76f0850b6f1c5ca5633f695603a7458c79569bbe887404c8490845d935693c57ea18468fe3cb7f864fe5481285f731dc933b6c0b521e3b888328
-EBUILD Numdifftools-0.9.17.ebuild 1220 BLAKE2B 4cd3a8cd4efff43cc1af2e261a925a0f332b898bba45c80e82d7875a703b56c111f9965ff2ad369bf045db93e1ff4ed09fa1ea6ae7719d9c1d06c04031c6eca2 SHA512 6a4642900b402dc0c88d21c2716d326bdf3bdf62637d5a1ed75a090b2411aea13d98419a5197e65dc73b36fd74055cb825b4848925935b03aa69e8ed818d0748
+EBUILD Numdifftools-0.9.17-r1.ebuild 1349 BLAKE2B 671a4d7af7f3a9dacb1669b511cdc5033480d2dde14b61598b9941bce5dceea6c820a303be925612453fe68e6b1c02013979de760122f53b443af9127a2d1844 SHA512 e7168dbb02fb48d43568c81014c2a7effdd54f10a2fc9adf3a904d21c8edd49044c621a2f8a034c6f6394d97543433b76e2150c8de70067af81488e6a6601f81
 MISC metadata.xml 398 BLAKE2B 859e4b9cffa1d28cf7758198b04c30e17f86e29f3595e0bf2f55b62e80e6d6ed9c10d6fc8199eba90b35adb155de2a7055cdabd19f7655a6c7f9a860dc761cf3 SHA512 a56df8a9f061f0ee318e5ab2297caa7a3e8001e61dad2425c6d70104ceef999f12468fdc1e20d714aad33a56c980e1cff0677f815375ce7adbb639137016ab35
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17-r1.ebuild
index 1be21579e12d..610789b9e011 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
@@ -22,12 +22,19 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+	|| (
+		>=dev-python/numpy-python2-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	)
 	dev-python/six[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
 	"
 DEPEND="
+	app-arch/unzip
 	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/pyscaffold[${PYTHON_USEDEP}]
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 92be366eaac7..e9eb4043966e 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,7 +1,7 @@
 DIST PyContracts-1.7.9.tar.gz 61033 BLAKE2B 5202d39c91d7dff6e07058f3f7dcc29baa750f69ed9b4abb059de67f3be98e568270eb3d977a6e7a18f232880225fcc532fbd576e94dc3483bde9b8fbe68d526 SHA512 1db6491d4be3df96753dcdd6f85329d47409a2424177a52d1e35f5a1d58f671290d22d807b70f632f0376c86c58c093118f7223b7ad59893a85dccdb91d29f50
 DIST PyContracts-1.8.0.tar.gz 90577 BLAKE2B 988662274e3bbea1ede6d00f4a69b3eb23dad439f5355a9b0a2c5a2f76a6250254303b060ef720d13d9a297ded77f7713271a79a810227aa883dc6d4d46ea725 SHA512 7de933dc8b5992be670b4b34fce7d6f51769d3d2dd02a2400eff5991e9e686e36791234588d2dbdeccf437fd5d6abc6461240645e6d3f665394f390bb727413a
 DIST PyContracts-1.8.12.tar.gz 91393 BLAKE2B 083c836a547540f2505cbc02c8696ad2ae236a9ba46529cc60d237c01bd113cb5a9d2729a70038e28f4a6f776cb17b119bdf9ae8dcd6269cbcd05412413aa758 SHA512 9abd5ab5203687ddd8a738998e63e8f3e397b9ba9b9ee22bda945dab4f0d460115ed8e825c9c551d4c067b0f39dbb5b8ca51d365623b10ee8e210efc4edcbf15
-EBUILD PyContracts-1.7.9.ebuild 1031 BLAKE2B d9c8d3e8d42561a6e49c45998b8dc6722505999fd90d8995e5e5eadb2bcbeb592fbf14e9f6d39a8cf3685bd5d170e32b656f91c2d754e1387455d487a7c7f6df SHA512 675830ed99fa1d53c6b884837a95c5194d752cae8b872046e2264341963233d6b562903a144797ab2d7a17de4407a2f3f10698c9367b78bf9a99fbb6384cf28c
-EBUILD PyContracts-1.8.0.ebuild 1035 BLAKE2B 095e38960d416a32c2a4dcc8562fcc8c37d158545f2b21c2b104f6076a3e6763a8d83da8d946e1ed2aeccca256f31250b908c95c306c0213ba095407845601a7 SHA512 4796f510f88561e91280ef9ff8479ca61038792da8bd171a3bc22761a7a12efa6f9ac386acce5e2003478f775e3d0a80f4fbfb1318558f4b2d8a7697aa9889b2
+EBUILD PyContracts-1.7.9.ebuild 1032 BLAKE2B 0b40cd7176a69e8593da99d74252880c39361800046b1ddde0f61e26ef67edd1430b46783f19f65193adc41b78b7f91471941b44a312219262bd7811c1f8ac8e SHA512 37c88262f4e4c87834ee869f6376e80b2a734395ec89dd865aaa3e31bc3969e6eac94f60e44a8a86ed976510e848f8ceca5c40de1c921aa2d214dad85a0d7c31
+EBUILD PyContracts-1.8.0.ebuild 1036 BLAKE2B 0f2e3ac025c6e03a076a50b0c41dc77eaa3a516b96f37c33a10d6ff9a1d3706fdf19b965928744a2391c420c61cfc16f1887865b5664cd980b4a64ce1b04064d SHA512 1dd69cd58d0900a99b65a52cd0b585e8db4fed2b38ef41cdacf305f2686e2dc01f8e739a5fe43e2f3f9a2f23290ec804a132c530d246c648a00bd269780c66b3
 EBUILD PyContracts-1.8.12.ebuild 1070 BLAKE2B f5bdb189895f4106c2290544f18d044cbb9789407d57f8f88e2af2858ffbf082f1c50909f31e3bf3b45e2a8e0e75b2aa07d98e74d9f283fb4f55371f123d314f SHA512 961f3645f92fbca6fafe2542ac8a3c23b8abcb831567ae36ed0a839d49f57a5a3d609a62e4ac15bb103c227d6076abdccec2b4fc666abf2c4de854a78f477eb4
 MISC metadata.xml 387 BLAKE2B e1a27603eeb8fdd909b3b7d8052c69b4f0c4aae087140d36e5b49ce470ee486706fa3bd6a8fea1354a50c17499157e540e3e9ed514802b9cb2640b396905b500 SHA512 b4c9caf597b04617af6bc61357be01e6687ba5b45258dc2f76bf02e3dbc126afe2f44e1298bf62ef502110a56cf6f0932fbe7b1a043a99a61a4d56a87ca17b27
diff --git a/dev-python/PyContracts/PyContracts-1.7.9.ebuild b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
index 1b05f39dcc20..7a5899184005 100644
--- a/dev-python/PyContracts/PyContracts-1.7.9.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyContracts/PyContracts-1.8.0.ebuild b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
index 5ad5020f5e71..d58e296b71c7 100644
--- a/dev-python/PyContracts/PyContracts-1.8.0.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 591ef358e404..84d883ad902f 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,7 +1,9 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
+DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
 EBUILD PyQt5-sip-4.19.17.ebuild 2145 BLAKE2B 1547a2e0c2fb8add669fe31b82e630a90633ecbf365518429f2f0ebce6279f8d6fbb27e467b9abaaaec69cb7f8aee1984962a6386678f365c5b1b91f6683c1bf SHA512 942d43df7bb3fb0b591cab2a0979abfad951b6fed1ea976ab195c6ef7595217085057239b39d83c24b28375131ec4504940d5ec94abbdef7d13d4f9554e022ac
-EBUILD PyQt5-sip-4.19.19.ebuild 2149 BLAKE2B 83b49f3f691236c11425a6ac44d7a103df7984be01f50f6f8063fdd6d6d28db5b977231fd8c7cbde4acd97590f15e658d3d546ffe52002092b053e8c430845b1 SHA512 60ad3994701a0444a41a135b2a001ff53df9597c046be6588ed3f3df0ea95f590766dc2c3e0fb0d4e955b988915259f1d17fd70d1ea484328cf5bc917e25d320
+EBUILD PyQt5-sip-4.19.19.ebuild 2148 BLAKE2B 2ddc7b8b2350431218b9591c657d7bf00f2e0a787ea6766060377300f475aa87a554feaf739d9b7fe308f60d56e67218ef9b2f286021bfb133fc0a737abb34a4 SHA512 56b09bf701770e2763b6e0ae4b372c4f52cbb2ce1b29f2f8468fc23c059a0c641a45dd5ea5d763c0921d8990886999a73dfa0a968fbe1e55372fc1e40894e80c
 EBUILD PyQt5-sip-4.19.20.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
+EBUILD PyQt5-sip-4.19.21.ebuild 2151 BLAKE2B f1857883f2b5cf6ee97c3654b41ed4de0d7d4f9acf2211ddd879f2069a6f625c1b5166ca159d188b3ae23f47111d83a0e3dd03c36ebcbc250cc2a3df35ab2a24 SHA512 4a237cc928695d22daf7c1b848caf82844a20a0427562c08af3d6d309aa563d45ebb59542224956a46f97e3262b09593d479d81caae571755bd10dbd6e785cea
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
index c381a44d8150..2ee9efa4ded4 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.19.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
new file mode 100644
index 000000000000..a5b7820e1a9d
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.21.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Private sip module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
+
+S=${WORKDIR}/${MY_P}
+
+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 || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			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_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 07f034bfb03c..92fe4e3d9ace 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -2,6 +2,6 @@ DIST PyQt5-5.13.2.tar.gz 3162810 BLAKE2B 383aaa3f1f51ed618a3b6475432a96f6a8f89ad
 DIST PyQt5-5.14.1.tar.gz 3241571 BLAKE2B c4f6ab8b5c955186c71e0f6c1ac75fc559839c52374e8ce400c823a813c0c646ed60b5f496145114e5480bd2e4c057d52181b81d79fd01fe5dcd9e4c537118ff SHA512 10b6abb6fdac64233041b0ee91c9f25cfd2a759ec5bde239c87ca9df8176cdd4fcabf6deb8db2dd9bbd911a040d5c476744f1b55aded9c66eb8b5182f99ddc86
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
 EBUILD PyQt5-5.12.2.ebuild 5902 BLAKE2B 0c265494965e473adf1a1cd6c4ecb1d92bc4c3e0bea3143c2d01371f977b7b09705d9e95875e7fd9579efbeac45d6b7a42cb295d78835b4cb4f2292b35614fb2 SHA512 8d55d4964d019fb28f7c6e0eedaff01f66889f5ef39ff2c1a5ffefa8784b2a9527bfb82c2b2043873bece8872246e49d60c049f48e9f9fc90c5cbbd56df7beed
-EBUILD PyQt5-5.13.2.ebuild 6056 BLAKE2B 25e48fd4f3b806d77c9fca12b200bab855a46f104cce8fc95b5a1e081d5427770936da2e3eb94cfbd8f80cf0e372b2662fd368f8bda0de35318929a035514a33 SHA512 b95891a1438681168096e1a893819f3b7fc94e409207d2955681604c4830964aa3afb6e564dd98dc2234036c671d413be4fe33b7b1f82ad5894b578f348c1b3e
+EBUILD PyQt5-5.13.2.ebuild 6055 BLAKE2B 2a8f18753125eef3681d00f11fbc231c0adfe5d7983fc853dc00274dcd40ee71906df2fc32ea536abd6829966b24c70237997e51e8169bfd01bc01b4f4acb674 SHA512 55e94d8758f72bcd9e644a965c1d882258816b95579ec71b3217b7ebc817f864b9d6dbc7e47867dfb8610d748ee707051094f30bb9a76e982edad58ef11d05f6
 EBUILD PyQt5-5.14.1.ebuild 6021 BLAKE2B 3a7aee40dda97ae9b6f322b1a03d34bf464edb38e046f936e77aecb134a888f15e175bf9fcbfa91a24b6fbb1337fe58a1730a62d3a6cf7c6a4005aee3c7997fe SHA512 6f47736c94ecbfe3a153cf4a591b558e8fd65718b659778371e84bef561d062ff95b3a2caf9c095fbfdbe49b43134644478fc09602d58dfa486a186ff8d9115c
 MISC metadata.xml 2427 BLAKE2B 38eb2e33dde7fe4877028975c6c4d9ffe53f1c9b7fe4697dbf4959ba0ad53226cd4c0e58c8c1de3c8fe4d9fe66b1423e1c1cae047b1894208e9069ce64e9c0e8 SHA512 bf47edf8c7e577d3851c5e40491cfb5f6eaf214ead58babe5c84c4cddbbbfc65e90fa31dd95701e5e5d1b3496a739dbc451640b70ad4f610648c19f810c6340f
diff --git a/dev-python/PyQt5/PyQt5-5.13.2.ebuild b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
index e86afa7381c4..e398d414ce64 100644
--- a/dev-python/PyQt5/PyQt5-5.13.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.13.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index c73b6bf32416..bdb32080f333 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -2,6 +2,6 @@ DIST PyQtWebEngine-5.13.2.tar.gz 45234 BLAKE2B 4ad3aa63856cf3627c2f4ba29d93394f1
 DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B 28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c SHA512 c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
 EBUILD PyQtWebEngine-5.12.1.ebuild 1701 BLAKE2B 0d613d9c7104bdfbe0bcb354859bfc8a71152c34d85e3c63d1be6f3d63851c0f59093d1dffaf8757799db3f28ba5ffa226deaa2580591a40a8af3f303909fde6 SHA512 3e60e50baeb21cf8976046da49079a44f70d00c754b77d1e9da083f83faf33a47ef98f1369eb6ead5b98cff8f441d607dc179ba34743c6470400663adff58158
-EBUILD PyQtWebEngine-5.13.2.ebuild 1716 BLAKE2B e9daa33d3f26d5154178d019cedd424b3792855cd4902c133be76e781bf056a0ba51569dd5bb1cfc913ee15961f5b9d4cdc6e6104492543f363cb96426510207 SHA512 182737679c99d6875e8e16a650e5d5d200fc4722f44f067ed5ba8c0cf2b2299eed7c4a974c365a561c5cda5208d508edd00ad673083fb9a1bea6c8ae5d913e1e
+EBUILD PyQtWebEngine-5.13.2.ebuild 1715 BLAKE2B dc59e5d1b132c7cb2abf7b46c43ba855dc0e13afd6ba880b448c0ed0b61deeaa559794323a0fe26ba7851314e426ebc30622428c0083445dbf9b9aa817103818 SHA512 b71319d1fb2ba2389c6e2278917b669d831f988c885d3a7fdfce149f39bb1de7dd1d2eeec1a9923fed37d9d943e31b8d3aa28c6a779a2dbedaecf4af63e889d0
 EBUILD PyQtWebEngine-5.14.0.ebuild 1681 BLAKE2B 1235a69a52bd9c9e2d2017aae1f25a5ae75b2b30208bba4785b4e4037c731ae96ebad577998b21c1a5746d76068080eba4df9fd7e14aefb124bad03339e70b9e SHA512 872e7c531a7f4acbfc18a1375616ad87e7f0898ac7a4b707eaf651a9146bceefb0a159c3323e4af2faf708aece5e174704cc13f8da30b504a2ffa6410d341c85
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
index 420935369b19..dea78427f27b 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 5cc39e0887aa..f571bfb142e8 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,5 +1,8 @@
+AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
-EBUILD PySocks-1.6.7.ebuild 570 BLAKE2B add1debcfe2b317ca10eb252ce706e1201bbc9b8ce50cf4278ca83477bc56ed4ea009d6c1fe1612e558008ee50052fe0bdc7c30baa0061cf4ff8f9c138f0cb53 SHA512 4d115844e12e72e0dcadfc41d53d7596cb422902f7558f9816347a87fd4ca18d844478b0f9c587fa0835050e97adc8b9629156e826b2b8e2937f42cdf4f824be
-EBUILD PySocks-1.6.8.ebuild 905 BLAKE2B 47a623b8c235a2ad4a669b260301d9ed466af4b06b379a58763712a9b7a79c5622113b73570a82730396aacce056be5f1626894062ccd3e81de61821b6cf4570 SHA512 dc5cdbdff385bb6dd84a7d2c6fa1ccfb144f8330f5de5912afb232ca1ff3538dbe243c7244ff33626986ca02f32efe2cd2a254207f30f1eba968ce57115f4ebf
+DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
+EBUILD PySocks-1.6.7.ebuild 571 BLAKE2B e68eea666b1d1dd88406a3fc1d3fde4e16f03f731733ace74329857c9efab63fa8ad5dfea62cb76f83e961b4c2232aac07ec9feca99c114be0b6d3cce18de91d SHA512 bccb459c7442dcc29498d3906a41caeaf4a4ef110f3e1619cf60ffaa85a3b6310678b1f24df16db4d803746808b7c923c629c8be8eb92fdfd0044411b22cbb00
+EBUILD PySocks-1.6.8.ebuild 906 BLAKE2B 3a77147fe6868e55f2da91db1a7e4aacd8280850f29bbfc3d84e2ffd4b4d688a28c1aaa5ab260ace65a19ea43f1e2052d0e31345351e0846b4af366e54e828a7 SHA512 2f0734e4b959c5834233877f4891a99b22665a8324942570aef44691418bcfe9afeadeb06f75f4388b60cad0840cb9a726782d61aa75f822ab7db7c149853f76
+EBUILD PySocks-1.7.1.ebuild 1267 BLAKE2B 8cd5310f289a6e815baf1c6551a7e5637b6648d2be871207532c3f1670139aa7448863dffe7ca7c2ea21ae51c1357107dac1b1c7fb9785780cc7ee49798ba217 SHA512 334034de2127ecf6e6605db75dd3fe66a9ce03529760139a2975c921b99b041e8b9b94a6decd886ceb24592502ecf70d3195379638dc9b155420f3bbd092aed7
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 35249b1f81fa..285c4a5759f4 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 4ae280e814cf..0a8aee64d45e 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/PySocks/PySocks-1.7.1.ebuild b/dev-python/PySocks/PySocks-1.7.1.ebuild
new file mode 100644
index 000000000000..579fd5f5e387
--- /dev/null
+++ b/dev-python/PySocks/PySocks-1.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="SOCKS client module"
+HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/"
+SRC_URI="mirror://pypi/${P: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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+#BDEPEND="
+#	test? (
+#		net-proxy/3proxy
+#		$(python_gen_cond_dep 'dev-python/test_server[${PYTHON_USEDEP}]' -3)
+#	)"
+
+#distutils_enable_tests pytest
+
+# tests fail semi-randomly; probably starting proxy server doesn't work
+# as expected
+RESTRICT="test"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/PySocks-1.7.1-test_server.patch
+	)
+
+	rm test/bin/3proxy || die
+#	if use test; then
+#		ln -s "${BROOT}/usr/bin/3proxy" test/bin/3proxy || die
+#	fi
+
+	# requires Internet
+	sed -i -e 's:test_socks5_proxy_connect_timeout:_&:' \
+		test/test_pysocks.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	python_is_python3 || return
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch b/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch
new file mode 100644
index 000000000000..20d208549720
--- /dev/null
+++ b/dev-python/PySocks/files/PySocks-1.7.1-test_server.patch
@@ -0,0 +1,33 @@
+From 983f0451ed25c755da670a682703ae8f7795782b Mon Sep 17 00:00:00 2001
+From: John Vandenberg <jayvdb@gmail.com>
+Date: Wed, 4 Dec 2019 10:44:14 +0700
+Subject: [PATCH] Update tests for test-server 0.0.31
+
+Closes https://github.com/Anorov/PySocks/issues/117
+---
+ requirements_dev.txt | 2 +-
+ test/test_pysocks.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_pysocks.py b/test/test_pysocks.py
+index 49893b2..03d2649 100644
+--- a/test/test_pysocks.py
++++ b/test/test_pysocks.py
+@@ -79,8 +79,7 @@ def setUpClass(cls):
+         from test_server import TestServer
+ 
+         cls.test_server = TestServer(address=TEST_SERVER_HOST,
+-                                     port=TEST_SERVER_PORT,
+-                                     engine='subprocess')
++                                     port=TEST_SERVER_PORT)
+         cls.test_server.start()
+ 
+     @classmethod
+@@ -112,6 +111,7 @@ def assert_proxy_response(self, resp_data, content, address,
+                          self.test_server.request['headers']['user-agent'])
+         self.assertEqual('%s:%d' % address,
+                          self.test_server.request['headers']['host'])
++        content = b'3\r\n' + content + b'\r\n0'
+         self.assertEqual(content, resp_body)
+         self.assertEqual(client_ip or PROXY_HOST_IP,
+                          self.test_server.request['client_ip'])
diff --git a/dev-python/aadict/Manifest b/dev-python/aadict/Manifest
index b6374c1656fa..88178a89c208 100644
--- a/dev-python/aadict/Manifest
+++ b/dev-python/aadict/Manifest
@@ -1,3 +1,3 @@
 DIST aadict-0.2.3.tar.gz 16511 BLAKE2B ab9450e358fe0339f60f4d6be6445064c67303420e2d4045a21661f8038ad506c8cfe551fef9353404822b1a2824f6eb6461fc783e252ae156f5d76de41c9d3e SHA512 16f3ff59f41d5dd1f9504ed11d660636766758332a0317544253daef9d76f2fdfc654add6346ad809e56e2be51c1f19a645c1047ef01e1e4aee8db24afcab113
-EBUILD aadict-0.2.3.ebuild 728 BLAKE2B 4bbc0c326f80bcc4fbe298f021bd989d1eb9b4f198094a863aee3e3615b0115d941a67c4a5336d4a3c09ec69fdbadd813c37cdf0c9290850f433d5aa71314de8 SHA512 0d2b4846e7ce2d4a273ba4fa68ae691258b5044a4c73f6f2a202eff1441f14d42c32722f71d2a9541bf1cca2f01d9f3ef475754ba329faaaf1b317f67ee1e3c7
+EBUILD aadict-0.2.3.ebuild 718 BLAKE2B f65aa725d69622b08676799464479f485ca0806db49f5eb6ebd8641c93b51b9098e6e423c7afdde1f0fdc07e68040f9716a1cefdab9c31832877749aca3aa127 SHA512 a528c61562813af381d714161ca8fd80f4ac4429d718d12530ce66c0208de650e05aaa5a1eb5ac350cc1c2e976417f747359394852674c51fa3d31d587ed97fd
 MISC metadata.xml 503 BLAKE2B b917d303ed73f424328952a01daa1302e3dae2876f1e5fea0c0cf6792e2fe0957a873062cd9f7b5e2fa5e27ba56c3d98d06e112e2d20da0508fc6876f5d16933 SHA512 31dd3aecd967835f84c7f6449b1adaf8c8e6cbd2f8513dcb2b0d3193c97b8588f58fd881f27c7b766e072cead538f6327492977d2d03ae54654756b04ab9b5fc
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
index dfa830ab5ab1..1c6bba32acdb 100644
--- a/dev-python/aadict/aadict-0.2.3.ebuild
+++ b/dev-python/aadict/aadict-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 23ff7704ebdf..c0d111d980f1 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,5 @@
 DIST absl-py-0.7.1.tar.gz 215669 BLAKE2B 6c7eeea6c21f03a493448dce12bd30b62a34e087b1bf932f10d638190dbeecb79ff40d90698b80bc2a62b6c45d9254f6ff4a789d8e8139b8317516ef2f7b5fea SHA512 19fc41effaeb22f6a4376b9ce32560fa8e3f36b7004e17806ac64fb6775525f3530b36ea8b224d1ccf2f1ee076ed0671039971b061b9185fe37c8f2495110a84
 DIST absl-py-0.8.1.tar.gz 220234 BLAKE2B 5ce5bc83bf456794f1e38a00ac7c52397e262c8d69e35248b008a5f682fdd8d1cfc33fc5313783644a6baa0be7f32660c4eb2b0e72d86259f40abbfbc1eb868b SHA512 84f751dde2bf725e08adfb8bd34e3d43a13bf557d2c2e3b3fc98ec4fca78c8a17a714cd7804cdeae86dbf758c5021d1d92c688df25f7eb83e633c312303efd36
-EBUILD absl-py-0.7.1.ebuild 560 BLAKE2B e484e5d16b6a5e268c801af9ebaa5efa8fa1ab4a24dd6d04b7a9de0e48bdc5662c7cabe27e394f904903d165e3d239289e35be52cf8dbd264de6c8637ec9d210 SHA512 198467325b9eafab58802c3a8b1797781edc9e4025099893af38d7c2dda7edf0fd8ff12450d75cf631bc767dce9989ba1ea0803af15034c6879d43ac033e5a76
-EBUILD absl-py-0.8.1.ebuild 562 BLAKE2B 2e9d45038b44e1d86627e0cbfc6031c3d5407d4f9d2a2c7c12a46c41ae8f33b7aa23a5e4638f05dd0a2db6a3af543bf13558022e9177bbed51f07465f75ee090 SHA512 7140380db8fce828c5d2782ffad1e767f184fecadce4656af11bf86cc65ea679cf832ba1a05c1b0d74b25b9b1be53207dd6fa5b3327211ba9846478c1080d651
+EBUILD absl-py-0.7.1.ebuild 550 BLAKE2B 2399a7ead37d866d8f06871494c4bbcde2ccdce723091b668129a23f2725414f51b2c4ec331f813cd9776391dca99cfd5c80e36d10cf5df18762e99e96751979 SHA512 2f9627b6e1782a40cc78a6056d45b1d8bd6a398207215ebabea7e48b35b131a16600fc5370b9a9346cce391c6e1d6261d36535edfb7041e71e9aa3effe089eff
+EBUILD absl-py-0.8.1.ebuild 552 BLAKE2B 78f70b6f5927fdbaf8598c10c064257838e5d0d15d3f1ddd67c7a5d2cabde78d6f3db224d3113ecc5089b2f8bbd17c94e383be1fc9ca122543840e492f0b3757 SHA512 a429880a7a64e0356b5a598b4a76ca72e4f8e258ad3c0d2ba0ca47902b2b9e520ce9ea598b1f1b23bb934e5dc89d82035783d1f89e1ba4434000971d3a7357d1
 MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
diff --git a/dev-python/absl-py/absl-py-0.7.1.ebuild b/dev-python/absl-py/absl-py-0.7.1.ebuild
index e8aae602ebeb..e6d6a58c0918 100644
--- a/dev-python/absl-py/absl-py-0.7.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abseil Python Common Libraries"
diff --git a/dev-python/absl-py/absl-py-0.8.1.ebuild b/dev-python/absl-py/absl-py-0.8.1.ebuild
index 8448a55c1621..4c68bafaefdc 100644
--- a/dev-python/absl-py/absl-py-0.8.1.ebuild
+++ b/dev-python/absl-py/absl-py-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abseil Python Common Libraries"
diff --git a/dev-python/aiotest/Manifest b/dev-python/aiotest/Manifest
index f522b9ec9262..0280711ea8bd 100644
--- a/dev-python/aiotest/Manifest
+++ b/dev-python/aiotest/Manifest
@@ -1,3 +1,3 @@
 DIST aiotest-0.3.tar.gz 10146 BLAKE2B 730da4dcdf50d0cc6262f8ec07c260981440734b672be6c997dd7f98afa7b71300f0461d5b3ebfc052995327b1f9f9429a1e84658b100dc689f633e8d7db5071 SHA512 6af65e283dfae1ff0f09fb09498f1a5be971daef4907c5079acc1c7ad353f4aa415e03f3fb18d9fac28c54abe35c9db917584082a56b4b43cd80cbf5fa689d59
-EBUILD aiotest-0.3.ebuild 788 BLAKE2B 243b931a7e5eb8d85815c3272bf2c1b0fd746d0b181dd38dd36810c8a4213eba1a8624495e5e69c7048923b853dffda91de25fd261af2be1a43049822145c1a6 SHA512 227f2f861dd175c708f68093bf18e86b4a1d6f655d29ab354553468f9fc88cb6082e6fe78c0ade767d406a431ef19d7e4df3da28c3689a3ccc329b829c90a09c
+EBUILD aiotest-0.3.ebuild 545 BLAKE2B a3803be390bab54d3ef87985a153eb10cbff2f9460377aa0c0bf6abf78d7379a3fb09ef1823f1e8b63cc4510295c3d5ce599e201621b953739c5853c0c8b38ae SHA512 c1801e42a3b294cf8627443a0dd634f94ebb9fb6c4ef0a1a9f671f835ce6f44206c5fd1d674c178a151d3a23f615e6ff2ec46b22ea53550480fc0abf9ad43db4
 MISC metadata.xml 344 BLAKE2B c1f17b0db31bed7998b4d75c436520f05722062eb60f64df7fbb3b9d75d324d77f7e6f96cd3dcf2baabd6a0c9e11219b87c13f354f0e04239032dd3796ee7bc6 SHA512 da7c8a88e3043b5148eed4f1de62acd094f7e0f791cbb7d9707a97ba5fc85a1833c9754ab3beac904ccfca500b20196999b1381a8f5bdafb5375f2c9b7689819
diff --git a/dev-python/aiotest/aiotest-0.3.ebuild b/dev-python/aiotest/aiotest-0.3.ebuild
index f17915b2cd3a..c04392458906 100644
--- a/dev-python/aiotest/aiotest-0.3.ebuild
+++ b/dev-python/aiotest/aiotest-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Test suite for an implementation of asyncio (PEP 3156)"
@@ -15,14 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	local suite
-	python_is_python3 && suite=asyncio || suite=trollius
-	"${PYTHON}" "test_${suite}.py" || die "Tests fail with ${EPYHON} (${suite})"
+	"${PYTHON}" "test_asyncio.py" || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 04e7792a9b82..080f12fbf513 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -3,7 +3,7 @@ DIST alabaster-0.7.11.tar.gz 10998 BLAKE2B 93975fcb93cac425d6db903f89c862041dd48
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
 DIST alabaster-0.7.9.tar.gz 10485 BLAKE2B c3a22dd8b813f2dc717a1fb24d252db949f6336cb5b785603f933d4cf32236f9bdff117118d85ca3f6995e761e8d2689feb2c69be516ab681dc664323da43605 SHA512 b1286c4d5d17d172baaacbc40ba6a435d433f0880e31416c37ac88df8787bf522f1c28b6903fe92c88414f54286734508860eab86ff7f12da72315bf9ae0e6c8
 EBUILD alabaster-0.7.10.ebuild 523 BLAKE2B 0f4dcb1f1e50af16cd04c10f30ca4a1db8120a5d4ede84cdca496e14b9f4d1a65e65a13de55d4a2631d5442e7df15dd04707470a98c192d2f509e452dd95532f SHA512 ebb8573c4cb633af69a9d737aa888c35992c045cafc90e5f390fa9a0954a32741e25fbad51bf4834eb610b2a1217e0c9d90ba0dbf9a86cee11a6655f9f12bbaf
-EBUILD alabaster-0.7.11.ebuild 518 BLAKE2B 5300e07b2078cc392b42212a3e5e7a238742928d680348d741ab6388f5e08ec4f5963d1d610dd13909ed69077907cc562a513304d78788e081011cb299dbbed8 SHA512 16a5a6a46bee7021e89c940ec0c9b4137c17fb231c3c5e736766a950eeeb7e8c75391cb5402eab843f2aff4aae90d46c9cb6660bdd84c3539384634e9805daca
+EBUILD alabaster-0.7.11.ebuild 519 BLAKE2B 66fbce1b796db36c098469ec4e02ffcd749a80b9342e0c75b090ec3cd01cc7d5fcf243fc09f2f9de510ee90b59e4a65424557d791a1b8155a657e432ddd61dba SHA512 76d407819d8e02b26d71cdd904ae4dd6223c0f2bb8a6bf28d35d6b37fca9c998177373bd55d9d33ab1cb6257c4a25e0ac4bafee34895667a7d81572d954af8a2
 EBUILD alabaster-0.7.12.ebuild 512 BLAKE2B aa86bf402fb191c08cee6509fd589f897ded4b961c74e34aed81c7200716d08021501f56ea5de8883bb7ccddfc171d9857bf2ee9d91e94df708026b94497b057 SHA512 d1342036a31b19e581c3a23c7361890e68ceacfcce2a3288386580925740447b9304aef9c6f8578bb3b1cec8b715646147ca11ad5ee8406232338a6820cc07e9
-EBUILD alabaster-0.7.9.ebuild 499 BLAKE2B 4d064c8f28229713732beaf166df08666c9712bf9fc7283318847586e6c7ca39fca0fdaf2e38e51067ee5b6565dc3e7b48409f3fbe2db081a43e9fc7fb405849 SHA512 d71b99414c19689bc07115c172ab3d6ed43c2a0a5213fefef2251a3cc43d45d3d15d01cd78eda910396337f5423cbcd557e4e20a8cc82b4e2b5cb1af68b96d9f
+EBUILD alabaster-0.7.9.ebuild 500 BLAKE2B 849b249f2574c6d14a661b238119a77558112c2f351c0c076ac9078557d8d43b9e96df18fb40fc6f8d906051708f9398c4802ff1a7a9cb51f96aef20e39502ad SHA512 5830657ae74f6fbfd4c3b9b89126c18e40752157c7c3a361fab1ca1e52dddd70d3997cd8678a25080a40bfc38526c2f26f22c4edbb1098522669d3ebe88f13d7
 MISC metadata.xml 384 BLAKE2B 55991f34f966ecaa57dfd6474f3ffc0d25b04b106c3a45c6d5fbb88457598b7ea93ef5edbb84af23fcfd1ff4b6314c6c56397a5a52da64e3fde3ce1f40587d6b SHA512 7464f7780562e6a8aff5a243e0a87e08740b06210a25c83ec82649974b0b50aabcab46f6c35b5e568b898ae8a4d10087961ae8953785f4dab33b62cf782e4657
diff --git a/dev-python/alabaster/alabaster-0.7.11.ebuild b/dev-python/alabaster/alabaster-0.7.11.ebuild
index 60618c2c97ab..1b1306469453 100644
--- a/dev-python/alabaster/alabaster-0.7.11.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/alabaster/alabaster-0.7.9.ebuild b/dev-python/alabaster/alabaster-0.7.9.ebuild
index dc18358c865c..3e380beee3f7 100644
--- a/dev-python/alabaster/alabaster-0.7.9.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.9.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/algopy/Manifest b/dev-python/algopy/Manifest
index 376359355a24..6976675359b1 100644
--- a/dev-python/algopy/Manifest
+++ b/dev-python/algopy/Manifest
@@ -1,4 +1,4 @@
 AUX algopy-0.5.3-fix-test-cast-ufunc.patch 1216 BLAKE2B 400a6f13fc9e9d426e35af04c1e57c812916ce73973f5f474c27b62a212e3e5fefdbba628d5280c1b9bc8af45667c1b42186ac0ecccd32f49deab2ee11d6f8f4 SHA512 760f2d9ccba579079992b59a8334a1606ac8481c7164637640916418d7ffa1fb989b81dcf1445c205b832f476ef883f1f0f18cb540909526e8b1a05e6c897442
 DIST algopy-0.5.3.tar.gz 149560 BLAKE2B 8fdb5e5c00aa161bbc2a03c584d644e36d2843bbd3d1e090b0a89ef52db9a122561f050aa7676f9fecdf78485963fa3712b3f2698e52fed90d9077ab4395838e SHA512 43b3cd4f17fa821fc61898534f595202097cd56d57133a1d13e23743c794166a0f8877947cc6eae6d2ac2fd7400e2a6527ee8229ec1b26ea660ac9c01cd22912
-EBUILD algopy-0.5.3.ebuild 746 BLAKE2B 78af6bbe90d0b4717417dec106f014e4cfd4d5b4c802f548103505d574cdf248a4b19ca607883dd43620330e237c407fd01058605f3abb4572ab7721c52b6e5f SHA512 202a0bcecbcbbcf4d93b0a27fba49ecab9c0d0b7e070cdb11053a241e4d5fb31533796c8aa5e9a15de4235527c02d19cee084dc284d5c879196af8158c33d66d
+EBUILD algopy-0.5.3.ebuild 844 BLAKE2B 3d46456cb576bbd741010f2f79dab6cbaf56efbd374f494d77313e1846e42c8b5625ea9c284bf3c4ee0962c4f21ea9b59a485e415662153bcda1da2c0ad7b137 SHA512 c94b4992c227e4e5f4939d1bb596dd009183feddad5dafa1e16b3540aaad9a278f4d7d93646cb5c37a91e5406ae057850e666e5102907c287d387f497acabf17
 MISC metadata.xml 319 BLAKE2B 467b55a1297cc848051e0e3d9a6d8fd6a4df43c639f3b79fbd3ce31247fe3082c208282256dc070b0ffb0e0721ec868c97bf56c43c8910a554eb29506820b1bb SHA512 032311a0f7e860ef5e890c30458a03beaebb7911d412642208e1bf60f26088e981ef99bce52a637048512eacb3460e740a7d969d5c83ad42e64cb0c584151477
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
index 819d381dbcc0..4deca4ef6ad9 100644
--- a/dev-python/algopy/algopy-0.5.3.ebuild
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
@@ -18,8 +18,14 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	|| (
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 2a9b5aa834e1..5de64d853d9d 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -3,8 +3,8 @@ DIST aniso8601-1.3.0.tar.gz 57730 BLAKE2B 7844add7f785371f69a8a473c0706edb76f994
 DIST aniso8601-3.0.0.tar.gz 69371 BLAKE2B 7dabeb013df414db6ade982595cb95514eb408855641ac2a6552f4ab1e646d478c2435a2b1537149fcbcffa076a913b45b644163585377cf98036d898ed1154c SHA512 bea2b9dad8f8ac2c5314570ce49846ef0cdf6459019065b5529966fbaf20a79d76b7af5a93f5bb8e1d811d3355a217877ae90d295529f3e9a7b2b20e6465b1c7
 DIST aniso8601-3.0.2.tar.gz 69520 BLAKE2B 84cc774b72b04055fb7fe79456fa8c47b7ca3b2406dbbee5022912bf13bbe3663fc67ea663ba4654d27362df5bba6b9ce811ca89fc919fae9c0f5732087c43d4 SHA512 c367a9f783fc5e18bd761ce501ee7331cfd2b3f209578f90a16817ef47a16c45ea7ddc0ece648bcf91cc9e249f8f01b8d63fd1fd4bfa585bf2d959a4a12a3d6f
 DIST aniso8601-4.0.1.tar.gz 109849 BLAKE2B 487bf340e181997219c2e39ed887161c3f5daa336cee79ce947b55a11c463b439086c3985fc93184de550f5e34e03f2d855ccb9a3072c0dc16ac21bf02a7e78f SHA512 5638ebf82a1a1aceee866eb17e8e4b5c8023961a9e31ce3e12123b89dba0ea0924e10a6aa458c838fcfdb72b94af4e81b3e9e8805cb534a1eccaf5a51f2026c9
-EBUILD aniso8601-1.3.0.ebuild 627 BLAKE2B 9e59d0bdb3870022bcebb5b5bc68e9cd13fc11dadfcac6d21e836029a88e67f39e78c9a1559ed0ea297b6a5fa90daaf145b822b16340bdf4bccffee267e68063 SHA512 066e43199cc000cf76942147b99373cfc0d8a9938359bfba9af68e71870452aec126dbfa1966a32d82f740b9e9b08c47f0faea03ea5d136bc1b3895afe4482af
-EBUILD aniso8601-3.0.0.ebuild 629 BLAKE2B 19503be7b929b2826de10b4545304b89412f31fbd20d697917e65e4dad26055ade02e4dbc8ecc2905ed44635872fd40a51340e65754f6cab4b02941827bb0454 SHA512 89a516d6b5500e7068859b879c1276f031b448010831b162b0aaefbecb487b52177934dbdca377d078fbab91779d5f92803359da1357b57b6124d9fdb11968aa
-EBUILD aniso8601-3.0.2.ebuild 636 BLAKE2B 9161a8a45e28e0f3591ca6eede2bdff6dc36620802d8e20c36ad26bf4c9a513e86765d7d3d2d48f50f1b88614b1224dccad0084efea0a112fb0bfb73c48a5a27 SHA512 573f73e3f9e3d9e28af969650524d5a4227880d3ac09f17e768e9fee22d3a95fd32c55c56935022cdb10cc826ef9e600e2765eefa15c60c1a60d3b68410f6350
-EBUILD aniso8601-4.0.1.ebuild 811 BLAKE2B 22356def5066eabee740dfdcf4cad67459fde9ddc23c8d8adafcc45a4d01cff02a4f69d7143f2d903857e7bc2195c0552f937fdcb2c1f92bdc82da47b9866dd0 SHA512 e78b778c740836609e8b0a3091eee7a8290314554e5c2bdb3338a146e17db2c392193e6f3309f996bfda5e627a393c64f69825479e18134daf650229e109bb67
+EBUILD aniso8601-1.3.0.ebuild 617 BLAKE2B bd0910d3cf49e7507d429a5860a11a134c34691239226aa1ee6b802602422f252e1c70e9ffe2c154f3a7028a716d02d53f1c0343202ee5b626f3beb147dc3876 SHA512 cd88f081ac747bc7946c8ececf45c7fe8891a7085b06349414e624539f69b7c4d50967d1a19d22e0b47420a2994c3baa2af0d14289d1cb8d9eb1fa619ac40697
+EBUILD aniso8601-3.0.0.ebuild 619 BLAKE2B 205cd9c7857e1b2322134215331c3bd62a43193de47340c1d764efe5ab67fcb894b69ec647b8538897cf87cc3aa209bf014851343230880a13eb1ef4458846b3 SHA512 09519859df0811490df68b5f962373c347d3fccd3f0d69960f56ce16deb85dd1d587aecc3f62288d3484fc176c261e1fc2fc623519272bd1f6b5db409db56af1
+EBUILD aniso8601-3.0.2.ebuild 626 BLAKE2B d8f65296db56dbef19314a6c359dc7d22b9222a1c921d902af877a777e5e7aeec0386150305f3b9362c48785da40bb0c22f878ff06cdc0a4f3948bd997ca8e7e SHA512 1c94291aec59da8e94b5e79e0f5c07add6cded790b5551e7f290c37b7ae121673b4ac501844f47f22d5c797b30cae9f62d584033d367e0565d0392edc056f67f
+EBUILD aniso8601-4.0.1.ebuild 721 BLAKE2B 6a6552fbe72645f45fabab6b263674370b840c72a5564fe99fc5a1936ba2733bbd9bdafbbd7f7983a4a9a4847d4ad32e855399251fc01641a0ceabc79b89b4af SHA512 532e79e7130fca93d472df756924ee8d1b75911d9de2fb1cd42decb56206ea77b7cf166c0ff3d37df48ce6f66b9e1d9b44ebef8fbd842672164f7eb3cbc3b098
 MISC metadata.xml 385 BLAKE2B 665a2f5886166953707e75ee9f5bc225154157431ae9a9b6bb7cbcb8103150753a848ff184100c73177f40f6c5b11f1ccb4d0037504d67513810cd6dac8a1f34 SHA512 43b38fe6bef338dd41825197e7d3d0bfd3f040ce52073a6db93592f1b49bea4141a58ecc55e71b742c498a62000a2666c456b08d15bf25888858dce310e38121
diff --git a/dev-python/aniso8601/aniso8601-1.3.0.ebuild b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
index b7ddea2ddc0f..5f5df95319d6 100644
--- a/dev-python/aniso8601/aniso8601-1.3.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-3.0.0.ebuild b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
index a04ddfef77f4..fd6f9abd9f27 100644
--- a/dev-python/aniso8601/aniso8601-3.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-3.0.2.ebuild b/dev-python/aniso8601/aniso8601-3.0.2.ebuild
index 35c08d46190f..bb7a27ade76e 100644
--- a/dev-python/aniso8601/aniso8601-3.0.2.ebuild
+++ b/dev-python/aniso8601/aniso8601-3.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aniso8601/aniso8601-4.0.1.ebuild b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
index bfa2cb8ec8c9..3251321fa7ca 100644
--- a/dev-python/aniso8601/aniso8601-4.0.1.ebuild
+++ b/dev-python/aniso8601/aniso8601-4.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -17,8 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=( "${FILESDIR}"/${P}-mock.patch )
 
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index c68fc7c944a9..12e0fd910c5f 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
-EBUILD ansicolor-0.2.6.ebuild 519 BLAKE2B eac359028c7d33ff539aa2da26d7ab26962b89d21467d4832cd0f5d59a430172c6a4b14793664ebc42dfe521bdb4d0b59691efeb48dadb2c6ab3c49bd762a910 SHA512 0191d819adccc6fc570e58b1dced7f861767ab61a3d60c5192e1073fed3c980cac0b4cb2efaffcb049dde673b13e43ef48587c6ad2381bc70a4fdc0f8d940a49
-EBUILD ansicolor-9999.ebuild 655 BLAKE2B 70f5f845b839b32cfb19fbb44b7cf08d265b269f0986ca179b5cd616a850f5a94fea0b3342224d8d9f5f3266180b4bbd39c0fe7d027752b61832312b3f03657d SHA512 6becc8b119e4a04c07c2d9b95f823effba528f2d3ac339caa77845c63cbf5b855a0a0ee5a355349e23da9fce157540818a54ac251d6ae955f1f5ebe323b23c88
+EBUILD ansicolor-0.2.6.ebuild 513 BLAKE2B 88bdf9a046248d159810ed78eb64bb6a84e3370a217dc37af207a0fd6820c47563f270c3b43ed28b02261902966ead2fff41679228c5a132880d6f3d68190fef SHA512 d5baba68ba67c30b249321616e6e5d4bc46bacac367c3d8fb3f3d17acbb69685c3d3e94185772886b73e3b9f21b6bf11340b29251b26f4320d8ae60c5ff6f398
+EBUILD ansicolor-9999.ebuild 649 BLAKE2B 5fe5fc92f67d6b04966ef498abe68d54414067797174fd2f1d5c4023f7b37fb0cf4bfb982d6b5085ab5bfc16a61347830335f9a1b045b894b9a5895974cf53f6 SHA512 9de36447f2948c90246f6347e79f2a461a389b598d74b82d4c937ab66d8f3152b57a0427c355428c7b13716ff9ed1a4b42c0e1a66d63b57175508e7cce9a516f
 MISC metadata.xml 298 BLAKE2B 4ca5c54a9b47e20ee8ed4520c011034049088aaa0bcb1ae7d37eb590c3f3b3d8296e71958dcb1b6342f69cb4e8edb443823bce0381f97cf80544bbe66473c122 SHA512 debf13987936d64adf35fcc48d08f306f13d2d719afb478e8c78a89eec873c17a0323a6cc7ce473c67077c5ec9ed97e8983dedd63e986e74702166c592d4a193
diff --git a/dev-python/ansicolor/ansicolor-0.2.6.ebuild b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
index 7ef5812453e6..866117da9492 100644
--- a/dev-python/ansicolor/ansicolor-0.2.6.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index 43e3b92c5f6f..e5f2a4f1961f 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index e9be05732188..96a818ae24ff 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,6 +1,6 @@
 AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
 DIST apipkg-1.4.tar.gz 11224 BLAKE2B b59e3fe39030f1f1f7f41e121d7a4e242d7155be5f7b2b8f3cd7550772acceacaf2d9540cf98bdb51e6d132af937d634bce3699b950b9d9aa9a618009cbaebb8 SHA512 118f806706944513f50d3cdef596b32f8ce585cfaf94d2531a6d260f90a0e2147177161aaa6f5d6823150e6182d0f73be3dc01259b8a2f8d710733a22ea54789
 DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
-EBUILD apipkg-1.4.ebuild 815 BLAKE2B 0628ef6115ef4ccd1fde8fb79f83e3c6b8feebccdffd1d0eaac8065d43077de72dcc9eaded0a218e0e9206dd91e8f932eba781ffc0d2654b02dda770febd49b1 SHA512 c95baa01543813c1ecb26ac3c80827bef3b0d49fbb7c026b66ab7aea4ad898f372f94da1badd02f91a1a497f2e327b03dea116fe6cdd4597d2c1f76738902170
+EBUILD apipkg-1.4.ebuild 816 BLAKE2B 33113e859370628760cb378d18e885ea3cd4690eb1e910669f6cbf5af0b4080955ec7059af2c5b9b837b73048fdedcd570bd33fb6222e8a3f28961e51a9f89f0 SHA512 dad54b9e4dfa18bfe1652be91613f20b7bce40852badd5c51acf780826cc66569de4fd2d712d3c22c311c7bed3aaacaf335c35e8fb987906ecdf740317456feb
 EBUILD apipkg-1.5.ebuild 633 BLAKE2B 62cc483e7f038601b88010bf4f10de3bd898097b3346c21ff32b3351c6c699ea68e9744a6a7c7ae6937c90e58fa9d78f0f1d6054cec42349356395a2452a25f3 SHA512 93ae06a50b0b1aee581d69b9b2d04c8d98f4a03c497a413cdb4371168e2b36eb264d065388f0e70b80a1b6e9130bbbe9a782c549b1ab4107c9905b45b753adfd
 MISC metadata.xml 309 BLAKE2B 693a9a5373548cbc3c78db6df12bd9dc7aad3bfd3665f702f65a18a1799dc089869d5577ff6d6dba67573393970d8b85c356387a53786376503d33f979bf6e52 SHA512 0f74900faac286382377f2233aaafc9a6e8d7b49c017f60c7c451728d67cb9b9505f57903901a56f67327364951e2e7ab7dae7c852ad70b16070ce48ff3f93cb
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index bdd563fb5f63..09ee8a513b92 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 02fac15fcf35..f93f5191921e 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,5 +1,5 @@
 AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
 DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
 EBUILD appdirs-1.4.3-r1.ebuild 1224 BLAKE2B 8c4cbcb3b28b3e41a9912ff2fb22a352359333664ea547c151acd7b440ffc32afe99a32b3ffc2bf6857a7340f29eebed72920a184a685042d02dec8282e9d01f SHA512 ed5216a816befd0afa35a08c8d594dfa2c36a7ce007da3c0b9aa24d74aaea70011d3870f89a679fceda6b5c059a37d16daf4f1c4bb87dcac43a4c15c7a1c8c73
-EBUILD appdirs-1.4.3.ebuild 1165 BLAKE2B 8ce45b789805dd760cb6f42c7381e37a4b09de259ed352a4e71384db7428b93ad8e39056b6591f6f006ec06fa03119fedceeff53b997c90b8435e06d6178fd74 SHA512 4ef2d171a5365c9f5458280aaa3a1b565c07c9dc9dcc309fe252b44e75499ee00d2f8e880b9735817fd2dd2f1236ad8db6385bb107c65e7d61dc09629aee66f5
+EBUILD appdirs-1.4.3.ebuild 1166 BLAKE2B 8b73239cae58cb86b371fdb5a201b6847a6f287943c2e9d9e24d8eb6c7ea479d8d5acf4427950cf5793ca69ca2b5fe5955d36961d5559ba468f8d47a04330b79 SHA512 7ee6d61812c3db1e934ee063817711f908c5811e4c84340c0597146afef28c6f8b9861545ae5aa3969b11624a2f6ecfdb88d0c84459b129f029968574c6f4f5e
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index a4f15bcfa832..3af7a9410b80 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 7af7a189a198..086b082c742e 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r1.ebuild 705 BLAKE2B 7268050d35be0ea9d22159354361dd95ddac6f3c8cb5e09a2f853a28ad8c7563c5055ecf783b6303eddd6a4ccfa9b9ea05aa3152883360d79bb8f3470bc7ebad SHA512 3a7af618fb4a8f5abfc38ef3f5be9b88609f04196b0eff621a405e814be81dbcc95e7f155b265a1991030a8d9c3df2193641cd1ecf873f61161074507b295604
-EBUILD argh-0.26.2-r2.ebuild 674 BLAKE2B 87b39f8a50d59ebf9a70b224fc914e08161e8e7d7b2d20db4fdecb1d381146db5af968143f19a0219a8bda9d49c891f7894a15d52af77e5d7b15c35bdeec2996 SHA512 829634e9490976ace30947a7f4e810c8c0ee22690aa90a576df35620ce9d05a3f79d690690d3ab6f47ee585e1cd853fed0b2928d7f4437c900a79777bd639a64
+EBUILD argh-0.26.2-r1.ebuild 623 BLAKE2B 938355f3b432161bf044531634d40f64f7a25cf2187de6451cfdaec098093fe56cced0f36f12c65e8a853f0a1eb7c0856cb35b74fd8bb960b94bb1d88e15df1a SHA512 ec2d6d0d60b12d91ffa95cae251f9dd0e8cc54fbda488a9f52e3f5ab0ab0178c1c7346118bdd8eacedd0cc9eeb079b6315a7a3d989c774b2fc5c1bb671815c17
+EBUILD argh-0.26.2-r2.ebuild 670 BLAKE2B e1a04d8c698c70600ce59c8aac1c294581981dbba0ea278deb5a6248b50e28e2bff2e5b1f33d5254a079fed0ea86e62ac0529d98a8e3635f8a7cd9bf2c7344d3 SHA512 5da1793c5eaf1486e0c01cf4eb933b7ed00c4462da8f26e1cd05f6f2e89f41f26bc71f87b7f4abb231be7e74d9fb05b1e0990da19cd520559e52ccab40afc247
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
index 92e57f4fcdd2..6d91520add13 100644
--- a/dev-python/argh/argh-0.26.2-r1.ebuild
+++ b/dev-python/argh/argh-0.26.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -22,7 +22,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/iocapture[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 		${RDEPEND}
 	)"
 
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 7152a12d75f4..3db3968fa089 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
index c93e7c49c6c0..35e43cf22c29 100644
--- a/dev-python/args/Manifest
+++ b/dev-python/args/Manifest
@@ -1,4 +1,4 @@
 DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
-EBUILD args-0.1.0-r1.ebuild 432 BLAKE2B 476f9764c38ced0ebbcd8e4d25745a2864201983c6d8038eeeb0704f3a8526a90f5c6f6d0329d2877b5ffb8888e6cba61007f4e3ded67bd019e81cd901cc7e97 SHA512 52eb722d80e80c29d983ec5a1f6101ae67062753b437b047e5b687e48f6b6ce46dab8b79693e38f5b2fea00fecd540a12953c3d59fccfdee5dd1cc5466d91d13
-EBUILD args-0.1.0.ebuild 431 BLAKE2B bc5441a9816b6ebe225c19714d3dae456069aed107b805eb4e16571d209a2a44f18c396bd1caa7fc23a8b071199a2736ee1dc8750b141dd956cedc0dcf58d43f SHA512 83bc707c8a2e1ae01a7db1cc4e2af0d668c7a02481bc83786316a94b76f8ea25881ea6e680692ef2d96f7cf4acac7911e38a83ff829d39c11ffcad699240387d
+EBUILD args-0.1.0-r1.ebuild 427 BLAKE2B 64f753022ba461414d7e9d058f09ac037ee7adf7e9cba40cf8e78a91c1ff22e255ddc0ecc47518eeb97b911f8e1dd311db6f27a8b0dc6177c0987e895c778e0c SHA512 b4c9ffee0bb36acf9971219c74c5d49a25d88f0ed834a6050e4b587929cde83a0e9613b2b467c3142942d97935b98ec7c23e69459fe44fe3e7af1c56ba68ea99
+EBUILD args-0.1.0.ebuild 427 BLAKE2B 356700709c78890369ed4a38d9d61d2107cd13825b71dde7c52cadc36ffd1c7564a5a515e193f696de54b3cf2da4a94479dbf0c62fb1367b418c8f17838dee9e SHA512 8494d59cc23922641ae5559bd499c2b07bcf7a18ddb1c2c04aea3c81f8a27256f31c649cfacba10a495dffe53642b11669cb680d6eb74013d3d6c123b558c2d9
 MISC metadata.xml 289 BLAKE2B 9c506f540fde2d50daea0c83d559dc27456e9de951493e87d2df4f9dccd50ea7b26046815c05587608667939108dc7a335792ca923b8ef731ff6511024a2e003 SHA512 ad6f17d093352ca14bbef50d96672c676a617d17fbb0813ac36b469b0c72e88858afa427f788877f40496a4300af6d6e893d80b6ad0eaf64759e1a19bfcd97fa
diff --git a/dev-python/args/args-0.1.0-r1.ebuild b/dev-python/args/args-0.1.0-r1.ebuild
index 9f8832f03768..318e56324a52 100644
--- a/dev-python/args/args-0.1.0-r1.ebuild
+++ b/dev-python/args/args-0.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/args/args-0.1.0.ebuild b/dev-python/args/args-0.1.0.ebuild
index 98631360549f..9fbe436f8b8d 100644
--- a/dev-python/args/args-0.1.0.ebuild
+++ b/dev-python/args/args-0.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index 48708ef3225b..68f7faccca7e 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,5 @@
 DIST Arpeggio-1.5.tar.gz 18856 BLAKE2B 5ceb26d034622c448ea29adc70f6934dc2de8335c526f02d91bc4bccaf435d462516830fa6b124638fdcb0b4aadc859d602e1ec59469077d796b7534fa28f7aa SHA512 533c59635556a3446c04c8b14f53e8ad6a7a39869f39d958bdd52b5a55ad43c533bc42a41999cc149015b34470d8ff0eca295ff1942c75b33a58a403a604c449
 DIST arpeggio-1.9.0.tar.gz 757412 BLAKE2B f89850a16b2ac1a87cbac3ae0f10d4c04af6097bfb9292abec24c8b938bdf3b837c4d292650b2e335ee5b4b03cd149e1722e35ceabf1b59fd4577ba7e62a8e44 SHA512 179ec76813476823f316471e1b313f377064a75879c52060e547fd755ae72947594dc4d6e58a798150620e82c8b123fbd88484881c12ccb311c47bc93a45a0cd
-EBUILD arpeggio-1.5.ebuild 708 BLAKE2B 6d39d038862746bad6cacf7e36024da27b9bf941de83087c03f7a08739388f4c96ba8d498bf9db323b5fc1b2ed5ba2a35c271bd893e0f7bcd7e7b3004e030842 SHA512 b83260e697f5c5c816ca672d963fac8f6086eec3203358cb2e541f3feec71bb3ee9965446a110ec6d942da1e5112d6ff660eecfdb1b0000bda5f821fbce01069
-EBUILD arpeggio-1.9.0.ebuild 768 BLAKE2B a4a076fed67afa2abf20b892b45854fde2b863215db69f36b4aaabfdfe225427471c91470e54382497420e1f32d70cb7212461f1888659df2f9d724ee39db723 SHA512 d970b96f863743b45cab654bd20384f367a606ba1d772f6a5ee5ac19bf6ac25c425ce8382d9658cb579a97b280df253839add0eedca04fff51b5bcf7a1ad018e
+EBUILD arpeggio-1.5.ebuild 698 BLAKE2B 126255d31a53d796f47bb79633d1ce0c9c8d1b37ec9b25db5fb8027834ff19786cad7f0c7ee6e671363142d0fc3d0778c2d8a73d250f1024c28f209c33b81646 SHA512 365aa902d93e55032aebc52d920a7a45db793b551534f277ff1d8fa24bad1de4fe9791bb0f9926ce302b34303bc4cc94d887ea01fa87a5a7a4bd2ac615800e39
+EBUILD arpeggio-1.9.0.ebuild 758 BLAKE2B 2a238210753bbbfb4dd7147b88d6ebd990d50e7e11ef63927cb225c7b821a1c1b7fa81d27f608e44936bfcb8b28f35b8624b76ffb4a87ee218ffdc3dfa674bd7 SHA512 34d1c2f8ec0f5bcebca406100109a14d01408303344e84cb74163189dc0fa831cffdc90034c9db5c1487de7d1e5f9c3adb65d2734067feb2cad6d37d133ffa11
 MISC metadata.xml 351 BLAKE2B dac9aebd47c197ac00e60de049d4bfc62b3fc4082e1566475ca0a9fba0435385dc475cb6c2e7eaa6e4b91ea0ccb097ebe55da23f5f3e00325c7c1fc74e66d278 SHA512 cad3a1cb94dacf951a07d5a98a35bd723b00ba6745f52f1ff2f5d20c5c63fa9c1e875617a0833f822a1177cba0805b07964eb6ca0abbfa74f93dcd42f601a935
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
index d979ae5cd264..b4b27ee59242 100644
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/arpeggio/arpeggio-1.9.0.ebuild b/dev-python/arpeggio/arpeggio-1.9.0.ebuild
index e9f42e7e31c5..aeb6ec5c259f 100644
--- a/dev-python/arpeggio/arpeggio-1.9.0.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 9764555daa10..28b25c47a456 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,7 @@
 DIST arrow-0.10.0.tar.gz 86506 BLAKE2B 3971e2aa4cefe70ce84267830800bd80bedb68caf3bd595614ac6bd77051bdff7c0e33ee09d569f4bcb9991255050b533464ade12c0d850a1d46dab3f65f03bd SHA512 a2baa23f1424b21506f3b664f0ef02d09f91b9cfaf6e0badfa544f42c750ed51136ae0e8910ac24207c0265a1b233f10a6f3cbafee3124b5f5c4fd965cfd01c0
 DIST arrow-0.12.1.tar.gz 65356 BLAKE2B 671f1094bc71b4ab03a967929cd81cff46e0b48d509ef82827e28403eee3a92a8380a4e4903599ae3f2e2813ebe3b47a46846e32d98f78eb5866c643999e3a79 SHA512 f18449d3629ff5630aa77f6068e7cd3e2ee32ba35e1d0d972b03fff1dd817d2d936a38cdde45b2b8f218df5c1ce3e316404e33103d8bc82af9bcc377e37afb09
 DIST arrow-0.13.1.tar.gz 148509 BLAKE2B 7a47f8886cc2f50f6dda682daab37c599aad15c7e4a0c76b1324f9fe3a1b8168e3a2b29352bdc9c4daf0fa3b3843fa919d5256997c673bcb24ca033312242b60 SHA512 4933e02fe4ef7a632d55e5c6d2cbcefe6840467c809e0377be92f02d0dc10b5b2421cea2be7ddd5158236ec80f44848125253bfeef5a2ae635a3b9c5761fa105
-EBUILD arrow-0.10.0.ebuild 720 BLAKE2B 7a662547be55ee22301b37e9d33d1129e73eb76cbddf567869a4ddd902bc8a3a05192c84490640f26492754153433945f35c9cb49bfaee41d52a61d79f921c72 SHA512 8e81bb95345eacad41cf1afd0f5437a676b2a9c6ecef7445d62c2b14e9bc683d36a1f334ef5d3868f41f7861a5f2a26012a5db19eea44ed134bff655dec38cb4
-EBUILD arrow-0.12.1.ebuild 730 BLAKE2B ad7ad4a060ca9c61a94243aef246681b983f57d59f0d6cbd5aaa2ef44a44f3947b15f1e0ebcc68e3bb28b7cde767c3f6a4f09b8fc346c7a79bc99a84f5b22d09 SHA512 2e0e2ecfa555defd1eef12fbd6267132d142a2e7671139989b3c8795704601606bbfb8c02fddde33adc3b24352600d81422dadcc61016cf94782e6886f38f193
-EBUILD arrow-0.13.1.ebuild 817 BLAKE2B 7cd6d76b4ca924073206c5e38554b682dac84fbdb8ba5e82a3575aecd853aca81057476115aeff46d0faba7649678bf9125c403d4816b3e47fde057180e02792 SHA512 418cf2fc8e0d79ea36e6515d3d4f088b61864a839c599a2c2bf0cd54d505c3b27c77db1b97b08ce58b27560339267863e66813334872b7c398dbb85bc8dc0f88
+EBUILD arrow-0.10.0.ebuild 710 BLAKE2B 87413d00f49442f8d9d7337792e11d8ef1f0cd0a348f4e570902578aa5e8a87daeb609a92e45c8d6cbcd450350ad71591e7873a1f784b2185230b3dd07583d9c SHA512 9dde9efad3431710d693e866fc0b491ad9dbce180faf4cb6ed10f15365bf63d3f03bd13bdf1ad870d24de6eb38244a3bf17d99d05294ecb1e82afd7c2fffecb9
+EBUILD arrow-0.12.1.ebuild 720 BLAKE2B bc7b2a7f4b923e81a152484975ec6d102239754a32d1d6bf3438c935932a046bbeb098b1bf7ea61504610a022363524cc7f28329990427ef4fcba074d9f5cd68 SHA512 3b37eed126b81d77b5bd6683354ec4f3a2836fdf263865b0c117df7c883db7adc09a60467d149eb9d457f92b3b5d02aa991c0e0ae4387c7c85d83fcd870cee64
+EBUILD arrow-0.13.1.ebuild 732 BLAKE2B f41fddc75737387efa31433f3d923a028a74a938b8e5ec5414b9d298df8f6326a31c4af9d3ea313bc6c885e23862fc929b4b3f290b2771210e495075eea3c87b SHA512 79bd09eee7f07b0893b444200cda484a63e4b65053a07b76f9de117d32ef8937ec24614f10d1c115fc4f74d2a6dad768072c9fbdbd641f4a997f7c071a629f39
 MISC metadata.xml 364 BLAKE2B c9cf1b8e27d0ae03d522628edffd052df05f37a857d671df00ec0f2868c598ba983b32b66a98c0f4ff814f8fb5fcad8482592852c38384c7eb99bb71f0ac8b32 SHA512 4288f06ad48ba051749472da3ff12ab53d50226c053764c9c175ac13a24b8817c731350ae153ef83ee02db04aa6ba7735cb30b8e35339badc0e46b6998773015
diff --git a/dev-python/arrow/arrow-0.10.0.ebuild b/dev-python/arrow/arrow-0.10.0.ebuild
index 141e3d0f796d..930e121246cf 100644
--- a/dev-python/arrow/arrow-0.10.0.ebuild
+++ b/dev-python/arrow/arrow-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Better dates and times for Python"
diff --git a/dev-python/arrow/arrow-0.12.1.ebuild b/dev-python/arrow/arrow-0.12.1.ebuild
index a3e878321157..1d5f525309a9 100644
--- a/dev-python/arrow/arrow-0.12.1.ebuild
+++ b/dev-python/arrow/arrow-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Better dates and times for Python"
diff --git a/dev-python/arrow/arrow-0.13.1.ebuild b/dev-python/arrow/arrow-0.13.1.ebuild
index ed980c88a606..32e2d4b9a904 100644
--- a/dev-python/arrow/arrow-0.13.1.ebuild
+++ b/dev-python/arrow/arrow-0.13.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -17,8 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/backports-functools-lru-cache[$(python_gen_usedep 'python2*')]"
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
 
 DEPEND="
 	test? (
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 25aed3790403..ac4aa2dd15fd 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 621 BLAKE2B db20b906a6aaa2b572ea5450ac6a1a6cec7b6aa8f1911acb6d039c2ca7bc16e249b4f7a50d3b60d955292da0a0edf9573140a186171a36f81f2236c78180c152 SHA512 83fd0e21fb4298d90713704f2654fce751f13a35032f957b85f4b4e69bdfe5a4454355ed51fb38aea2300dd970edc8d9a045fef50291b45335b59989ac3e0e9e
-EBUILD asn1crypto-0.24.0.ebuild 850 BLAKE2B c4bfec7fd2dc510c577f0308becb0ca04aa3477c1c2d4c434e471d583def7dfa904604d223a6ef8a444da8721412143d785c0b77901f07049bc68c5a4706baa3 SHA512 613a13875b0dc4bb0cfdfefd916b89ab5937eb47729b4f4535b6f470d9d8642228a8b344b4d369c7476a1e6a949e47a29cb0268440797c4dd396d162c6a4c654
+EBUILD asn1crypto-0.24.0.ebuild 851 BLAKE2B 23662870d590f297731a18370fac08e26c62c50e624d06b13c2ab82e6f886f5e63c2c77ad2a8c490e5ff0b4b9cba89b84b619f2252f4fb0b6d91653487978a69 SHA512 4e16d537105a67979d271b42f01df32f54864c5d6dd53c83758a77c126de399032391603905e9fe5d040aee4e7539f22e6db53a5c3966461015066482db5388d
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index b2587708d2ab..b273cb833cb8 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
index 1c80324f63bc..6b737aa54592 100644
--- a/dev-python/asset/Manifest
+++ b/dev-python/asset/Manifest
@@ -1,3 +1,3 @@
 DIST asset-0.6.11.tar.gz 28071 BLAKE2B b9222e0c51ccf4417afccde445c1ebb8583459977c8a39ad7650eb7c6cbf5b6252c239c714635b8b4d95ac16e53c2edf268871d733e71d6b89a403472da3fc62 SHA512 b9c002febd234d1342de92279a0e1fbaf30d53e9efa46e3ca2cfced43f4a9582bf731545185f868752a20d97c5ab0f7b5fbb453c1fdfe4e67d6bfcab222d0bc7
-EBUILD asset-0.6.11.ebuild 799 BLAKE2B 0eefcacc436b24f1de4bd3aafeaa5ee475f67d89882b573bb175c34207150cb03bac2755cb0057623b853ff545ca5197c9cd23adf0ea14ccbf1691d1e5265d1e SHA512 45ccad01cac84ef7a631c86c91e33efc917b67b2dd6d4a5e631d54423b748f47516ff543d77eb1d04f293ab40615f619205b544653d77107bb06ee8dc25b4cef
+EBUILD asset-0.6.11.ebuild 789 BLAKE2B c2215399d6400d1734b8e760b083cf64429e6a1acc8526fb46de843de2c69212d89a6549175542bea24b1533c935c5214a31569fd0af8e4d7d0b631872484996 SHA512 9a594f4cda6e64055016cfc637cdfaf234fa9434e5a8d350ee5378ee2e5d52c98fae5bd7f6e81660f5c7d0f30180ea56418bfe25c08e7a0ff838102edddaa9e1
 MISC metadata.xml 365 BLAKE2B b55ad33a8138a899c1285b3aab6566a09fc6a7b1f88af60f8b55a244aafb54c7ab56fc22c27af86fee940d2d5eea138946b62be7322d286eafdad3abbd861b88 SHA512 2a64c1ef39be430881823d5ccfd8a3b9b18a7b9fa59947eee0479d392fea9eda6c6402e40eac77c72296a1ff49c7b0962134fb60c357511a821096e6b3e78d70
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
index c886a2d1f62f..9143bf0f7aec 100644
--- a/dev-python/asset/asset-0.6.11.ebuild
+++ b/dev-python/asset/asset-0.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 1a4adc3fdd4e..e2b94d38de17 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -2,8 +2,8 @@ DIST astor-0.5.tar.gz 10999 BLAKE2B 278bf193003dd9f8f2d5c6a33229e3f4013bcf0618de
 DIST astor-0.6.tar.gz 28684 BLAKE2B 372314e0d92721d3cbb7fe0fe8bc42635e023ca590c4845c8e7c499bc947c3de0a3679fff51a07085d26bca37e83301ef9c0b66548b929a8f018760c8370319c SHA512 4f9598229f8a77901573fa1841716cc810ec8e108b155d8c7c50ab477d794f8ecd1784df66a1272a2739cc968d8eb6632f62b4d6ef067682db05233f127be409
 DIST astor-0.7.1.tar.gz 30633 BLAKE2B fbffcbe9cb372c82741788624674c4397c3534eb2b3f44577174279c38d0c45366b444dab1384a251a74ca87840ce150ab1ce3f0439987ba2a19adca270af74f SHA512 c52fa0b8ec5003c04d978c23361d423283a43be2c027d8d39ce1c45528dbbedb98b2a269ce97152bd9a4c942d95a6ec55720757b7811df4f34bb6744e2fff781
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.5.ebuild 691 BLAKE2B 72d173b0651f6d7f647f57ffbc05d0caaad4ce202e2051eaa658c7e6fcf15019269e382aecda5e7d5e6b45fea376bc36fac7b4e8d6d0352efefd503e21ab6099 SHA512 0aa2a53168e12d3634c1228cc9e596d63bcf1bfe33d7086608d02d4cebe8546ac172e970799a7e57b49f37374eaac8684e5b9dc837eb8ed0f93977eb895999e8
-EBUILD astor-0.6.ebuild 693 BLAKE2B a6bda7a8fa0ebb50e3e24b180fa85e5ef608e35505e51db8af22bfa24033186462859c61834dce98531dfd7d244b1cd5003c00897a62106da4c2724a3608d366 SHA512 00fdf42a678ca317bffada89ae00bfe04a9132a80f49c7adaa1a9b9debf44f7d598983d69eb708d4d231c8b23b89e927a340ce00b04fa0985e74621a522930d2
-EBUILD astor-0.7.1.ebuild 697 BLAKE2B 97b698447994084c3d33479f3bdf4e95bb628607c04274aa4cdbbcbabc53ea7834b79fda9d3dd47034f06c7345b8c7f2ff30034da9a6bee8ac9c535b659d5b3a SHA512 f3d18a9b3a61214d8b1c990d9363345c84193d8517c4a75368233ab1dc1a784a10dd121588b609b077e581c0cec815d4a7ffccbfa0dbab1cf3145ff62fbb9f05
-EBUILD astor-0.8.1.ebuild 597 BLAKE2B 2a71e35be5efdeeaf8b595534566eaeb1754b820fee4c3bfaa1fb4336b5f1aa7c344c889eaedbe5ef7d85c7f42e8fa2820d21acf5e23f2bafcab43a15d54af8b SHA512 77d8b55dc6825beb1bc7a28c3a50e9b8b5264fe6e684605fe0406c6ee31de0abd12a2e878e4e8b3d46d12bb1fbba3ff10843690af8f9108515607cd0ef5b7f17
+EBUILD astor-0.5.ebuild 685 BLAKE2B 0984e31b93f386af0dd200467e091f82cf62b0ad6e9ca93928cfb505f48ab71972f40f208f570d3a4feba80d41682a2d10099454b9a236793d18fe7ad6447376 SHA512 65e0e9b4a5bb5c1543331c54f0d0600ee9921d766019cd2af4536bef6e1ca674c72a041ab7d0b6d5f01bba19c5eff901438b2243744703895b48dc58e6b1ddd1
+EBUILD astor-0.6.ebuild 687 BLAKE2B f6207b2c75cf66dfd72e745ee254e270ea6c626ed72e1a231c14cc90539b4c8da76e1d92eba9581fe24a59d60af971c8c3bb0e0d61079bcb4a9efef2c6ceebfb SHA512 cb65257990500c4f8b254fbadae07e4866d1906200ee2c79bb85dfe04879c6143f07c34c98e628b8567f9a1342b265064f1844332e4f19149bdffcc06fd24a7e
+EBUILD astor-0.7.1.ebuild 693 BLAKE2B f46378dec87fed3c6acdaad4370bbe7df1d557e98f8d659ce2c8f3c2ec71cc9a77856fdf098179c54099c5cd7e7734c69c749cb1ffdd4c0b0d24a56726ec5322 SHA512 8e185dc74e40da2eb252acc2f72fa40bdf956b41ecab517e34c613b1f5f77a070b00a217d331f6a1c41d3c2315a43465861592ba159c405122656d8af47064af
+EBUILD astor-0.8.1.ebuild 593 BLAKE2B f6c7828c2afd47322e5d18fcacd01b22ac745cbd09c53884d3f3f95dcd941a8e9290ea71fc84cefb65d304c966e5f57c5f52ad36fa08e361013102d5839f04b4 SHA512 05859f52f59eaf301ac3b22d0fbbc24ad0160db02e05ef1f55aaa2c093b6f63a2f0f7e2c57d9933b2650f0766fb4ea711776072deebfb227f4344a0f6f297a71
 MISC metadata.xml 308 BLAKE2B 4eb385f663046756ae848b87d82301e3d2ddf388eae73431024dbf4758c5d4787f879ad167eda72ae011ab41cebc48718fc40a5ed86f3d382dea6165baf1a3cc SHA512 86cbc23c8c077f9849004214ba32c5096e64ea8092ff1940f3fb4c9bf4fd420f2883aed76a7b96774f639cb98ef14429a9e55993db07173443ee16b3ac393aab
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
index 5d9eb8b17cbe..64fb34534723 100644
--- a/dev-python/astor/astor-0.5.ebuild
+++ b/dev-python/astor/astor-0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.6.ebuild b/dev-python/astor/astor-0.6.ebuild
index e44eb34e0d21..ca7a534773c9 100644
--- a/dev-python/astor/astor-0.6.ebuild
+++ b/dev-python/astor/astor-0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.7.1.ebuild b/dev-python/astor/astor-0.7.1.ebuild
index 65e1aa654bfb..c1a2d0abeab2 100644
--- a/dev-python/astor/astor-0.7.1.ebuild
+++ b/dev-python/astor/astor-0.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 3a53d4ae0d26..ff8dbc0871be 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 90c905b01689..edd1b80b52d4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,8 +1,11 @@
 AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
+AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
 DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
 DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
-EBUILD astroid-1.4.8.ebuild 1079 BLAKE2B cf5d56bc203f7545fe0b2b7c149e7db2ab16923a68a5214389e7c27091007d3d4b3d5c83cff177bb029de0a2e148e908f489b0a9b7992b8f4a3ce29d42bc9b77 SHA512 2a48edfc1babf719c2db66fdacc0e7fa4d56bd6e3cd7eafe9a19c39c36a904ce68395fee61e9bce6c564ea6da44f7caa037eeee0b43a4c9c6487233ff0c5ccbf
+DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
+EBUILD astroid-1.4.8.ebuild 1080 BLAKE2B c1303883d70844547493b689ce6dac72f4234875b6cc22a628f328bf292c675e6d6e171fcb52be7b7ccba22148edc91e9285e02a5e95fd0eedc28007ccde3c04 SHA512 9aea729dcb9babbed9a912b4512940f863e27115b9ede4b63b4744279106450581c0b00eacaec1fb691d5d7ad7e8fe155b80e0bf6058fc6f4d138e5a9a83c12d
 EBUILD astroid-1.6.5.ebuild 2036 BLAKE2B cbb4a4aa0aa92014bd5206a51ebd845c2f7b9c7fb3c4a9358f50de4bff3cb730e64d16a67707f6820efc0834cc27bcf4944d5e9b33e22dcbbf25c5a2f9cfd84a SHA512 49c1b2832593d175a54819b026fcfdb481428a089c980deaf7048d53413263be682bf81da3a646e156a5f58ad2a478b1ef2d42b3d9119e582570237f19563e7f
 EBUILD astroid-2.2.5.ebuild 1312 BLAKE2B 56ff2f3fed59bba1f55c28e6ef15fedb9412e7f982762e502875afc7c1ed37ae87a911e2b58641f4fa3271b6cc8a9798c6125926beb4b577d15331b955bd7d76 SHA512 58d7fad12ee4e3ab48dfded72c5c8128ee934b6a49ce636fd75c7e0e3b6e8bc29bfc6664a0d334c9aeb167ea307c568a6e4d0b671b72dc75cab15adbee40cc8e
+EBUILD astroid-2.3.3.ebuild 1338 BLAKE2B 0f63a6c7a7e6e92215103e313da96cc539531d800afe85f179b8ca9aec01507fabc5a0608d158aad7b26d77b7a0535e3fa77ae6a047bf4c8fb0de16932538532 SHA512 3d9d9df54402be3d1be8b38dd2abb676c689ad32b5fbdec02258918548308b572e88f1d1effebb1ebe68fb9a8a06f5e6a68865b22ee09920a966dc5d25143f0e
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
index c8ab6cc0393d..beeff5e00711 100644
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ b/dev-python/astroid/astroid-1.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
 IUSE="test"
 
 # still broken
diff --git a/dev-python/astroid/astroid-2.3.3.ebuild b/dev-python/astroid/astroid-2.3.3.ebuild
new file mode 100644
index 000000000000..bf9cf97da4d2
--- /dev/null
+++ b/dev-python/astroid/astroid-2.3.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.3.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.3-no-pytest-runner.patch"
+)
+
+python_prepare_all() {
+	# Disable failing tests
+
+	# no idea why this test fails
+	sed -i -e "s/test_knownValues_get_builtin_module_part/_&/" \
+		astroid/tests/unittest_modutils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m pytest -v --pyarg astroid/tests \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch b/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch
new file mode 100644
index 000000000000..5dd24f2e2c43
--- /dev/null
+++ b/dev-python/astroid/files/astroid-2.3.3-no-pytest-runner.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 439ceafa..2ad55d6b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,6 @@ def install():
+         install_requires=install_requires,
+         extras_require=extras_require,
+         packages=find_packages(exclude=["astroid.tests"]) + ["astroid.brain"],
+-        setup_requires=["pytest-runner"],
+         test_suite="test",
+         tests_require=["pytest"],
+     )
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index f42bd3944fec..96d03155ddae 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -2,7 +2,7 @@ DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f48888
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 DIST atomicwrites-1.3.0.tar.gz 11699 BLAKE2B 7f1d61547f753a69f28f86dc4f7ea66010c12c68fa9babc7913848b011e956b6cfb30b595cc3d06bd6a3555ecea0b5d1eca703a0fec3f1dc0631fea2a12c7565 SHA512 9b619b622f4509c2a41ad340f91bd6e74f238cf9a35f4662fa70f1f957a78069cb89f9bf16f8da70a597bc43a0c6c4fdea6afd0d157364a53a2fa5d8f4272a61
 EBUILD atomicwrites-1.1.5-r2.ebuild 596 BLAKE2B 8b7bab51cc6539972e7ec656c5b561a0401c73527f8911d502aa2dbc0f33eebc7e5ead6b64c5181a07e294b48b8b87e1de08109ae3eb045cb1b7fdf5a421442c SHA512 653687e15e702080f886c85794c42a04b3d5c63a42101b9417b4539fd9763bda3b056efb7409a42ae8c1cd3bfffe9069dcb1fb732cd1e65a9b766840b10e375a
-EBUILD atomicwrites-1.1.5-r3.ebuild 973 BLAKE2B 2508c7624e6fa977918ca10f51afda7e6220d64728d36247dc5194c7bb02d29897efaea4f770ee8000118bd754f30bcc90f7570fce909c86edb49d3defeeddbf SHA512 8248ea93adc5336a62712d84d545dc5972a8c546a1065f6d7aa4dcb2ef8e93f746454639c2cd9dc1989eea7381b898fdbba57dea5f2621cfda326fe14f03931a
+EBUILD atomicwrites-1.1.5-r3.ebuild 974 BLAKE2B b595f4de46e65d4113ef0aa64b17cbc87dfd59d183324411f6a4c827c05bc0467b817e7d510134959c8800fbf986403ee211b9d5550f613e86ef7995fb103411 SHA512 fc5f60656bd4b0663eb214f713561bdb7469be8890b032b3108df6cdc5eb706282c1283b5ec1bfbf666cd17b339bc0c10c8c800fc973eb77404333c390ced9ad
 EBUILD atomicwrites-1.2.1.ebuild 615 BLAKE2B 232610bacd9cda39f525289cf75e1ee2c458c8a353a0b1862f2b58af83b25c5d28a74a2bfab5c648c3f662e173fa3303de708b7fe81fadf0e2222939f91bc4c7 SHA512 db6b9011eb1b52bd96f5a6bcedf46cf1d86fe83a3a3308878a94c50add82a36d5230a988d3b8dc7c3a075bef26b65e556b835e394786647820d6ab704721166d
 EBUILD atomicwrites-1.3.0.ebuild 615 BLAKE2B 5ce9ffa2efa4fe9ace7094d48d1a730815bf324fbcc1a1c4a7295882aa2776b63083fed734416d76e2c00afcfcbec525d97a7492d34afe4ffcddcf16205eec5a SHA512 e0fe9f5505209a15a321da1b81e7161abe546e34ebaad52067552c92d18f5a27ebfcc4940221271c30fc8d7b5a7d22ee82b8a5d918950bba57c6e1bf602b89ea
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index 28e04739a26d..808b7f04150c 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 18e83dba8add..d60d7e7a1b58 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,7 +1,7 @@
 DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
 DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-18.2.0.ebuild 940 BLAKE2B bad33348beb8ab34df73ac9bae7acd9d8270f1a71b00055fe43c91eb24409f96251afa1d830075c340d2d35ff317dcd89d37a7c46dcdf105a0be4a002e6bdf3d SHA512 c904d51c449b4168be52a40939d2bd85475840e8e824666044ede71c83efbe7167cf7dfa9b87be67cbd96c6ef83b4beb41663285594ad15c8bf97a88a8e20501
+EBUILD attrs-18.2.0.ebuild 941 BLAKE2B a820c2260b7f438f6f3d6936350510e42aa6d325695885ed8312e07e8a5e4ecd9699908976160251b08a163ec0cb06d13bc9334d728aceb6f481362f902c64f6 SHA512 95a5c8c92722f470a0a50570849d49c9caa99180bd25873f571b8b8f647bba1de82be9423221becd6fd56844c42f9c93124b8d1ccaa1fa95f417bf4e30c77509
 EBUILD attrs-19.1.0.ebuild 951 BLAKE2B c0d012689b6c0195d004b5a791a92f66a07aada3849901bc2b75613b85d2721379c24ab96da8aae0e0bbb8180244266f66450eca897197bf9590fd4b9064a41f SHA512 5e3984dfaa07a419fed2101cc410c73fbff34c0a3a84fb405b7bc2c1b93bc960d53e0559d2796582db367c328415af94ac8dec80cffcc8bad2a4ec44dbcc755e
 EBUILD attrs-19.3.0.ebuild 863 BLAKE2B dd880c98ed7f48fa71e346a39d4a0e3e2936f752e2443a5fed5a142e4044cd7bc743f30e98dd0ed50a617e64394b6a5682c45d3458392a44b7ce0a889144aedb SHA512 1f67ecad39e537ebe2fafb53971b5312dcbd081b754a2961f4e3b274474d6cf5bd95fced45014daa0fefc56374da3ff0f24bac6ab50605e5f3544e84c4ca155c
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
index b69e3772bc94..f2b0d108dfd4 100644
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 6ecd1d3bb1af..d5f3353f710f 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -4,9 +4,9 @@ DIST autobahn-17.5.1.tar.gz 205144 BLAKE2B a026381330d062059f23bd0fe20de12bf227f
 DIST autobahn-17.9.1.tar.gz 209230 BLAKE2B 4e637ee22fe84c51b294faa853034b65e5bc7b230d1d80eea022a2e3809a7ff0c9ffee7c13886f154efffdcdedf5c790e5891466107670c3221a5c7b5de846ea SHA512 036508c1170f53b01be360083bbf9f569fbaf216d984b34e10ad18e5f5e156e74bd4c8979bdd977a8e23deff0332e16d3d606716d32f3987ff37c7707eac0f86
 DIST autobahn-17.9.2.tar.gz 209442 BLAKE2B 66d31a575d980d81ecd50d9511ed49b947a568ce5457db2de7fd67a85ae06016bacff10f65b74f43c2b72b21543ddb8c0d527f6b9ece706c67adb96860435232 SHA512 de73a4cc99616802d280887ef8a9971c532f974dd43cda933da953d7bcc45da3fd9d0c91763c6a80371f582f0acc9741134b1ba1b98035ef0f63e4971aaff79f
 DIST autobahn-18.3.1.tar.gz 213042 BLAKE2B 2f5eb92212f57d2301dbac1108a81cbbd339da4cb5527e3eb55f1ae7dcb951fed3cb7c643e76beaa0a83d623fe96f9eebcf7945e10efb0773e102d0234ebc479 SHA512 3d122cfb54eff0697cf60cd155a07699c6f6b39e573616c247ea79e65e6fa0a86d505ea8bc4f4755dbf266fb8bc7fadabb4338aeb1b9e6a2f0503e1b4d25e2e6
-EBUILD autobahn-17.10.1.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
-EBUILD autobahn-17.5.1-r2.ebuild 1921 BLAKE2B ac2b1c039c31192f70dc305d45d88dc139fee02eca4d234d286af203823590065ddefa63990fdd8737c7ae636da9eddb27320b4ebd11fb0088634f6a8f0f51d3 SHA512 071f7f70cb4e059997ec9223fead0df46197e56d4d9211c1b43aebf41c3c0eede429eeecac417f1a45667a81f97a53c70f59b7a10d276d5d88350971efa82b71
-EBUILD autobahn-17.9.1.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
-EBUILD autobahn-17.9.2.ebuild 1928 BLAKE2B 577b79249f1c095f2e9cf44893be2d3aff18067da7678306c71057f5870c6b15e25195373ab4fb51b4768044cd44e51b21abd4cd662a2606bc2f432fac5a3e10 SHA512 09cd54a28a135b78499231aae4e35315e4168f22dcacef91010462c900651b875670ea32357a0100f74fbf96fdc21bcb91fc0df1b2aae478aa37a6ddb54a7f24
-EBUILD autobahn-18.3.1.ebuild 2220 BLAKE2B b16233a7c54ac493c0b330f31578191bb74967d363fad5f41f822bbda26ffdca622061a3a0a26a206085428ec3e713b428f587f935b7961e8674a796891d664f SHA512 7838b2edaa5eef807b76b9b52d1454bdb283c596e2eaa1ad90d5872f91f22f70d947a1619fbe3f38afa4da1963a604e85c2e0d17caebaf6e662f61c5158787b3
+EBUILD autobahn-17.10.1.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
+EBUILD autobahn-17.5.1-r2.ebuild 1911 BLAKE2B 3984a0886d742b62b57dd3bb20d541c990c62763e9f17b4b25ba378b849d8e4b743bcb265919d2a90234ed150b945800006fc37cde30c17729c957d167284bc0 SHA512 775dfbcf09e5d2544c506bce88d2c5fa75990a491d891768594770037b6e91fddbb37e78a6f7b130f3fb25c584753fb3b13f17e5e328cff9a4646fadea33970b
+EBUILD autobahn-17.9.1.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
+EBUILD autobahn-17.9.2.ebuild 1918 BLAKE2B f4c890b2ddcfd493698d788ec1367a9990359fddd175fc2b749472e2fd6e1570c2f24d742660898d4e4e02d84701951d4aa6616163d0b4e67fa4a9db597f1fed SHA512 c98d52f95826234a39029865df0b92d3f71afa683b8bb5112b2a2f694da989d6084b6c08841fa97dad5bde3902cc6f52778200d860c7d4d148923e3134243a3e
+EBUILD autobahn-18.3.1.ebuild 2210 BLAKE2B 47becf0143ea34475be0f085398102139abb2d82faa24e02d44ec4e1647a772e9e40e8991ea5d241589092a93f5e6f13b146ad967d58b4a0d00b7a44bd64d274 SHA512 b262f539738a996ae626d39d79f1e2dc61c18564776f4616a1f458cd1df89e0e8821c43166a6927c1fab303063cac820ad811bcd137e9d3e422a367b56683447
 MISC metadata.xml 321 BLAKE2B 2a222ee5e7e6a2a90a44b834a4b7d430938813786c7179fe3fe273456b501feba4c20da2fe3b9671092085a991fd35c736a5b64c179a08f54fddd029ac5bd731 SHA512 fd00829f66750d3d54b7bfb472179639fbe453840e7c3056b406af546acb952d3fb8d4552973a68ff0966f25bead8dfd4501888cbd68721e54207b5a7628ac36
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
index d806cf15eee9..ae72e1f6178a 100644
--- a/dev-python/autobahn/autobahn-17.10.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
index 7a621b460ede..b91b886d58f2 100644
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
index d806cf15eee9..ae72e1f6178a 100644
--- a/dev-python/autobahn/autobahn-17.9.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
index d806cf15eee9..ae72e1f6178a 100644
--- a/dev-python/autobahn/autobahn-17.9.2.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index d52ee164e216..2da651aae142 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 versionator
 
diff --git a/dev-python/automaton/Manifest b/dev-python/automaton/Manifest
index 873fc0bfcddc..e96b4c332fb0 100644
--- a/dev-python/automaton/Manifest
+++ b/dev-python/automaton/Manifest
@@ -1,3 +1,3 @@
 DIST automaton-1.12.1.tar.gz 30350 BLAKE2B 2557cfe4be401080615a7e640d54184ac8213654711f75b12512c5fc689d96bfcb486770fe6bb1999a7af54f9c2e115a5a5bc2a45a25ab6e89d0030d4087d45f SHA512 c0b78d934f1c0768e1131db0640649254489afb8710098f68f61293746c80a2807edf82659d8fc9bd3812107dbb823e95055842c81477325f9ada65967ebf4e6
-EBUILD automaton-1.12.1.ebuild 768 BLAKE2B 4cf4187ba4b801aafdcfaa94980b4ca36985864ac336f1ededbc5baeb32336724c1293d1ab7d2dc8503941240432da738179c6655bf8d1c06122894063a6d0ca SHA512 995c7d6fabc89a78cea6f94469187209ac62e0a9c8046cdfe31c7bf4c9e7cf7f20c5b76569ee60e18422806fe4a70bda172d0d59b3a6eadc1907362d95d2f7a5
+EBUILD automaton-1.12.1.ebuild 758 BLAKE2B 72aa5f2ed1e183fcfd2aa8e411ffb615709f2a4ecae1a352874275f4fc7db425099ef383ff0d094b8d31dce11ceefdfae5b6f559f1b74cef783ebf1624d496bf SHA512 f95da9ac3e18a2988120daa381e42120d188ff408962e38d40c08fc502d68653dc39ca5721db283b20efddae1292706af9ed000b4e9b0fc8b60b40cc287db9fa
 MISC metadata.xml 326 BLAKE2B 3a95411503927150283986660bc36f2ac54e96937de019fde1215d237f8629d271a9581b1d27ec229aa2ea2b7f2b2e7bf48d46915def83c10c2386b9160ca761 SHA512 d11557577fad543f40098af61ee4d40223e14a68de91dcfc92e595fba7c149c0c621081655e8c14e79d6cf9d0b6a17596096a74c8ac90f0f2c89e96d563797d6
diff --git a/dev-python/automaton/automaton-1.12.1.ebuild b/dev-python/automaton/automaton-1.12.1.ebuild
index 1391ca0acf28..081f2a1641e8 100644
--- a/dev-python/automaton/automaton-1.12.1.ebuild
+++ b/dev-python/automaton/automaton-1.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 74632969d9ec..e0f55bd07eb0 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,3 @@
 DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
-EBUILD aws-sam-translator-1.11.0.ebuild 875 BLAKE2B 1da5a2c72c41a5d2bd5ad6c190689b91d2bbfbfb7ed207279b72248c252e71076cf0ee3445ca0b2e8be2002ce9f060150235cc0c9ca73c5db449786724c7f528 SHA512 30a08cd927edb7404195e045c099f0e34b83286b6c85103e88aed54157f87a69e1a757841dfba1e6c260eeac6094f7d79dd7a74b419bb8236be56ecc8f7cad2f
+EBUILD aws-sam-translator-1.11.0.ebuild 865 BLAKE2B 3e98eecdf18a5d22871e930a551df85c52e4e166d831cc5826ff4833fddeea8d086df2cca9d5ec71eba8b2e0f0dc4250383a3b8dabe2e47efc161b48fd5c5737 SHA512 32f65bc223344b5b9ba1d2a0d600257393e7ebaea5eb32959a887419afff3c86ef15af02e5222a7f992d7adcbc2180b2ddea98c35570a4cef6970ec51dd78956
 MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
index f560c5647804..650130d2f715 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 36feb0a5eb30..c139d92f86b6 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,3 @@
 DIST aws-xray-sdk-2.4.2.tar.gz 66737 BLAKE2B 5f062299ad28ee12d4f90bbdcb03d691fb9a5888054eae4759b9a0e916f720e71a9b9e01fd4d11106499395c5c1aa1ec90ec4874301a34657cd04b00cb5450e3 SHA512 3d12e96a54a2fc65bd6b6772b1e9cc72c09620d9a8b900780afb6c4051b88f0ada1e2da2e31bf93c37a881514e2ae79692a287a63b44845e0e2b8cb33109f81f
-EBUILD aws-xray-sdk-python-2.4.2.ebuild 877 BLAKE2B e3c1491df0e96b70c888a4358003679be39966cd93d16e422a9705619be2fb974a83ec4248c0ee92ab3aa0a7461f1bc5877dea0d9ee544c4e843c37ea7b46490 SHA512 2c6c7913a1d84b4806303f49d98fb2da71b909fb591cb013b720dde8af6af756f667f2f6f8d04587315a64c34c57a2ebb4e0a14c12565a030df965ad04994770
+EBUILD aws-xray-sdk-python-2.4.2.ebuild 867 BLAKE2B 67ea94b326375086feee77188ef6865a3cd6687e4d4f0614dca4b1fca1383e5736d0fb024870904244df31026fff318b3321afbaf8cad033cdd62bb389e68f1d SHA512 c416bd2fa9e803d856a8b916b67f81a9e87a49fa4340fbaf5e12649a628fe37976f29492897187fed93a55be7963e89e9e29b013077b7495e5e8a8cbce51d1bd
 MISC metadata.xml 453 BLAKE2B 78db6d0eab2360b69ec4b17c073e47d10693c8b63b5f0c9f28aa8905453085c9595bed462a7d010480ff37b8b11083e2ce93e24da7cd59413592a5b4fe63cd8c SHA512 5206f2494c0eb5ab56f9673e837b2878aec4f512f6ef6dd8b70ca66a0e5c9c18b5626d9a90541adb158f0d08e0644ed2fb02fa3b80283a0883713eb45fa21e2d
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
index 2cb5c11a6df5..ee1cd0d97f8a 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index f3b8c553c2e4..6d8dca5598c3 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,4 +1,4 @@
 DIST babelfish-0.5.5.tar.gz 90398 BLAKE2B 3266a92ba5c68d7b801fa9cd13417d04b4a4526ba9fbee34116e356e42857bc36a68b085626a084047d7f9dc512d71d45cebfd06af65ed35bd2478b6957d00d9 SHA512 71504dd0203ad85a6a69107d67df3bd5ae4193515e74c05b346a8bd0aab425fc1534d54d1c74b14e48580ee5e76f04705e35c2d359fbe46254bee37e41cb4bfa
-EBUILD babelfish-0.5.5-r1.ebuild 529 BLAKE2B 1bc2b03ead9c42fc7e98ba4b493e0143867bbc50f5a73debf816b5cbc9998d57cc626649af443f1a17267e2dc2a6bfee2a5480b72c9ac2df1538e178efeb0363 SHA512 956cf42f29241a7cb9abc262182fa8131e196cdd7b96b843c81ac6e80c59391bfdea5a1405952af511cdea44d2824dd8ffdff412f3bc08086cd8ad31ac682560
-EBUILD babelfish-9999.ebuild 527 BLAKE2B 79bca05a0f3e71dfd02701fb8f2464b913b717ae45a1099a66ab18737ce8d80d04a54e002d554b7c85fedc5a3445543eddeae1b421a4ce84f0f32411618a95e7 SHA512 95c98dee1ea3d92f18387f19d1ce391017a870fb56bb48ce6f2b1fe4e820d4826d19e11d05513863a244caf279e17cf3cd1fdd09559cdcfcbd73166a8accd579
+EBUILD babelfish-0.5.5-r1.ebuild 523 BLAKE2B bfbac746b9e53f13c981b6c4d29faf2eb9768fe9ee6ce9cc7f70fe642da03dab1915ec6d0e7953bb8ca6f319dcb63d0a3667e6e4eab7352c2af86e3e212a1982 SHA512 e5b9192db5249f49c42977e3ba3abf5aafd967061aaff1e2c16a33818dc1fbbbcfefd8cf5d1dc9687d6b4b90f2f521dc14f61f019739b64feac024944d06998d
+EBUILD babelfish-9999.ebuild 521 BLAKE2B 331b3daca4d202f1aa39347f55861455ba9039f013c2847cdf7a8ef3206f85c601916910a776e8907d28247e49d24994dbb020a56ba6bd1feba843d523881b91 SHA512 2568a358b19b9b2b91fd2bd04f0e275dbe1bfe43b78f6d2d55bec9aef5e2095c74a220794a3bfb1cdedcfce2510a63003ce1452556dab9cce5afea78db6dfce6
 MISC metadata.xml 295 BLAKE2B 8753e4e51cd05d5389050cea0d9c1c105c22f795affe060fbcd4b8746e8ea4bb0c424e6c431678e820b358c599f4cf32e5d716da9b37ece8c9897a73ab4b44e6 SHA512 837f0811f7168be64415b914c7d36900ef1965bf133d635e5e61f1fdecb7bb6fa462fafc7a794ab1264d7603d748fa0d65c8a176dc1b89962561a562b7b4eaf8
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index 707e8a553891..b7ed30df2c23 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index 90c7394ac00d..dcc8f1dacc4e 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
index 568430ad088f..0cbeca86581f 100644
--- a/dev-python/backports-abc/Manifest
+++ b/dev-python/backports-abc/Manifest
@@ -1,3 +1,3 @@
 DIST backports_abc-0.5.tar.gz 9807 BLAKE2B 1ff59c61ed95f535d89afa1a6f6c4356bfc76de88e59618f950a536e9d44ce4093cd91ea61a4574c0d2e40c638f90961db8c6e1659996821f4b8532bfdf60972 SHA512 5c2bc01bce8d3ed482bf5d8361a20f9afa3edc1c50280f0a01ffb890690b92296fcbfa68f79677fc3ebba851617f339cb6367ccdd0fadf1127a4e3c030784b7d
-EBUILD backports-abc-0.5.ebuild 686 BLAKE2B 497952b0ee95edbb60f034584f1b1484b8c44da43367ef682fe19fe32c76de960ab45113e69e3413c373a0529ff3eaa217e32c3e526ff3af8685e841cfba985a SHA512 6f81970bbdd358539215028a33b0434b9d4039e340fa3d2f31dc782f255eb56d4a68f3af08dbab4bbfe68e0d4bc7f9d35c466c51e8699a39f4ced80d6a8e736a
+EBUILD backports-abc-0.5.ebuild 687 BLAKE2B 608df8c2652b1e456076b5b6fbcc35bb66c1633ea009e7572f0ac27f34c655445a322665934905764c0702eced3c095535c542e3062feebb27a3e4f7fb33ad6b SHA512 3ea091d2e805321417d9462db2c94a6314d4e30017bf5c104852f8bd223c2e9cdde4424f54a5a02d2796cd7925f9640bf81d20d9d98c40de93dda0dccd1706c3
 MISC metadata.xml 458 BLAKE2B 9b218899826e360d19ef39e1efabb2141e6a11a18a4a7887202796680c642525a69f0d925c82323debd4971fe729c5be7e45ccc44b121bf18c5c22db132e7eef SHA512 c9a1b4563f13e731a6b89b0d67a64a30918ff4d8248e36cad0e11e7f040aa268326e98cbd50d507583ecdc5b288473b5c7a5c0be14387ae5294ad607330ed42a
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index aa069b864c53..8412f1c25ce5 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 67c40aade240..ed882eb52175 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -2,7 +2,7 @@ DIST backports.functools_lru_cache-1.3.tar.gz 6685 BLAKE2B 7007b08fc536ba2a31d21
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 BLAKE2B a0ef9f56abcfde51b9d7f03cb9170c3d500652e43c9498fb7dc4c404276ceea15dcd6ffb2fc7efd723cb12790f99e6fe249136ae0d4c949f06ea06cc41318793 SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21
 DIST backports.functools_lru_cache-1.5.tar.gz 7891 BLAKE2B 5de046672e25f95e8b224d79deb4ce7eb40aef72ea80e0788ef54076fc98ea3a993daf5a607a6670925707f357b4be14affc626b45bae100c6feba9a41e4c606 SHA512 083a69beb050a6de0f838231ceae05cd1825f42310b2cd4f0e53f7ca043af4c699ad7042c32831ee365bb6b374d33189136e45689c77815b99773d145f0ef4f1
 DIST backports.functools_lru_cache-1.6.1.tar.gz 12426 BLAKE2B 361cc71e0a18e6d578ac007d4990c2f7ae86a5753c25da378a7a3cfbece63b088278fc998adfea3eccaa51146659d658cdd7ce4e4e19d6d2fd7639f8df0a7262 SHA512 5764cc6ed83dc4abc2a7e5f8b5bb30c7b7554aafcbb6dfcececdb3646fe9298a8c1791a02112238ec94a0e383855bdec43bf9094f40b57124d0a0c9aa7c67f88
-EBUILD backports-functools-lru-cache-1.3.ebuild 1110 BLAKE2B b42fbb4b504bc751b884612c903a6d16ccc6b10e425ccad11434c6fa962bf2bb5da34fc0b97bfbdf4bc0da07211bfd7f7215dedaf3c6425105e44875d698a6b3 SHA512 66b120f44c6d77aa3703b094ccb7f247633667ca056480489e60ceb528965e9c14a9437afd75cab35be225504acb4c370eaee8bccbfae9d2ae4bc470204efade
+EBUILD backports-functools-lru-cache-1.3.ebuild 1111 BLAKE2B 59f1927ced5cb7fbcb676de2f32b81d829d718575e6e52ffde0494fac77dbee52a8b9083532458ccc40861c20331fb9f83fae053a04ece6ad230b87180c47fd4 SHA512 e2c0cf250ed2895c2f6e5cc305d9a6277cb2556c2414ceb94636f9ad1b1f72b79b9718d1d9ef6e25e2a4aa1809a6bd6d12ae4ef8bbdb31292e7a5f0c62eeb31c
 EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1347 BLAKE2B 34c97d790ffdd6c9723b56b41a6785690f8e153d032108b6a46f8c01fc823313ebcc4a2036cf2e87831ff588ff1e21c1e753fcd073e26fb32820aad499732976 SHA512 773bea39bea66ec68c3f797c9d0fe99bf1b07858972eb1ccf237fa0e7b45c9057a990b233463edeeefb60ff3bda418ed20fee75919f280216fca7a3f3ef71755
 EBUILD backports-functools-lru-cache-1.5.ebuild 1356 BLAKE2B 8d7307dacd49c1bfa49fbeabd669e433b4425d65ed921db89d397bd2145c79b5f5df50a133884deb4eeb30d772d9b116fcdda25d5a1e667bb1c77b7514c505ad SHA512 76350b0feff12eed06c9962ece17f25f13fb8693be47be18b77e523ee6dccf1e17a7fdcf793f7ebc2bb51e2d66b997dafe60853be457cf0fb579db7411a0cd45
 EBUILD backports-functools-lru-cache-1.6.1.ebuild 1467 BLAKE2B 73c593115168efe301a6b229ef78e157e3001279f1d2d5c5997b611230e7e82c847586033d9fb4e93a99863f3ca9316effa56f1939d1f2fa83e4042f6c08fa35 SHA512 36adfdf7d65caeb19651171d84d4f20b3c953a6664d1c8d137437ef8ee2854ddcee3c3a322426ce49a828c6e7163d2519b11a7cc7082f85635a6b5b014a0eba1
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
index 00a968c3e41d..09d03c3fb7ab 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 5420bd22c502..7410c4b8f821 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.12.tar.gz 37640 BLAKE2B d157e71fccd7367bfa9d0a856cc9bcde7c33685816c08e380ddf596a4a84cd9cbc4cf1c3d866057a507adae053678d150c054c6b078c4aabbd3385e5821c275a SHA512 c855a1b4b17df5714060e18bf0b3de4db24e1ca1f97550fa44749bf50eb2309dbad56feb092246db8ccb23d61d84fb3deb2553670ec035b5d11982c33bda47f9
 DIST backports.lzma-0.0.13.tar.gz 42552 BLAKE2B 85cff01ee9b5481a056fe6fa993a44ec3799eed3ef8e12f98f7b94d8af85c196c3244df4555b957fbdb566416c1bfaa4e8654e16115c9bea986a72bb9d834b3f SHA512 e022de691bc1eef917286da40e2c0ee477300a0af20fba9e972bffd3d0ca1155d5d2607e7601e28d70d1e721b93c785f81adb1c7c73172659ab7615708e55aa2
-EBUILD backports-lzma-0.0.10.ebuild 1069 BLAKE2B c7b626acdaca209f69fcf751b1790d0997e6efd4f676176cf9ea9806e01dafadd8f0aea5b6dc2ab9e5935acfd8c43150dc9adf3682b0b63c48c61c73f934a604 SHA512 3970cec3f0040dddd4b5b92bbfca623a71397e5012f50f5751b7a15f27fbddeee09ac90665f4a1453e2aab4a9aa6596c787a90ec07ddb5d0d413fde24976f7e7
+EBUILD backports-lzma-0.0.10.ebuild 1070 BLAKE2B 9b6fc5fd6e8f5f4aefc997e59c539b3cf0a575edbcea9707411454c726ab392d9e17f19264f99afa014dd7b04be62f1b0429e056b094a3f7fa577d8393f6597f SHA512 b8d9b86486df92bc0ce34cb603ee40cfb6b359c5ee9d10485a48706e0866bd603b416ae1c4f356385c7d35ac1796fa05f10e8262e4c11546322ef980052e50d9
 EBUILD backports-lzma-0.0.12.ebuild 1082 BLAKE2B 51c1a4af76efd514cb0f52c718e6cfb5484a509801c653fd0d1321df1e909aa78a0505797867cd1288e6830e90e1d19573bdc4b3deb6b63451664c0c61b2a4c8 SHA512 f5309be6ee9884588f2f7582959dae7204dbd00db1ff3c980a41aaa27393bf80171a64eba282a71b7efe6e0452793ca37a01c3aa98d4d8cb789bd7108a5f5c15
 EBUILD backports-lzma-0.0.13.ebuild 1082 BLAKE2B 906cee7ab56cb260e7fb54496066a69b092c7a7ffa89bb6a54f36dffdedb2ba757fbd9fd11a25c5e216b5049b4f5b7b9cc0fc35436299d652f41d86f9976b728 SHA512 d4839cb6a649e3c616474655e8e0fe3c20159ac0ac7e577b911a86a5983a826bfba8b70e04f15e7facfaa0a0758c3986ae648e0e6bea703e216195ddadb2e03c
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index fe43f3ab0255..ffaba3273358 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${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-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index ef93a3e7abfd..8f4818ff7b46 100644
--- a/dev-python/backports-os/Manifest
+++ b/dev-python/backports-os/Manifest
@@ -1,3 +1,3 @@
 DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 1015 BLAKE2B 974d93dee4ff581279dd6aa1f0f193ff80b29961cbe08fc0b3f8a3a927ce3cde62329bb05c93265f6cbca0020c12247e1756ed07d957ce2590442f80dacdb889 SHA512 e26714a354129ec324183774f28a5d6fcf75237c180e2392c55d4b1734457bb69fe56adfcee78949c7f014b3d6b1b768ec7e7ad94a7fe446df099c791db3da0f
+EBUILD backports-os-0.1.1.ebuild 1016 BLAKE2B 731e12dea055a11175fefce1416e55fc3bd017ef1286431540578774a011f49ac33f4bb06212aec996343ec6ef5c5a87cf34c3b27ec7de6cd97a419cc58abe02 SHA512 6d21929e8a645c797266a80a37e5b67939aa608143a62c8332b9112f2651116dd3052a27b90c42f72f415ba8a43fc4bdccd5d8712c12878d09db82952ad708d2
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index a6efc5a07caf..e9b03aaba172 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pjdelport/backports.os/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
index f988833467a6..bd69925775cd 100644
--- a/dev-python/backports-ssl-match-hostname/Manifest
+++ b/dev-python/backports-ssl-match-hostname/Manifest
@@ -1,3 +1,3 @@
 DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 BLAKE2B b9c346cc7414fbda97c2b1646ec406942ab5527b6537338a9fe0ed60d62d8515cd03fdeb68cfed10862c23f1d6e37ffc13bd479e55f6a9310abb4be14e3de83c SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82
-EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1052 BLAKE2B 7787dd13311e212bcc5317f3e64c1ba77ae8444f868b57a054c11602e2f2a233211fc857483a3a05b55623ac6c1ee7c90ea7746b51010a4ea3a994c157a0cd33 SHA512 969e8d44d8e6643698e774322dd5d0d9b7370cbc6f92c1d0148616f886bb391fa32be2ba82f185631acbf0ba955fee77c7ccb5e437d89d88949757d0f8b079c3
+EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1053 BLAKE2B eb67b51e3cee59e6f49cace8230eea8afc270d95a380cfddd54bb32bd743f2947c0d3bddaaada9248721ff8018ebd1958c9bf5a17039ceae28362fea18626fca SHA512 489072654bdf85f078426f60d2dbdc19742072f0248402c166ad528c9b088c34972b4d546cb72083f7de32ddf4c0a16dc3bea2fcf1363f89ffcd35f510aeb1ee
 MISC metadata.xml 331 BLAKE2B 048adbe9d02c7be8d4d0a40aa2f496015a2225ef8ac7f745dd0b8c60d8adbcc44920fe1bf08e0bb5e0eea329b521c549f2218132a96cd29a6a3ff52368602f04 SHA512 e536e9be47c0b879e669145ca18650e86ac94375d9c9451e7b54cc9e9b8aa1f854611f5e427c13970e6735cb59bea7515a0f7bbcd6c5dbfafbe72d02d64101df
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index 59abddc19ad4..dccab47ef52e 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index ec0c2ab50f00..387ea1313d20 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -1,7 +1,7 @@
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 DIST backports.unittest_mock-1.4.tar.gz 6034 BLAKE2B c347f1d45c610701b605cb75304f93c8fc7a8534e2c14efb4600a7c5cdbcff02e0534dbf572ac248d17dbc161dcabd8448941d8340a71734f29ff3294c8210f1 SHA512 ad19eba7c221fbb97ba710cbe96aa26de74ad8c70ea7b794d8dcad3dc86a55a45d36f542ad829fb8c4bcf09c772cf64532dabf337b40bf87c7b29e13236484a9
 DIST backports.unittest_mock-1.5.tar.gz 8941 BLAKE2B ba0ba99bd2668ffaf02f10cd5cf511e32660a2592550f879422400265a4b75732e03d2d0627c4563daca0063ac5759d30abf450c13f9d38b6b3a94b85cab9c17 SHA512 2f2d2c34f80009829935f9e97404bf1840d3ead9dad55fc6f967135b80ed572389d7f42ead2f82671ecfe341eb6ccf696a49560c848d1a36ec5570769a5820a5
-EBUILD backports-unittest-mock-1.3.ebuild 1489 BLAKE2B 6acfe647ed6c490ad9098ec7696f116b2d9031f3725aaca15628aaab57f19769d819c406499204bb8c086dd358ab31ffe7d430f4094cbc7176c4ce197dff09dd SHA512 cfad0f2e6473f298aa73f3f617e42628ea01254072871516fe61fd5ed53ad8bb19701b557fbbb912157af1c68f2bf3cf1e95d93e245d34bebcdb9bb0c6534224
+EBUILD backports-unittest-mock-1.3.ebuild 1490 BLAKE2B bdf00b94a8a9fd9e6608f742e49bf19662c6d00a869179f3270d06f56314ed31714e6a13dac10d5834b897cc3695c9152fd73c731e3d59c87a4537bb503c0643 SHA512 2d678b5a81ca47ba562c31c680676d8fb789c9ea27b9641cdbea705e4f051226c8558fbfefbdbd8e6e5be2f52574f85e328b7090e3116f1540b2a4f4dcdb565f
 EBUILD backports-unittest-mock-1.4.ebuild 1602 BLAKE2B 78e295dba3721ef2a600c49551e71e5f0df28a7e282cdaa739dacc2243d1bf8e63a5c7cbe9db18d033af7c0c884ae01270ce1df2b4da72f9b34bfaf409f8ba8b SHA512 3af54f6729f263308dd71c5985ba1ec93d062c374f6c54f94f207b9c6e65a3a3ef9c00f9fd337b5a5864341c2f063ff216b79286359f5999d9fd55a19463165f
 EBUILD backports-unittest-mock-1.5-r1.ebuild 1632 BLAKE2B 8cc7ec3cf7157173586a65c2a126a8b4539c15b940859196350bc741c0c3b751991e3416a4cda6fa2b40a1671439644379327f4d22575f227e19010a4ebe4c56 SHA512 bc2ce0e063ba93d1aba57e0d9d92ad709f55fbe945a7fa97b3c81df400d023fc5088f7a96e5b62c5ead73e0552628150b35fd18594ec0eeb3ee4ad798d370942
 EBUILD backports-unittest-mock-1.5.ebuild 1603 BLAKE2B d5b6ce6879d0a2e2232b50f7f0ded0b8816108a283b335b12b051d9dfd7abdad1fb244151e3fcb5d1b5b9cee6442d5a76c9c12d8f22c0b340193235b5a9157c4 SHA512 d6a00ea2670f56cf372708a1b18bde4cd01cde087a62a521650f355a3a2f9646fa5b7d0e476640b217263522f53c12d74cabd160b38100383231cf60fd858036
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index 530be3c09508..f26af33b7c8f 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 036641605fe2..29d53ca9a32c 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 632 BLAKE2B 06752cd26bece8b4a107ccf0ec0ee266531e5111a9631b8ce54d484e48bdec6df9606615edc2a1df177839bbf9954f5c7e493c5bfb7eba21733a6299468e8bda SHA512 ccbe3453d967f64c1d7411177f5d038cb6da79c47f4c74d59d2178fead7bb545dd853f543361a3ef5feb9aa6c008e538308aade23aeb776a7a12b7a9af518aa8
+EBUILD backports-1.0.ebuild 633 BLAKE2B 315a1b30edba96155b33e1663b5473ae7ea5a5b9a0cc22d63f52152fc3e96a282476071bfc46dd08ec2c8cfde186839839784728cb61ca87625bd15935a8185e SHA512 78113f8333aa417784da4a166c723c31138d357bf57ec1557fe8461c50ebcb247e477a4d863907f1e99d20941a1be7de2a250a5ebf52a361250da585e6e7d0a7
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 7b60ee22879d..e2c2d71e432b 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 213d8fdcd0c5..bbb12746f658 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,5 +1,3 @@
-DIST bandit-1.4.0.tar.gz 138019 BLAKE2B 1a7aee62aa44fca533d02bdb6e5d44fe136038b9ee8ab462d6af6af84a4111ae341bd791b142d5e090e90f639cd5968419b2a9fa3b51e664dda971af13d52959 SHA512 e5ae412e3b13c89f8c4a85d318b0504c2d5b9aa4ca81652266a13d96f859705c2d0112dc534373cd7fd1020790369e3fe6b55da57773fa7821e663c37fe98817
 DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
-EBUILD bandit-1.4.0-r1.ebuild 1413 BLAKE2B 077f53f5d4196ae2b5c321fbff2488dca247cf673893a04ff2fe8958517c90dd5ba1a418b4ff9c605ea60307fb79dfeb5e0006c09710fe3e7d5c3bd2369557ee SHA512 1ab834fa721f17a353832f5e7d6e688d0cb3eaaeeb623532e7af488d8b1e85d9bf90e490a1c06615621bc3fb0870517c3d2f0758229d8ce7d7979fbe06b0fcbc
-EBUILD bandit-1.5.1-r1.ebuild 1308 BLAKE2B c4be32f105f0538e18984405b19f8929ba5db4ce070d4e87a6f9916c82337392846b22df50c853e3808e6d4d31808f0c3d977a61aa906b749f146883c132294f SHA512 d21989c9220820e6902ff50650c5a665e38c7a8dbbb623c2fc1adc616008e55da1a34eb4e132b2d5d4e934501b0611a601a374413e928e9117c54911a455d131
+EBUILD bandit-1.5.1-r1.ebuild 1307 BLAKE2B f2b7b0b9a0de146487bd4358d52d627af24cc58edcdb196dd4c9f40b185b999dce54241fae007d41a08415323ff3244ba38f0e54d184998c94466d2467c69808 SHA512 7e7c563cdf27c80b370c2bbfdadb96a25b3bfb3c2928ddc5318e9870edb0f3c987f72cd6ef6b4520ea67e8000d1e87c1ae4c36fddaebc176f33bc8299de35db6
 MISC metadata.xml 437 BLAKE2B e9d2b3bbc3f4795ca95af1113008d33a635efed8ab7b6da63fc1b73f426b37b7fda1dfba1f0737e8dc116447b873515d37c628d00876f480fc654a78eef9c2ef SHA512 3e34e842afdbdf7c90b6a9ed8f11d4b4955c03f7f3b3a9cde02b2fa33bcba39a00556e62c5c29b721e3d25d33de8396b5dd9737037f9000b1fc3e707ab9fd9bd
diff --git a/dev-python/bandit/bandit-1.4.0-r1.ebuild b/dev-python/bandit/bandit-1.4.0-r1.ebuild
deleted file mode 100644
index 974ae4c8083e..000000000000
--- a/dev-python/bandit/bandit-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://openstack.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~s390 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die
-}
diff --git a/dev-python/bandit/bandit-1.5.1-r1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild
index a7e548d414f4..99300f639b21 100644
--- a/dev-python/bandit/bandit-1.5.1-r1.ebuild
+++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm64 ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 5b225b8d2278..132b57eca9b6 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,4 +1,4 @@
 DIST basemap-1.0.7.tar.gz 129694711 BLAKE2B ec2159b01711584384d472205f8d3cadd06cfca07202421be534d7778f94000ccc9ae4b8e07a9fd595b7c06c335ec7af7ac2e9d84f7418bb0db1aeab67125559 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20
-EBUILD basemap-1.0.7-r1.ebuild 2109 BLAKE2B 426212f7c37a86c8641b320423013f3defc62d3e1713ab772f6d1c903f2e5ed17591400167a3f4e6effd6e61a879bade981c036cbae314e6830eb249e24e574e SHA512 420009da6a233adc632097c977e48061742ab508b2ce064e93be70efac4fd4f04c48549c2134d88b4bf5c66a21c435bf1601d5ce4248d01f67b5e0f9e4388bf9
-EBUILD basemap-1.0.7-r2.ebuild 2148 BLAKE2B fcc69936999cf0fbcccfc00bd37952aead4237afdf9a1e56c2339ca6c227857ea67b37e1f03c88b0ded1d04be60580b0d3c6774a649b87c64d5e336b897bd4a1 SHA512 7742fd0223a61c4d9dc9024f221c6759989d5c4f5e41453079bf68f887503a8259f047068011a34bc3e1781382b60433fc14bba1359b9d59912ceb86f4ce4696
+EBUILD basemap-1.0.7-r1.ebuild 2176 BLAKE2B 2cb1c2e71db6b8c4e0f4e606c39a34cbc3dd988b8732965110f8043b1ffa49b1e95203a9a86bff5d6b3b4f32d543c71182e24ade79d1b6111d74af975f809170 SHA512 c2c86d652f8452a53bc09bb28fffaa9b7f554dbeb9819316178d5e0cc2eecf1ec8044dadd84a1e991faafab5253984a8e988ef35fc1d18c91aa5bb22aa20c02b
+EBUILD basemap-1.0.7-r3.ebuild 2215 BLAKE2B db19c5d88b2a4f56a9c35dc29e17b6b0147540aaca63581c37601ba0b9d52922dc60c4d6ef88eda75c2199622238725f66d0a9a6c502a04aaebb1eb70bc0e8ff SHA512 8735d3f4152915c8c6847b5c73d0acaf663efe989e66578cdc4ed517dc0d242b3b280120e98c0869cef6d9fae5b1e28d55d2f68bc79e0a686c2f794d59295dea
 MISC metadata.xml 613 BLAKE2B 899d7032acf24b4d5a03efe56d537172d6b10105a71636afbaa63762f4669afb7116cceec9e1be1ef7c8ed23f03d9066b2ace57876770bc49450020e57121cae SHA512 f00ec05a0bf306703627b8a4846a20dcc4503646df4c38ae75f360c452e4e824db537cde0f93d037840583f3c245453387a665ca9ebf5356be45be84588893ee
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
index 71e1f0548063..21c1f248697e 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,8 +17,11 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
-	>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
+	|| (
+		>=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+	)
+	>=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r3.ebuild
index 6c21c113bf73..97bcfc3f839b 100644
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,8 +17,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="MIT GPL-2"
 
 CDEPEND="sci-libs/shapelib
-	>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
+	|| (
+		>=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+	)
+	>=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
 
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/basho-erlastic/Manifest b/dev-python/basho-erlastic/Manifest
index 2bb89aaa8b5c..ea495c004888 100644
--- a/dev-python/basho-erlastic/Manifest
+++ b/dev-python/basho-erlastic/Manifest
@@ -1,3 +1,3 @@
 DIST basho-erlastic-2.1.1.tar.gz 9298 BLAKE2B a3cd69a77c2d75ccbc2494cf841563a075036ce2ecca4425b3e806463e080d87fc2ab6668bcb21dfe3b083ec51498113c641f033cf66b0fd6b1b00ddd9703349 SHA512 bc8666b2e9ffba3e5c7105d1502423a1b0861047218ad18524ad77853137dea5f17c64d6cbb9cdbc6ac6e207b0a2f9a57d65e5c4cac67172654c5eb92ac7ae2e
-EBUILD basho-erlastic-2.1.1.ebuild 565 BLAKE2B 56f39f3260deb58a913849c4f52227d7ba925c79c5a971802a024303633ce29824a99af8652bb0dd58f30720825a464c9a21f4d1386aca5867b343270d03e7a7 SHA512 1f1e2d8de13fdf981f0e262fa7219dfa45aed51b356ad5ff7ed2e15f0d26d4aeca1066af1f0f0970d800cb672bb2e57b5951fe963148d2a281df18a6f750b181
+EBUILD basho-erlastic-2.1.1.ebuild 555 BLAKE2B 86c0b18d29581f39dcc1ae3b5c289b03ee987e1e240c2b6a3fe9ce5810846035a0f0af8ffffbf0f72e4cd948d306438db5a5cc9996aa62ad3884016227958025 SHA512 1e7b07284c54fea435f7a3f2241608930cfaafb6ce992217bcb6fe2bca7e359491078575df301334df58ca2af3a45bacc2c16b442abdc96f969a016aec5f574b
 MISC metadata.xml 356 BLAKE2B e6bdd5c282ab43b84c7d3e581a62b579d3e46031f31e4e81426f93e9fe97f46c5ca9ca844afb15e0a31436464473ea4ca03923ace0ddb55ffdb695569fa42f84 SHA512 cbd8ab52f7ab3e2b9627d745405f21c19e9918cd765005628415626d0598e216ad53744988e343f2d03bbb71d92b3cd62c085ad4288393f016950c8dcda7f09a
diff --git a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
index 39b775042479..4985dad88ade 100644
--- a/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
+++ b/dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 65371d2da4e0..0eeaa2e0eca1 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.6.ebuild 954 BLAKE2B ad07ba9fa3dda43f56332f5385c4c22be9e9e15354f3b9aa548da0a77320689a12921a119cc43dbaf684e3f98d0750407c1e76104cb14306e566f1fa367905d5 SHA512 45b737c6c1000dffb5f264d54ecc92679f7e66864df47cf28d64c3fe7a739cda698c22e65d7c83fecddcfc084032dd15e1a8b0a07ecaf228a09da95c64e72061
+EBUILD bcrypt-3.1.6.ebuild 955 BLAKE2B 8d62e51a3e014f18d9e404310b1c51c4ad264aa7c954deb821a5f074635711ff380c333fa7d3fa4d6c79bf25bb42efdb062742dcf37ea662509cfab1a23ca496 SHA512 039c4359e9d8a17b9164c0485a75762e938022b216d237383b525b1902cfa76b9ab55402bf66514f1fd3922de6ea15a8fa918736bc180ecbc730178ec84f6482
 EBUILD bcrypt-3.1.7-r2.ebuild 851 BLAKE2B e393dab96dc9467395d05d0ac44dfcb26f0d398d4dff0d8501a9f0deb78b2a0d2618af325172172f7f3772b9872b5f195cc5fd291e7c4da08f1384f8f4771bfb SHA512 940a20b8951b3133fe67c1888c8108184b7a91b55e769d681e6a1d352739769b5be905cf62e3e3013fd2fc946076e4c0bfda672f895bfcbe76cded1161d1747e
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index 2795d4d57b22..466634c94144 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index 40c813103438..a1164cd1a372 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,3 +1,3 @@
 DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
-EBUILD beaker-1.8.1.ebuild 1354 BLAKE2B cee0c0d632bd542c5265ffe73e99312b1aebf0805a4e3ed91c33effdb3fda5da37e6e05540693c59528b741442910aa4c73592818bcb57e29faa2cb311348599 SHA512 03df238ca05d3ba4751b0527cf6003303fd7094d9df51fea420a68530a633669f6932f23f0a67817a18f5f11340d337a79690e89791f267b4821b9bbf9881680
+EBUILD beaker-1.8.1.ebuild 1355 BLAKE2B 180fefa4d6e123c05449f5e6a30357c49d8d3ef69ba3b8dfe4a1aa3abe82bc704caee903d9ba542d5811fe83ed938d45a620979428d5e7814dea8aa63a0f6334 SHA512 9b6955db849a56391c8a3887050575d567202bc5752c348673f34c357152f0d5822559f4cf66e1f28452289bb3741f5bf2f9b8ee9eea5f009ad6ab364445b5fe
 MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index cf50507a8696..0cf938c601e9 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index b526a5eeda13..06b82367e365 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -3,9 +3,9 @@ DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332
 DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 DIST beautifulsoup4-4.8.1.tar.gz 159164 BLAKE2B 00121e9b30f700ade0bb2ec8f637b4173ecb4c187b8f9a77bcc4e6b333fced85a699c8d9efa5b757ab02f54c2b05740702c13625ff427730ccc1f6a97f43fa48 SHA512 7abc5e84cb8da5428dafc6b473418d0cc72b518cb1a73d4ae58b8dad3ec985e5778629dc1d7c8374dfb223be981983c745a1dbb55a98078b4cfe7ba5ce25539b
 DIST beautifulsoup4-4.8.2.tar.gz 298650 BLAKE2B 6826abf793efa63be89d844bc25bdb105413196bfab21c18f3816fd59a7a771459bf2c7ee209b75b0c88dfa14da8f4625c948889acfb48502e2260ccca229675 SHA512 aab90eb22614e9a2fb47792389a951b3ad7faf9791e15984a6c27a38be6f3d0ccbf3a9753d9afb5c70105097ac1a9c5f9e07206e12c6d4cb7a7f6d4e90ec18c2
-EBUILD beautifulsoup-3.2.1-r1.ebuild 828 BLAKE2B a112934cba4689e878cc8e71aee921f5dcf53ec41e8775820e8809ffde7dfe307d59e1b91a9e95197ed54efcbbeb31d4876d25a26ff7339ade34ea291c01d1b3 SHA512 8f75ad4231b8c78b75e1a2bb1bf5173c2901413cae05f33198b7eede63f1c3bd9df8127d9c775f2e70861a3295e320967ca7149296deb8725b499860eec4b808
-EBUILD beautifulsoup-4.5.1.ebuild 1349 BLAKE2B 512713938f0da338dd7cc97ede1060c64b812d69c7d4a00a1ca209fcfab123a1b499902165871778aff75d99c06817a396b36cab963bbefbf19ec7fe69bdbc68 SHA512 d9aeccf8d6028697e327db4e905f30cf1b45bf2b9aaebdf1508e41d5355573cd98884494f8bbae05124accb06a240f7732f5150c6d06ff7ebff0d5fc41f421ca
+EBUILD beautifulsoup-3.2.1-r1.ebuild 829 BLAKE2B 9e38e4b34304faeb81d3d09d4f755e907926c9382943734b315597e5a57ab945244ec9731db04bbbb9419691f59d7cbc035be687d700de24aea84f1f14770a5b SHA512 d95a2bca46c0161a07e87785f468b50e0e2110e1c943d502c5e232d4b246434de045c28ea93315b6b5fe0b71097f50899d581b74346d809d38d5fccc8aafc207
+EBUILD beautifulsoup-4.5.1.ebuild 1350 BLAKE2B a36f95ce0c598e0b5d87cccadacae229c6cbb2b412c76e8662793999abe634aadb3f30c135ecf9545446c7c0896a91a7409c831ae1785e51bdc82c705652076e SHA512 2a8e1d08c4b00799ab936bbcd82003948b9e5ba1463e1297a21dee3051c0e46c3e53c5a1d3853c32459e1c19d8f7a4a2189e1804ed91b23057530cb9c829d249
 EBUILD beautifulsoup-4.6.3.ebuild 1322 BLAKE2B 38c9f458e86d34db0153506a7e8aedc561a53181bf45ba15ab69e1760582ecae4a6c8a3bfd275a9a31fc61a10ff6b1f36208be37555baa42f7408e60ce60b21b SHA512 298d3e179df527aea408ec196cd9b617c8a886c753ddc08dabf5ed55889220a74c93338f83d7a798f73789b7ac2cf07538c41829f2eaaf6a5bf82d6e6076711e
-EBUILD beautifulsoup-4.8.1.ebuild 1060 BLAKE2B 226ec5de5cfe9480130fdb9d754a47bfc10bd8113889629063ceb687bc996ac96637723e6ebdef10c05de6f460487cd4f139be09547a8f2c3724ab3fce69ff38 SHA512 624290347a9fd7c5e4c4092b8a0bd731acdc64b59a694dbafc493be603a0f51a530df7019a4d2e46b88af53c1d7d096b277b0c01ce81b21b728ac5e42d3b2e7f
+EBUILD beautifulsoup-4.8.1.ebuild 1053 BLAKE2B 0cc39f3f65c8cebc51fcff80242dd147ebc4fcd849ae4407e87f73c15f0ba7b070ba367f1ccacafb5987a0c4c8314052f62f8ec0d8a1af4034a6bed8541cdb27 SHA512 6d9a6c04c419bb8a84856c097857bf016027c842f8350f395216bd0efc47fd529710e2d5620666823d3cf17fd0f4060cefc0a64bd1d637855890aad520ce7137
 EBUILD beautifulsoup-4.8.2.ebuild 1062 BLAKE2B 2a7d245c478167ebc5b54087bde4e8e1e6a0dd4b723249a334cef2f72b1ba6512f5091351efc49b57178c5b28c942fc71161c1d1138f94c0e4326860ad7aded9 SHA512 23e1de6416b0ccb3c15f41e717f855341566c1f82cbe847358b380654265e4ddc16a49391f4a358a4ab54e0180e828a2ce096d5bbf7601b0dc23ec38d1d0c41a
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 0e5b504533d3..fa441ebfb753 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="python-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
index 62ce34be602e..5d1c9763c154 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
index b5e62a152a5d..8248869170cf 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 # html5lib is optional however hard coding since its use is actively discouraged in the devmanual
 RDEPEND="
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index a854d2d4f5c8..48464ef624dd 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,5 +1,5 @@
 DIST bibtexparser-0.6.2.tar.gz 50876 BLAKE2B 660508717a224d1c1c28a52c8d7ccc8de7248e61b45ce73bb46729ee7feb8872bdaf92bd6b07cdfb7934fa57993b39749b9961185d4dc9cec2d55809761a783e SHA512 43a1c0475bc9e97c201a850e944f082e9eb316ac475cce4128b821008fc5b1597317f28c594f5462daee992b455fb4254fdf76a5baa02ff8e8a0e36f43c52491
 DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
-EBUILD bibtexparser-0.6.2.ebuild 723 BLAKE2B dd2239def5229c5cef324189944c2470acac5801aae0f9b70206666858c02b8f095324076eb37265517ff679564f0fbfe70448aee858fa0de9ac4877224a36da SHA512 4cee896fd1070e2c0e11413d141f630b5525793f023665b89fff0d36ca71b32d593f2169291dbd7b6f0bd33c8066d7d714e38bc43da91c3640409db19a3cafc0
-EBUILD bibtexparser-1.1.0.ebuild 727 BLAKE2B b16612b8f74b3002e9de2800e5d7f92a2d178c4a0156aa3368a8f119f6182195d1e312f8845bc3b35da4cbeea2e1820d5fa7829644022ab497c977a4a69097af SHA512 b4769849ec996d9647a6044be8dc239c4c0703e73bfd05fd7d6eed797ddac494584387267292b00032379076321f844cb1a394fea024227bc17a1f40b0665e50
+EBUILD bibtexparser-0.6.2.ebuild 713 BLAKE2B 5203507008aae9444a7f2484463034bf6b1bd356f143a1e86dbe485605e4dcee2d1c4d3c3ff33abd19714345e547c1d1675a0c98a7b1425b0612eede34de1114 SHA512 895871fc5273b654abb07f172528bbd11ee7e6a2cf05e7e2e7d9deeb622c54c57fd690c08bf79ffe46f79f01ba0f0c690c90f12f9e2183bf9a9d3052e56a7823
+EBUILD bibtexparser-1.1.0.ebuild 717 BLAKE2B f88068f42606138e216c56a5b77e35ec3006da658333a7416749db384838be80ff197bb53abe8d2e35d197b1f4a9c3564e913ea07ad608e597e97f06f77fa4e1 SHA512 a4d84e38f58977c3d474bc051a79ace481d92293ddbcf02ce7a7549116cebfcaaad6a2aca39f985552926fb75883d20142b55cca770f5f23baa41fdde9cee09b
 MISC metadata.xml 345 BLAKE2B b62679a7f708f8ff2757c923e3ba7d8cfc73a7b3f1a293020660a20bec6cfd07e33b073f18f9543085834b7cfb07fb83f749ae30c2a0b18face008ace3b50da0 SHA512 d2ed1034bf79aeb9c8bb102618e5c5478a526a8567dd8e232126f35919b1e6ab6b27bc02f01d61a475c8ec3488450968fabe4548539d61a70b61459e0b1e1615
diff --git a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
index 38eef0d64151..a855dadfdb02 100644
--- a/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-0.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
index 72655859320a..5b5c3522fdae 100644
--- a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
+++ b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 python-r1
 
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index a8131ed4ba5a..6219aad9a003 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -1,5 +1,5 @@
 DIST billiard-3.5.0.2.tar.gz 157299 BLAKE2B 1400d5a562dcab33c83a64cc7f7d14ad55b75677c3bb4c050cd4ba08a1f882e65d033653628fc3f2b52942081da3d5661fb0bcc5f2dd95f81a64749cd47d324f SHA512 581e1ac361324b36d79e280072952e490ef3470709b094f001c579feda54578c8e7b3e5afc93a5f878a6118c56afff7e59e13b3d3f2ccb2564b9b27cc810dae7
 DIST billiard-3.6.0.0.tar.gz 151342 BLAKE2B 46e29ae54144f3b4ebf3fbb4a5bdbba29662d3a6b292cbfef526618237103fd833d10eefe03211141264424590b33ddcd8722616d36ab4e2405198628cc29d5a SHA512 0a71de026d2a781b83fe2c549ecbfe9b6fbd574d8067fc46ba7eca6b76633a123620853d22696df3563d050043cfe75b14b4b69bf5217e0af964aaa0bcbe08ff
-EBUILD billiard-3.5.0.2.ebuild 1065 BLAKE2B edf8404f6cd0be7b3b0cbcdde8c35186256410f04838bd5b9aac3276b2a54bed43bfe1fa8fc723786490863c3403444f17d6329554c5b4293808f9fd40505648 SHA512 34078eda255b40c1775213b287208fd081b7ee1ed74b5afb5494e217473caca51df4e210ed537385b18a5fd6d47b80b776b1c8e23c775df1b5b756e594cfc577
-EBUILD billiard-3.6.0.0.ebuild 1147 BLAKE2B 85b6b8aba5da5e940daee939035b525a48d3dda8f1e0e574e0e5365934eff044708c5efe8d9b06e703d210dda82e992bc6ad5a1b04ed9c93ecb9239c1dba3d1c SHA512 90bfc09e4e56c923476ce9907c2efc9c6cc80d2162626ebadc36c41c3742e9068d00afc8506666d77dbf1d9737c1f1b0933397271d3a464ed4f6bd85f134c615
+EBUILD billiard-3.5.0.2.ebuild 1055 BLAKE2B df35e2d26b1a0cb682ec371430ffa0f980826a44e42acd7ddaa4d1474f68e8381c71a9d513d5f9d22d159a4d5ca528b4c16f7cf1229fd3dda93100591bc042a7 SHA512 7ab86b598931532ce0674434b032fc6fabd977d7a4dd2d0a9dce73ca92ba45512cfb369d5d319f6c13b80cf4afd4f8d2d6a82d4bdfa782c542185ffb8baf3694
+EBUILD billiard-3.6.0.0.ebuild 1137 BLAKE2B 0765dbdcdeccad1b93f9a16821e181f322740eeae3d9510a5a956aff88e11817cd8360c8e9c2264b5259b88b5a5fd18761ccd1c1f30df8997fa7b8dda1a6b87c SHA512 64fe6e60748239e332de4eac45137c63eb393864d27a8906ddf1f56c49df75fa5690fdc71fd7790d0f7bf90387fb686a5ee0274b5957de0512b38fcff37781d4
 MISC metadata.xml 366 BLAKE2B 1ebf602d203fab55800c4b1c9df304a2eabab36beac69affe09a3429cf94daf9481436f4216f7e697cb4dc864962ed3a0d6ce3c476dcbc325292c7a38e331718 SHA512 f9784ef6cb7607efaced1b96745e9fcbfb13cff64d2be2cefe2e28e5475d8386daa675592f22d8f7fa23949cb015de73583dd8ab392aa9b6383e0befe30dc8d4
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index 541e6643f469..dd6ede09bfc9 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/billiard/billiard-3.6.0.0.ebuild b/dev-python/billiard/billiard-3.6.0.0.ebuild
index 4d3b932cc8f8..5ac822b6d80a 100644
--- a/dev-python/billiard/billiard-3.6.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.6.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index d9b6d6b3fd73..d67d0c29f58c 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,3 +1,3 @@
 DIST binaryornot-0.4.3.tar.gz 372299 BLAKE2B c4ae99b9ccb66da8925d74fad68b8df4713822acc74d852e2f584e5c157eb465bc6418b0e0085533479ba1ee937c3d2716dea66ce3bd517d49a490ab4615f694 SHA512 bdb918b921fc46d056572b84126dbdc6605ec98cf13aac84f6f64ce07d083839be40bf7a08185eaabfbe136a9bcf0c1acc8041a23a6bb2843e8e72981222ebaa
-EBUILD binaryornot-0.4.3.ebuild 692 BLAKE2B e5578fc630940e357296d46c6df890cf9b655dc7ec5fb9254c445c39fa0bfec97143fee6d5dfb3b295da603feca199fe9d82ad7550e429656021293fa6faa349 SHA512 23bdd11bbb48b780e9f1fb9bec664890649e75f022ffca306ce819b66ade5474ece12d61960a5682eefa426a83dd6cf3f17ef1e552683be965ea7aa2d0cc742c
+EBUILD binaryornot-0.4.3.ebuild 686 BLAKE2B 675aa23764e7fa1122aa9524d29ef359615d1263f4e48666ef91638badbe5aaad193d64ab769dfcd8ffc5525e0b0cb66f8193ee0ebdb0bb31118c6de06d3abf8 SHA512 9a6eb7550bba8df5f12233b3833191f7e816713c7374bdc9367b0c1017dd4fe75a49c12546126b97c14031f12f60584c7d82c8343055b9b90d3519c6d4e96392
 MISC metadata.xml 324 BLAKE2B 85a0925b2255a6577beed4974beba21884b88df30bc1519f6ce16e856659589c6e6e38166540f59fb0043885ce786382d90b6830c6ed1bc0051a5d728a1f780b SHA512 f20343e29c9a1d2bb354ecb3c308d5b21985deed5368d27dc144c3a6f2e236f30f7516e27a56e55be48fda32bd59ae9af96ff3b90ecf641bf57dc5b61a4267c6
diff --git a/dev-python/binaryornot/binaryornot-0.4.3.ebuild b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
index 09a2b92fcbbb..ab817f0e4b38 100644
--- a/dev-python/binaryornot/binaryornot-0.4.3.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 5098a76ff889..359a2d5ae112 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,3 @@
 DIST bitstring-3.1.5.tar.gz 761527 BLAKE2B 2e0c9ade6cd946bb777ee666d12c777191add1fdbb2c47fca097a0ee48cd8caa6eefb5dc1a4d69d9fbf986342759956bd2ed078043b1df7c482af54e25afc0fe SHA512 2c98768c98fc5ab99eeb4ac089ec66f091949e5e4f326563b1b480981ac2aa40258fe0065809eed9c08a71fae3cf09254a8a2465e86635db5287c0d2f241d75f
-EBUILD bitstring-3.1.5.ebuild 642 BLAKE2B b3115fa63f7b3efde6c2f6e5e421293e88a0c829d7a21e8138bbc837927e8ee42f99aa8a5fb6dce2f987e1f0ec1bbea8ecda00ea2491d7d2fe1d0f65ac1f12c9 SHA512 ecb82fe2108f62516dd59cd03cb0c539b27b9afccb06c3bc0674080a8ca0618e6ad573be7b709c5fa78e8fa06cab4741ec4bfe2ff93d4f1239ad2d9b52e18ddc
+EBUILD bitstring-3.1.5.ebuild 636 BLAKE2B e5ea04847caba8654db0702673fe1ed56a125da209fee7250ef98fc9e207c54db209c2fdc8a71661b287f797cb8691249c21b0d877f4fce2e9b415b0411658e3 SHA512 95c8e7ed470750ef12cbec6a406a962fc5c4769f866a87f3d4b93c349af0850b72c8954df001e0a58a9156328e90b60fce6e75077af2ab24def5604dfec45a17
 MISC metadata.xml 661 BLAKE2B c6adcf300502376851157d3fb869c9327f49f4ae61f820ff59379816fddae11ec5c2952eb708d817facc9899ab347517a41c1307ac0bab4dcf34a4ff877bd704 SHA512 666cfe84898096825c292dd1e37af3b8d962f199199b8a73813b366fa4c14cc3a5373c4ed4fb8153b8e1c05321f4dae87204e1bf5a53e6fe07ab0117704b7f2d
diff --git a/dev-python/bitstring/bitstring-3.1.5.ebuild b/dev-python/bitstring/bitstring-3.1.5.ebuild
index 893b6edc11e2..9b3acf13d2a3 100644
--- a/dev-python/bitstring/bitstring-3.1.5.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python module for creation and analysis of binary data"
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index fd6ed1ab0182..1e0cbea66c5f 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
 DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
 DIST bleach-3.1.0.tar.gz 167814 BLAKE2B 386d483ec9554d0436eeda70a5f558ca2191914ed90ddbfa00ae887e682505d1b84f511d21be7eceb8c98422a4dbb25ee32af49edc4b811e3816aaf9161fa4c4 SHA512 8db3a54b68fa66a07a3b4b90481557aac06e7783f9c72035a6f037909017354718b67b64153e1cd50cb2c821174b8282837c4c3e667878041a68703b141b2969
-EBUILD bleach-2.1.3.ebuild 802 BLAKE2B e9dd14cbea9a018ec02a6a0b109f33cbf021c45492d58b3dd73b52c0caff89bc4ac0c18e52b3b663462cb9cda03ea88d9136bb84c000ea0254ab48f18f0a5a63 SHA512 8e112c2e51e234b75d01cb9efc3fad8a6b49d85464500dda292b24e982566f76f199e187fde450c3c941c7296d00dc86a1487d770c8c87552bee94c91b85265f
-EBUILD bleach-3.0.2.ebuild 773 BLAKE2B 5110c24c3fd4f6da9a6fb35e3dea2bb40f8f36872efb04bab6b207fc37a851fecfd3d7807e5208ab23732c50dc9222bab9615d0fca2601e134fa9c465d6666d2 SHA512 7b470c9b33c3f0ef3f86e55fac8482127bbf5bcd8a23b7790f23dac78c0baed6d6a4135d2c6dc92f65ec4d64c557f63a31e71b6a9958b7a9448f20e242c45581
+EBUILD bleach-2.1.3.ebuild 803 BLAKE2B 84b3524e8fdb4b886c453e6f1e33f36d47836368adf399dc4da57fc99e5128870b0b8186420753bf76e57f6de7617b59ebe569f00f3edfffc96610e29fc01850 SHA512 9c9d50f58dfc721fc6b90b72503b5feeb457b749a80539f9e0e9f444d3fff5bc416a9be96950d6d15924c7061661f360516f489aafcced89f883bb2ee8f24384
+EBUILD bleach-3.0.2.ebuild 774 BLAKE2B 51a57662bf92bc4036a335c5baed13868a63d54b4e238284ea90144c931b6978dbd9e1033a48f566a6045648997b5b63f610c92481059524dc9c1fa44c48b10a SHA512 622d7b9477397ab9e04f41e36eb405ca02ce113e3e313836962aac575a52ab338b091b2608989a151ca94baa4d282d7218e146b25e82b55e7376df3c5c3ad625
 EBUILD bleach-3.1.0-r1.ebuild 673 BLAKE2B 6e38dd14db6cf0b37cd213887cdbd80b85f54d8a6eaf6381f7983d5129d47c234e7f30deed05d7b2818e2a9eb98c1cc68a5e0b4f1b7211b211f539b808d6d783 SHA512 eddbdad07822184128323bd2478708762d4ae590b5375367f95967a795c6b35053d8990a164d084b542ee3c4188e80b1ec8b992b3245918e98b411331e865918
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index b2cb3060f12d..adf0b60e88b8 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bleach/bleach-3.0.2.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 92887bd8f5a2..5d9a20c33816 100644
--- a/dev-python/bleach/bleach-3.0.2.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 4b7736574259..d7c1a3a4a864 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,7 +1,7 @@
 DIST blessings-1.6.1.tar.gz 20122 BLAKE2B b2158f3fd538ef8641438bce7800efc9417e9febec6509d0e11389277b02ee03e661fe70198176a6a3578c216aeb4a6957da28d090cb1dc2849efff135cdf400 SHA512 7a4b051e448cddde7e8ce24106ce0d5d893eb442b19fff04f9ddf28381dfa1b4bdd4be79b87782162b2ead13597a346f533edb944130f2e5bc39aa936ca48db2
 DIST blessings-1.6.tar.gz 19974 BLAKE2B 5b454c7199c637f9b8d4de69a92b8137e65b925898064f31dabb56bf4fd7af8b3374b7311bcd0369b668868bc2335ce945306c242c1bf58d6d7d50c09150c017 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.6-r1.ebuild 818 BLAKE2B e03c3d796bcd157ec7c86f742e846ff28bf36d65fa6da5748eaa2a2fc6254e737799429cdd52822cfb73b7a157ab8b7610cbc49d6581e163d97152b1745662e2 SHA512 1f343c8cbaf66103a22b519413e3808176a5be04c9e764fccf8af11921ee406de9d2ff399af40da9574379c444f3f4cfe5a7a9c8cf056e28b49a78047f63a6f8
-EBUILD blessings-1.6.1.ebuild 820 BLAKE2B cfb8a655d6c03b5ec86bdb4b0f9e4dd22d93f6b85727a0a79091ee3165db6ce6ae780d1d9a2b85d17e7a16561f84dc1de252d4f7104fa81f4da04869cf064890 SHA512 c33c310c156e0e4509ef2f4f97b97298c7f430f98c517d90603f64e3ef4e2324403fd9d6577af136c6ce1683273d750dfd85ff8104f82293df57d955f260d695
-EBUILD blessings-1.7.ebuild 1144 BLAKE2B 8308443f19582f5e42a081910b350695c677424bfd1ca163452c084c53518647057d7a4951c5b740ca54000e9f28e485bd66f136cbc48a88817c7f88426c53b5 SHA512 9ffc5de306febf8b517f4086fa6d05e87dc52579c42f788e90cf42897cfe1daef0d224887e80bf8675b9ac4eea8a3beb69bbf1e9f106e2d7da887842b84c03ae
+EBUILD blessings-1.6-r1.ebuild 808 BLAKE2B a69ac2ca3628b7e9e798affeef653aaada37d7aa9fa5011c47881a695ace78c43600f300979545b5f6f5657ae6a02019479a194445d8c6686226010a424276aa SHA512 6b972cfc2a20a6363846ce02bf187591919720c3f16fb83dbe9a1e895967ae6f14e2d4e0e0ab53c2a2754918a005e4c0b6092039883617d6fe19a5052c6fc8bf
+EBUILD blessings-1.6.1.ebuild 810 BLAKE2B 80cfcde28c77612096ec719d67c84e28c8ede730cb1bb83dead0364e42bbf5cbb9c75b8941b2d7d123a710d10d1be0e232984948f2fac1f48028af41ae08c8f8 SHA512 7d0f3ea9c89f69da88b732499a3a227f8c052c1bbb1280ec0ebe7aea203174de86464b102b81c0c435f31b1fd25fac7a53a1f46232fc55336ebd2d99e44b6467
+EBUILD blessings-1.7.ebuild 1138 BLAKE2B e8a86f4e2b08e538947069b70a5831b5240102ddb9ead7b23fb5c4a2fe0a7d135dc3149f790fa8861092fe06c8f93a534cedb18e3f845014da6f731e419d4113 SHA512 70e8b930632584221571906f4de47177b33134c3ce3ffe93ffe48babf40cba84d0317317f38720032c6fc4daace819390b092be778235b4be195dcaf02e0a49e
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 76477c0821fd..d72f67714017 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blessings/blessings-1.6.1.ebuild b/dev-python/blessings/blessings-1.6.1.ebuild
index e7023a9a4998..8b602edf13c1 100644
--- a/dev-python/blessings/blessings-1.6.1.ebuild
+++ b/dev-python/blessings/blessings-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blessings/blessings-1.7.ebuild b/dev-python/blessings/blessings-1.7.ebuild
index 3abd1eb700c7..f2f31335e0c2 100644
--- a/dev-python/blessings/blessings-1.7.ebuild
+++ b/dev-python/blessings/blessings-1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 002166af8cd3..072b99dfa4a8 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,6 +1,6 @@
 AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbdcea1ce3785adc0c6ad2b198f4157336ee2f823f95023c0eae9724cb695fdf8576f754430baff5bfa2a77099649991f72ccde9 SHA512 08273d2d3ed14a88082ca1c21b9eed73bd7e878473509d2d00eff89f0be1b15441e9d60123f41f29afc7752d10a357a9457100ac2cc0f8f9daaaf76bdd24f659
 DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ffd042fb5ab088138dec542a47ee3e68c99442713f32b004ec31ca608686e495d3ec9172f8ab8b074d94d111733144 SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
-EBUILD blockdiag-1.5.3-r1.ebuild 1636 BLAKE2B 64d297dfcfd17b9db20aa36c0944569a77dc67cb49e81e76f27e9986db56a03fcfb5ab9d6fd77cf1a71032ac675859f32b954820e8f37d6437d47b8c62cb625d SHA512 3f4676ae297ba078ba32e7f27da78ba91c6f74579bfd364094f3eeb33d0a61fdd1ff485cfa00064c35d99ddfafc7f3e5b27b94a4473fce8bfd596c6fad76824a
-EBUILD blockdiag-1.5.4.ebuild 1828 BLAKE2B 33e3d02b392356e6ebf422a2c94243335a4bd145cad3096dd6221833389e6991e1a47786949fa1ce862f14c5962efa1b9a60bdc9c2d199bd350b80320fcaea96 SHA512 7002640bd2b967a7bbd596313c00c9ef99766043ec0f18eebf07b5cd4c1adff187436442a1194d889489c779cbbeba087faf06adab5afa7b1b0f3749998f4644
+EBUILD blockdiag-1.5.3-r1.ebuild 1626 BLAKE2B 53c3d55cc60fdf63428b3b7eeed87645de26e2bdccb574663fae4e6157de3b048617d668e205f052bdaaf63e46c1cb7d8a4222670ec9f89bb33921603df4a690 SHA512 e19ac0ce496bc5701f0cc4455adac972a2b303c4f6dd6dc0f1309cab9432aa9c5dc79c78c27d5ea2d27b0c01ab8d546d5e71ea5edc38b0d40b3c57fe32613bcd
+EBUILD blockdiag-1.5.4.ebuild 1818 BLAKE2B dfc24fc9cf20fcda69d69552a15256c45720b8703c9cb7e27d73642b3baf576e334297737d13169d98071aa1634cf81c731625ada8bad4ac58738f6655bf9ff4 SHA512 ce331285139f156c26a824217c8168b507389b5edb458583c5735eef711dbe1189aa066281452b836402611ec1a959a83693a63412b5cfdbef5b9755468b30b2
 MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
diff --git a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
index 8a137320716c..273bc00389b8 100644
--- a/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index 88a33caf9ca2..f3cc9634ab33 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 342ae216f300..fe93d8ab447d 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,3 +1,3 @@
 DIST blosc-1.5.1.tar.gz 641172 BLAKE2B 2305c8a4b32192393182306c1ae074caff1bab28b7c842c14f737354c282aa30ae1f9d6cfa5c4932832c505a9d1eb1a579cd2303d1800ae42e52fc58100ca99a SHA512 76d8c5d9e0e3485aacd5646970ce62e34d6ef3ff04e134342544ab044c4d1925a537187b4ce8b7ef3f6cd327e26d47dbdf1bf04233186a8baedbc7c839071cf8
-EBUILD blosc-1.5.1.ebuild 815 BLAKE2B 533c2b70d38438e8a19f3e3f55f6bedb5219dd1d4e8096454ad69f6b087eebe53e9006457f739843f7192e34a6f52994238bba7c13ac1ee10baf9a074c076acc SHA512 71f03733e6b3bee1356d31841d83136df185e88e403b900e93a98f09987472716503ee6329a46259482ba29bd6afe0aaa754550fe6d0ec0cc524b453bfa897ac
+EBUILD blosc-1.5.1.ebuild 805 BLAKE2B e5825550ae625b6dcd17fd15f83f975838925defe91554994b132848cfd33c451b80f093041382b56a3a9d5f7ac0bcd92be52b7da72de4323eab98f122093519 SHA512 24cc25dd0ba09cc3c5ad3c4473c022a22dc94194cba71e7595634b85b29469c4243796afc19714e90fef07de5d10ea749e0857a023e34950493f828e175a2b71
 MISC metadata.xml 891 BLAKE2B 2ed113aa84063255dfc15d018340cda188c9441a252a4d5c86f1821d5b7f16df6084a4469f05bc7cfca16439538b7d2f5fec105ac709aa9b056c537d8840edbc SHA512 e4ece5eb12f91e4416a8a685260f6bfdfee12ca64b7f2ad4ce0cdaa81287a24b1f51a156c7502b1e16341088743d7df9fdd36aa9095ab9d02e0bfa28536bb9f5
diff --git a/dev-python/blosc/blosc-1.5.1.ebuild b/dev-python/blosc/blosc-1.5.1.ebuild
index 646deac156a5..741ab2ca759f 100644
--- a/dev-python/blosc/blosc-1.5.1.ebuild
+++ b/dev-python/blosc/blosc-1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index a0fe317a17e2..a47e682a4599 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
-EBUILD bluelet-0.2.0.ebuild 578 BLAKE2B 12fdae76626b2a1f84130ea5daeb56673d89e3775dfbb7a680824b3fbd76617682545dca8d018438f34b41d13f9ca65dc9033d411cea6ccdc3555c2f9d968a36 SHA512 a0bace83e403cf6999d0d223a6dc97f0dc0bbfd6274909310900267e0eb7bf7976e1494b79bfb7063aca4d88c46558db198896bc5ff3ca3a95c0fe4af26b7f12
+EBUILD bluelet-0.2.0.ebuild 574 BLAKE2B 4ea48f44d9de746e1668a895cff7e796b3e899887d9a815e86ba2233970620de25ad0500b65e6dcaa03759a00942e4c98e1ced6386f369955875a8ff086e5551 SHA512 f0050cbe762c4567a8c5163c8af92db4af8b2aa00770d657c094a8811c82c6fdac383f2d4669c1467be3bcd65188ac09dd61c77c934688747f2014d24d3ed426
 MISC metadata.xml 969 BLAKE2B 64de2c903db588aa64c305a35d712d4a8905051cf021968081f39ade06cb393ef2028f96401259b359497d0acb422827f640333485bd7f5ace79a6fca7ab782e SHA512 98ec10adf32ffc4b2adcaa10f08e3e8f24e06aa22b66cb9a372952583153688349b11bb99654b8c53901b073085dcfbba6fe11b943b6ada86116d36163b89908
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index bdd2fd1ac734..6c67486dcc5c 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4349f82d5b46..2acc008d3bc1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,8 @@
 DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
-EBUILD boto3-1.10.2.ebuild 1242 BLAKE2B ca7011306a68173ec6d6c199e1b7cb8d1817461006e2a6f51edde004e5afb24c11f0786bd5df275fb1543601bf45511c8266ed29607070ee7ad4bccf383cc7b8 SHA512 8165eac1060959022cc0daf8fe28fe9cdc468af70cbbb65f2e7d7ddc9bc646f3833f470f5be4c1a5ae00622b0dc3d37345dd2b01d04d8093a8f983780d712906
-EBUILD boto3-1.9.122.ebuild 1240 BLAKE2B e9abab01968d32f0e4e886677349bb0af716dc5e167d51500dc7eb2a6a427b49aa686d2aba1b410de8eb9df48ed30fb61586b81fc016b5a546a404db5c643b13 SHA512 0e9822cd104fddf1ffdfd3521b8d11cbca978fddfffd57f95031de2d2fad4dbf750cde5df70f034a6ac5119c3e06e03960836ef1ab297f799215e6ade29735ad
-EBUILD boto3-1.9.4-r1.ebuild 1240 BLAKE2B e9abab01968d32f0e4e886677349bb0af716dc5e167d51500dc7eb2a6a427b49aa686d2aba1b410de8eb9df48ed30fb61586b81fc016b5a546a404db5c643b13 SHA512 0e9822cd104fddf1ffdfd3521b8d11cbca978fddfffd57f95031de2d2fad4dbf750cde5df70f034a6ac5119c3e06e03960836ef1ab297f799215e6ade29735ad
-EBUILD boto3-9999.ebuild 1242 BLAKE2B ca7011306a68173ec6d6c199e1b7cb8d1817461006e2a6f51edde004e5afb24c11f0786bd5df275fb1543601bf45511c8266ed29607070ee7ad4bccf383cc7b8 SHA512 8165eac1060959022cc0daf8fe28fe9cdc468af70cbbb65f2e7d7ddc9bc646f3833f470f5be4c1a5ae00622b0dc3d37345dd2b01d04d8093a8f983780d712906
+EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
+EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
+EBUILD boto3-1.9.4-r1.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
+EBUILD boto3-9999.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.10.2.ebuild b/dev-python/boto3/boto3-1.10.2.ebuild
index 7ade38cf0450..b19ce9f817ab 100644
--- a/dev-python/boto3/boto3-1.10.2.ebuild
+++ b/dev-python/boto3/boto3-1.10.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-1.9.122.ebuild b/dev-python/boto3/boto3-1.9.122.ebuild
index 7d65a1022251..9febd85846fa 100644
--- a/dev-python/boto3/boto3-1.9.122.ebuild
+++ b/dev-python/boto3/boto3-1.9.122.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-1.9.4-r1.ebuild b/dev-python/boto3/boto3-1.9.4-r1.ebuild
index 7d65a1022251..9febd85846fa 100644
--- a/dev-python/boto3/boto3-1.9.4-r1.ebuild
+++ b/dev-python/boto3/boto3-1.9.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 7ade38cf0450..b19ce9f817ab 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 04dd095862a9..7ee46e6e23f0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,9 +3,9 @@ DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdc
 DIST botocore-1.13.46.tar.gz 6069713 BLAKE2B 9d10fc46314f379ed384f2803d4bf43b10e73607e4f8d29a2edd0c067a3df5f2473175d70276c24939e24393d496b9875c4509ae7644b42d0899e5627c660f21 SHA512 71c60edef4f49f88a52305568f9b177ab8fbb9048203b3f7cba85dd676e4a3fc02f2ba0b07afabb6598d7e8f6d6703446325275f1fb54209e57ee51d1e3b2a8e
 DIST botocore-1.13.50.tar.gz 6076129 BLAKE2B c969ba8635970eb7613124cafa3f7d1efaeec22699857405450a5e669f19733cf3328839d8dc568b7b46d0e2c05a3a649d97805dcb50e047c455bfbb9fc32901 SHA512 8c7fb409f9d1cd47f2711cc5cd34e7459087b50cd257d4f943b475d195ac141e01c3be53194cdb045d6ccf4ea59fdb2e485899275bb3185e6e562318615ec14b
 DIST botocore-1.14.7.tar.gz 6092020 BLAKE2B 925b78a9414154838b4997da90a7916036a520725a99d187139250db7de70f0ac91437d8231e2880519090fc5143efb9ac7432c78303a5d7ce04f8e91ad78cfd SHA512 743cac75b1fa9f257f7b79c32211b061b29f359a97cf256ba8c3693eedbc186a43805d507d0e5726c49ef74f9777c68b3a204347d79058a0cc4f3891fce2fcc4
-EBUILD botocore-1.12.122.ebuild 1506 BLAKE2B b5a4a7065d643096e02e55cee757486a2ec5a7f311a3774e0bb0d926dabc0974225d9a2283a52bbb48aecab23e061c1394836590329c33d0b93cbbb027e30faa SHA512 d05c54c3d14f16f0de77f2c9eb056b23367b19c7b1c45dc575c80036132015dd28c272a80cf873a53e514af7aafbc19a7e45f8a2c0bda6d89d27518ad472a58c
-EBUILD botocore-1.13.46.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
-EBUILD botocore-1.13.50.ebuild 1508 BLAKE2B 3a3e0a8a5c94683957a0967a919a36ec2ad5e4b823846741000754fd44f77132f8049b3c7fd732cbcd50966ef5c7c921732cbc3eacef0b32500e4e3938255212 SHA512 8a2bf4684498d21163361d4e493f86349de79dd8ccbb14f36fcafd6341a922851ea261a302022114ac99431c1247752beae1a143327131fda3fe9cc1a3bcd8b4
-EBUILD botocore-1.14.7.ebuild 1518 BLAKE2B 3501da92bc32c5b0b2777c19309c866f84dc993dd0a5fbf956f18fc232c0658cfe7ed5aeaf610f6c544f1ac62a93e65c47880bfa6013ffbbf43bf7977a93146d SHA512 b26bdece8c3aa2e2ef8d5b68c275cc5abd6cf79f0f4bedc70bc5f850116e2fd19be96f85ab3fba8fda92c0d3b8e5728d080d96f2a7beab498aeb9a8d31ce10e8
-EBUILD botocore-9999.ebuild 1518 BLAKE2B 3501da92bc32c5b0b2777c19309c866f84dc993dd0a5fbf956f18fc232c0658cfe7ed5aeaf610f6c544f1ac62a93e65c47880bfa6013ffbbf43bf7977a93146d SHA512 b26bdece8c3aa2e2ef8d5b68c275cc5abd6cf79f0f4bedc70bc5f850116e2fd19be96f85ab3fba8fda92c0d3b8e5728d080d96f2a7beab498aeb9a8d31ce10e8
+EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
+EBUILD botocore-1.13.46.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
+EBUILD botocore-1.13.50.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
+EBUILD botocore-1.14.7.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
+EBUILD botocore-9999.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.12.122.ebuild b/dev-python/botocore/botocore-1.12.122.ebuild
index 6cb36e84b365..2137a90141da 100644
--- a/dev-python/botocore/botocore-1.12.122.ebuild
+++ b/dev-python/botocore/botocore-1.12.122.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.46.ebuild b/dev-python/botocore/botocore-1.13.46.ebuild
index 8fd7899b8b6b..766ab71b5328 100644
--- a/dev-python/botocore/botocore-1.13.46.ebuild
+++ b/dev-python/botocore/botocore-1.13.46.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.13.50.ebuild b/dev-python/botocore/botocore-1.13.50.ebuild
index 8fd7899b8b6b..766ab71b5328 100644
--- a/dev-python/botocore/botocore-1.13.50.ebuild
+++ b/dev-python/botocore/botocore-1.13.50.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-1.14.7.ebuild b/dev-python/botocore/botocore-1.14.7.ebuild
index 060f32f24f36..f9ce3c85acf8 100644
--- a/dev-python/botocore/botocore-1.14.7.ebuild
+++ b/dev-python/botocore/botocore-1.14.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 060f32f24f36..f9ce3c85acf8 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 17e55b04b88a..ebc1a6b31c8c 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,10 +1,6 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
-DIST bottle-0.12.12.tar.gz 71554 BLAKE2B 4b0d0d77c5ebaddcafd44e16a052535ded566245324d39e97a39dd20a193360487f9489e8e89471dd92ca35d6c5b2e8cbe1572a958db31b69d32d3e32f1b6403 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31
-DIST bottle-0.12.13.tar.gz 70870 BLAKE2B d8bdef473181ce1cf6c0d1ea3537c407e68d23c1c44ca33e26c647d3b3783040d466b594c56c10cdd007d23bdf1708412d3e3ff108effa9e8a92e1b22f7a6c69 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b
 DIST bottle-0.12.16.tar.gz 72248 BLAKE2B 21b5bc376648baec74577ac5b57fcacc58899babe07a034a436d5e2bde75a9e2e48b2569c5caf1478e77790c5fa327114ab9b084f014cc1ba97637d9ddfec659 SHA512 3c167f95902522c8f264e8478403da8e9b8cd84594318c4a773d38b7548b5ba95c99ef922033f6885cdc044b31f9c2e2f7ed263886637ce2a048e99c0c6e1403
 DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
-EBUILD bottle-0.12.12.ebuild 1439 BLAKE2B 03689e51e3e9d824be9e9c0c17c4ffec086d08143b1e34376be6e1fefb627686a9af62c95ca1eed4d0f3ff8be5127868b3bbcbe9dbf6575d2d02e9a5f068a297 SHA512 3e644818e3c96eb1a2c110109a66597353e0891b69a605e8c371fecf6592cce628c2c450ea206f804c797c487fc47fcf43318b8dab4322b6c2c1af60a597577a
-EBUILD bottle-0.12.13.ebuild 1452 BLAKE2B f135d7a49b999e4a718f852f460942f203c6bc421e17de32d14941ae4e8f7ec064b2eab6a29334146ae9fc9c74d41c9ee549b523c318c1b5fe5674295fa40ed7 SHA512 e788e402a32f4c1cfa8535cab12f4d999935a562475ce7d1179032e4aa062fae874a85551cd8bbecb4b9522256d4c9ed0de964f91139bc701cb7b51dcd629bb7
 EBUILD bottle-0.12.16.ebuild 1477 BLAKE2B 298e895147ca927d982c649109d3f40c515f11e81fa3367b38dfabb4b8263d884e4b83103999fc204da51b060aebad10a744350def2639db8103db95dadc2c90 SHA512 7c6cecc35d259c77fa1037094300119c0845dfd62307c7e0290d908eae6173f45a5daf4c85d78089102b2fffeae6c5af3c1b2a158657d897d749b4b77636fb38
-EBUILD bottle-0.12.18.ebuild 1446 BLAKE2B 403af2044ae8ace7378ccf2d7d6456b35af95dcf74a6314b04166ecf2cb256c4cb980e36f670b7e5d07065932fb9c2f4cdb6dcbe23a8751cc23df9116c7b1ec6 SHA512 8deb026f313edf9c4f2ba271935df3dbff0e00cfbe8b8a32b959427fcf4ea35e334ed93027fb88b037e257d81a38bc5603bbdf8189406d750c29d2164e16814d
+EBUILD bottle-0.12.18.ebuild 1395 BLAKE2B 9cf0ec3cc42de061691ff79cc27f22ece1a4126e9ea8063f3c3a262650b0f4db38eaff5d839e460d64e2edd7e4f9e9e4844359c44e6ee737a1c413217a2c70ed SHA512 773dafb7ff8cf1d63b2d30ac55ececa78513234ec03512ef7bf0fbd88fb4abcff1f9bf9d36603d94771fa3afc6cf2dbd32569fa6f427267140c1b64ea718768b
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
deleted file mode 100644
index 7ffdcd18c13d..000000000000
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
-)
-
-python_prepare_all() {
-	sed -i -e '/scripts/d' setup.py || die
-
-	# Remove test file requring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# A few odd fails in the suite under pypy
-	# https://github.com/bottlepy/bottle/issues/714
-	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
deleted file mode 100644
index 6b4830583b0e..000000000000
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
-)
-
-python_prepare_all() {
-	sed -i -e '/scripts/d' setup.py || die
-
-	# Remove test file requring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# A few odd fails in the suite under pypy
-	# https://github.com/bottlepy/bottle/issues/714
-	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index 5c483f67e834..a192f79e796b 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -13,15 +13,11 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? (
-		$(python_gen_cond_dep '
-			dev-python/mako[${PYTHON_USEDEP}]
-		' 'python*')
-	)"
+BDEPEND="test? ( dev-python/mako[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 95eec184a7ae..831b3bf91030 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,4 +1,3 @@
 DIST bottleneck-1.2.1.tar.gz 98920 BLAKE2B 02fd35eaa15761f2008e46c459d842cdb5ad16372a03ea51a82b775ae0fbfa81beb0f1f304dcf6565956dc2d6deded579d8e400eaa250f9ab639261c085a6525 SHA512 0299eb1a12d808f18b8c4259c2205b47b34af4c1245867ab0857eb34a1aad630507cd3307a16f522db461977bd3f70aca688fb6a62ae84d1f895d18165132781
-EBUILD bottleneck-1.2.1-r1.ebuild 713 BLAKE2B 1448d0874b607214d0f7dd5915ec9969a81221c62f218d58666c3450679370d58daeffb37ba53d1e80818553bd2c6d3efeca23efc9ee177bbaf5ebaad880a9e5 SHA512 39e2526ce85368aa645c0a6d0009deec4a7d8986bbf716fb65a331531fdb267b134c1b769c7d25c60dab2d5f28c991e051010c07120cd095e5bbb73b5c430c1e
-EBUILD bottleneck-1.2.1.ebuild 721 BLAKE2B de74cfd8ef1b4cc0d43d3521ef4c7a28b021581692d85f47f246d50e648b40b75cb2d006137d4764cec4fe9d371fe02a8a6536ebb7ed71600bf8adf309614703 SHA512 1be4ab226e4fcc2860b8f2e3483f3feb962d6a8626deb875a90d14342801fae65c3b448126df99f2f6d5c780ef2e1cde1c4db7ee61fafe8dbd2f28bd05978d49
+EBUILD bottleneck-1.2.1-r1.ebuild 711 BLAKE2B bd462412d48f4bd87e4c7102ed748e923a8bbf3d1c0f8aedbfdfcd0ffb493bf52b0690cd25d3c5ea70b209991a1370d02881e160e289e3edbced5576e8dc3068 SHA512 fe1ed1054820f044dcb3341dfab96d67deda471194123931c59375b48a33e69d68fc6c5e03a850bd40909a575afc65ca5b0a79c98542b2a4239978d4e8ebc4c7
 MISC metadata.xml 471 BLAKE2B 9580e4438e0fb3dad08815f43e730b365be1ab25b4a308ab6c90b00d0c5c58a1bae8063fd2df68fb68542010cbc14e3626b4baf3b43adf8f38f44c7d87b74038 SHA512 9f31d5257385cb237ee675671473fcb8e932cb792fadb30bcccccdfad9f1372207e54abc3ec2712735e2250b9a583578d2a3e7e8a32ade30d634f620644c3def
diff --git a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
index 833b7c25e772..ffe790c6fe3b 100644
--- a/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bottleneck/bottleneck-1.2.1.ebuild b/dev-python/bottleneck/bottleneck-1.2.1.ebuild
deleted file mode 100644
index 6221eaf82420..000000000000
--- a/dev-python/bottleneck/bottleneck-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
-SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose )"
-
-python_test() {
-	${EPYTHON} ./tools/test-installed-bottleneck.py
-}
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4e64e2c19159..2e5e540a4d91 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,3 +1,3 @@
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
-EBUILD bsddb3-6.2.4.ebuild 1937 BLAKE2B 10e7fb47b31423214a3c11e6461d1b71c01d1e942b9d707a1981f2f6961c4487816b2322a16699cb6b9ec008b9e426067a74ee0eeebbd11108a90279107d201f SHA512 e8d2a467756ccc39e56603acc3be3500c61fd175b06f3150aa73975faf3d544d618e63b0b94f22bd856815747a3845b2b21f3b4f8488c9a383705ab6045171f6
+EBUILD bsddb3-6.2.4.ebuild 1938 BLAKE2B c82af30925d9f1ccfef5e3f4ce0e63e253ce103456e19b826429a49ecb26f0f3f4238d82efa26190a300fddbd58aa595b3acec08c3d7cd83cf764520e2889fb6 SHA512 06df24bb6b5ce6613f153072b04d390e7cf3e4a993f20dfa7f3a804961657d750345cf0c5219bb9fc0c811cc10e49ed73c1829f122a19d2f2f569b70eb2c7d72
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 009dea51735f..2a80c2c5e78f 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 1c22bbd7f18d..62d7c4cbcde5 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 635 BLAKE2B 692f5a5878abd05f3d014b5d580d64f8c73ce8933791c486c4a3a01f7cd155e9811522257eb397c095bc829bf7ad19bb5bed39b90193b3542b1ad85ff9849f5b SHA512 7ca5e59fae91de473b23df92fe478352a47d5be7b7b192b8066907fd1f5c0ece3f943b3b7fd71a68738b30fc1856fb581d988b2a81ce252db739c6f651d4bdd0
+EBUILD bz2file-0.98.ebuild 636 BLAKE2B f90c6cf04b031a96fad5c61ad9bbaa8d98c42abfa7fb3eafc61022b63da321ecd6b35b5878a9709f1ee01f2e24249e74e68a87d27da46ba7549d36424543ceed SHA512 a203a36e17bec5cdccbd689612081dc904e3ff0288d9748331fcc234c25f76d0f7465096ee6b36cf7b64ede44d54f8ae2699656907c0d86d33b646bd83d3841d
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index af4f8e3f6261..13fda01e07c0 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 14f79505809f..7b2191b94b28 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,5 +1,5 @@
 DIST cached-property-1.3.1.tar.gz 9648 BLAKE2B 154208108cfbec914519f2a08ecc6ad025c284726d65a001eae84701b1eb8479e127473c124b08d3b0d969f59798f9dcef473cd8209c248b1d5b016a0bc8dac6 SHA512 3349751d442ca6e7d4e792c8b076735d5308d68244af9c03044f3d72d619a5c3d7d5dbef434caa954db4b983245bfe646d4a25c99aec39f32d99751edd9e233f
 DIST cached-property-1.5.1.tar.gz 12791 BLAKE2B dcc75564d3b1dbb2f34ea433f4a477b2fe0454047f1fb4825cc6350458bf09509cf970b308744d79eb3b17f96c04c606ad36327c7e24f0b13f412880d9ad2ab7 SHA512 61bbedb48336af7c0b465421eb4d3b6b48155cfe4fd6270ff49caefe0d80e40b50c4801a68a5564931d316e374b69112ad14f72687a015ce81aaeade6fcf9ce3
-EBUILD cached-property-1.3.1.ebuild 641 BLAKE2B d1f72de56092f4580a76b557af48b1d9c020a00787cd0f93ffd6e1fa2c1797a1076157a62a708c5f90028f3a4ed633673b5fd95ae909dce3bb4e3a00d27d991a SHA512 68b0e5ab142999cf4e0a17fa41facbcaf69b08cb8f8bc381af2f567a43153061e507012871c38082cc8068beb067d8de887dcb04cddb322815d539318864ac86
-EBUILD cached-property-1.5.1.ebuild 935 BLAKE2B 5b75b5e56040c456beafcce06dd5a261469370b9373935e2b939a459a9c12e507c9e3290c49698e3b66c70368324b2957001de74757ed8f745fc3e6058b0e444 SHA512 7b55d93ed72501fd7b3a8f5652c3d75d1c9d59e2f17c92ba47648809fe3000ddc19867abf9e8bfdf15982467f332a667b46a81fd7a567339a0f6f1c2b6c2ba7d
+EBUILD cached-property-1.3.1.ebuild 635 BLAKE2B 1390784b854ac7112b54ea64c109deb5060bacce161b69a19c16afb9c97d5534f412e1058846ef211b1208cb91f497e110f1bef775f5c79ce5f1319880bff544 SHA512 2cb420fe05e82f39de442f4836bb2d72a4ad8a31eaf7b17fd1e6409457becb80e4451916e0d27566101ac67b9dbcdb0843c1626de0e11ab8f499c0894e1d5399
+EBUILD cached-property-1.5.1.ebuild 931 BLAKE2B 75a53f8b22f62a5d64d6567e2e86ed30ba130602f12742f527e0c244cd1091202a05f6c55cc1852ad466b008daefca7acac51d4753316fb1dbdf40f5a6211d1e SHA512 9b394435aa04196b4fe5f0e3ad62118f8fd6067944b6e44f92d7309cab67429e0d1fd68fe21cd25e665e1af63c2227e48fc9dc2457a9dd1a18ce70004c15f50e
 MISC metadata.xml 489 BLAKE2B 36f59b8764462acd2920868cc5b5c84e27cf2e86b1356a76a816ec60a5f69bda780a62a811aefe06639827bdc3257128cded2d6c2e53e8c4516af9d1b9769879 SHA512 cecc6d43fcd54d1a949a60380d91a313d0464e0858be0fd544a76232f04961eca2530ebddaf6daabc5f050bdfe12092c99028c4a9cd33a14f23c0b43befe7def
diff --git a/dev-python/cached-property/cached-property-1.3.1.ebuild b/dev-python/cached-property/cached-property-1.3.1.ebuild
index b2614e31f34d..48b831e191c7 100644
--- a/dev-python/cached-property/cached-property-1.3.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cached-property/cached-property-1.5.1.ebuild b/dev-python/cached-property/cached-property-1.5.1.ebuild
index 6504e5c26987..879fa766f1b0 100644
--- a/dev-python/cached-property/cached-property-1.5.1.ebuild
+++ b/dev-python/cached-property/cached-property-1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index ef47c5714f5c..94c7355880ad 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,3 @@
 DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
-EBUILD cachelib-0.1.ebuild 506 BLAKE2B ea9a9a7675c8b846fd65ecbc30957f3978f379adcb56737ca10a2a120b4ed3c4be7c04b0c4fdc73ba69c780dacba3ff0b221857d6d1daba567f4cdbb2e9d4d53 SHA512 9e158ce3405fd96817c56e3b16b46b7588b60d293ae3a0739c8d9000434551a8fc367de3e495862b226a618ec3c5050eeebbed6ce71dbd94799f811be18c0294
+EBUILD cachelib-0.1.ebuild 496 BLAKE2B 369f25ccc577fbf1a91a05d4d63bc5c839229f89363e402bda6dc5e7fafc29b0e338d0e2352dfe288d7c2dc47cc4e84223d84944c816475b30794098fe1e9d8f SHA512 7143eb1801af020378696b4b3dab931194e88aba1bee7ba7aa221a89f5c086eea9a53e4bbf5af1301696f50fac5055b40f3bb414cea2e07682d4541dbe84e5a5
 MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
index 937ba108d67b..884023189b6e 100644
--- a/dev-python/cachelib/cachelib-0.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index 95d1d29ff025..78a7f6f0234b 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,5 +1,5 @@
 DIST capturer-2.3.tar.gz 18380 BLAKE2B e51f7013715e1bcf83da6126804aa3c223fcfeb7c4f958038f123e19dcb807bb480d46ed17307ccc312b2d5873dc9f82ed90f7be7f01b7062ef81c11829c6698 SHA512 267c6238ab143894f3d74002334b99e3d1a59a3bf30f5ad04d6f1a81c9439b1369fe161859f86924280e3b9e47536e53a0a80045acda9ae471ded7d751e01470
 DIST capturer-2.4.tar.gz 16963 BLAKE2B 329e388059a033993cf2ac3744a8df273beea0239f3696d19aece57767b0b5cd3397fa095f860c4f00ef24e8cd6bf2e58aab4158a86cf8c0c09c89d2065de0da SHA512 d85614b0424ab8817df9475ac0d230d7151289a3353a3c043a7fa89dac0528265a4dee535cac9ad0a3c2fbb0cac18afa69cd0a405b1becab55f9a6be13df0c46
-EBUILD capturer-2.3.ebuild 819 BLAKE2B bb6ee7f47d5da9749a8e8f8fd14bdc05c70cab11fa4d36a2668d550af2662ed2e552628fa97f6e3eb0267f3ea92efee2f34d1071f0219e5cb93f93c0c4abb994 SHA512 572eaedb97a9937ee2496652fd1875678284292c20c9b20c531560ae0a38e32764ce0fdf157a2ef566c85d453a01ae615d67dc00c73e991580e677725e4bfecc
+EBUILD capturer-2.3.ebuild 809 BLAKE2B eca38ba76ab3e0b24a77a99d5b4eb9eb49c55e710d57f49f0afac04806a0711ab33befb2fce72c1e4fd4bcb79160b48b0d8eae99a5827a557d88cb847276b447 SHA512 242c9bc92fa79838267da630cc77fa4f45c897204da12a4ad1d13f8552f002879211fe9370b7dac1286543dbdfdf15020ad42fc764e20446ca05ef0ddc6a95c8
 EBUILD capturer-2.4.ebuild 733 BLAKE2B 3b2e407c6e1e842fc213ace6280469745431f2371cb29171f88f09dd0b8873a604a5b9105eb1d6cd4db8891abd825b3802071675413a200d497a84ae1d039125 SHA512 24945b44f640b340b573b180dc3c64057b33e7f59b201e0c16a1a10617a21cc16759b1f16bb7c25149bd6b29f325a21d29598cef8bbd2fa928cfc36db93813fc
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
index 31a964c7bfe8..45eb0e663712 100644
--- a/dev-python/capturer/capturer-2.3.ebuild
+++ b/dev-python/capturer/capturer-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index feb418e4a78a..c8d4dd3c09a4 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,13 +1,8 @@
-AUX carbon-0.9.12-no-data-files.patch 817 BLAKE2B 33a5f118d62bb5be6e95822490213c431d80982a5d95644031e8d1d3845c1612049abf17e80324efe9421f212fd7fc7f6b98922afca3fb066a14a443d738056e SHA512 549499d5f1963f2eadc9858e0744a1b2b30830e4069f6881d3d912b9709e3cc0f0c3c01730790c975a57209b671c6592c1dd650028a8a63dcab84fe960f5ed58
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
 AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-AUX no-data-files.patch 881 BLAKE2B 6e8709eebe73d3686ee401a7d5db45471ba1a53b894f733a211b62be5c5c1920dc732fffeaa771a57f03ca692a63d02c55d9efeae3ff393910245cbb15e2f1df SHA512 13c2e946c42bfabc643ec39a0d384b887fb1ceaee9791e0f7c2ed037069492aa80ff4f4b593dbba7253c6e5f553e0a7d1677333a896067219df4206f742d64d7
-DIST carbon-0.9.13.tar.gz 47509 BLAKE2B 0f967d81846139164278b99aa31237c8065b7d60a13c9a6153cf3904dae52bf0e8e502d156a178f1dfdbe098236d97f8982fc10e6442351270d103adef2bd74e SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776
 DIST carbon-1.1.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b516ea4c754f9b3cd37230f54b63d202cfead9ec4242ebf78031c2671050354dccccde2980c4101b9699b1393 SHA512 0cfa9260484de147660110b7d2cc7e41bcbd7751c80bd5c557534b2a52c2183fdba94d40f8654fe54f593b2ab34581b2480e96c8a6dde4d47de783153a2cbe65
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-0.9.13-r1.ebuild 1843 BLAKE2B a8ba9d28061af7db44af73e714c33b96b61fb90af199fee1ecc6fdd0d6db5034cf876e33cc73b1f8b6826c94c76a62755cb56eb650c2e70353ec2e9c2be9fd9c SHA512 e82fd28ed25b8e10c3f3cba93fe307f209a09a5bdba8ef1b2e1acfd2e696cf45b3c2ed36f0fe9e7ec1e74b4e6a533e93d95c705a42c4575ca1ffea50e117ce75
-EBUILD carbon-0.9.13.ebuild 1838 BLAKE2B 0810875d6f256a3af040a41d8c05104fd2c860d00e50a0ce4f2e19fe97716408e777fb8dbd392d3810549671b3c2ffbf8ba6a9e59556d9c1ed389cf6e9e8f094 SHA512 97502916be13d332389c68b30366ef6b254270cf1b8c702318f18efd2019950ccefae0815d17a467879e60afcb557dbbcb6b412ccc21c9f84e0cede6986a843b
-EBUILD carbon-1.1.3-r1.ebuild 2118 BLAKE2B 8acd4660ff77218fe0b91af19764a5f4f26f9655dac7bc107ecedb6d9165e8e2039336c3e51ab7ec3114cd5efc2affa0c2fcaac5568f74b10085865f02e0145f SHA512 639f188212d18bfd3ff9e12c98a4b3f04e38808f02c9ef4510e9e202ea20764eafca11b5c15cfbeb14c599096bc03cdadbb5445f1e4033855fd1953367dd2271
-EBUILD carbon-1.1.5.ebuild 2029 BLAKE2B 7d1bc83fca553a044ed6ffcb3d17fcedee9b9175718e49350ea7234bdf791d3f8b540f92c48efe9de47254b5947778a566e9cdee9e3de9d5fb1f216828da3d40 SHA512 b457a70ce53fe6fd9afc3b0022db563594d0654d60c8beebe067928a920716ef03aac70c2b187d600b541f0676184eca73818b6afe992c3c7e76272b76306496
+EBUILD carbon-1.1.3-r1.ebuild 2112 BLAKE2B e6a02862ed86e29b81950c3e72817c41361206c46e53767aa6382f9beac45ba806668542d1de3268e8203172b9684989465706dd89259fdd0da8d58f71f08aa4 SHA512 efb25bc72744fd9c7133ffa4090ed25fa84d2262b6d9c418886b62ff1e958327d124b34e1d3dea298f6629fb289ed1fdc290b8e263c9a78aa48a9decb69a3050
+EBUILD carbon-1.1.5.ebuild 2023 BLAKE2B 2aaea9e8f1721ba82473ce1d801db5d3e2ddb2930841324abdceac2ca0b69dc0ab13b998b09917272a20064c5740b02543c4fe446d953ee619b365ea15fba858 SHA512 1e85755445b607f1048c1a790ee8a50df4db1c71af17471c4ea0c7ee7348492df0f86d72e6f3edf6e9d84ab1aa8c1d6d267e3bb7717cde986f5b54c85383728e
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-0.9.13-r1.ebuild b/dev-python/carbon/carbon-0.9.13-r1.ebuild
deleted file mode 100644
index 2cf0631d6fc3..000000000000
--- a/dev-python/carbon/carbon-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
-	)
-
-python_prepare_all() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/carbon/carbon-0.9.13.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild
deleted file mode 100644
index 6bc41708af67..000000000000
--- a/dev-python/carbon/carbon-0.9.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
-	)
-
-python_prepare_all() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/carbon/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
index 1a6e761e0a81..9bad63510273 100644
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ b/dev-python/carbon/carbon-1.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index 7aae679f68c9..74d2937c437c 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )  # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python3_6 )  # 3.7 dropped due to dep-hell
 
 inherit distutils-r1
 
diff --git a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
deleted file mode 100644
index 129c7189f3b0..000000000000
--- a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur carbon-0.9.12.orig/setup.py carbon-0.9.12/setup.py
---- /setup.py	2013-08-22 00:53:16.000000000 +0800
-+++ /setup.py	2014-01-26 11:20:59.705864697 +0800
-@@ -13,12 +13,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
--
--install_files = storage_dirs + conf_files
--
- # If we are building on RedHat, let's use the redhat init scripts.
- if platform.dist()[0] == 'redhat':
-     init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
-@@ -39,7 +33,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=install_files,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )
diff --git a/dev-python/carbon/files/no-data-files.patch b/dev-python/carbon/files/no-data-files.patch
deleted file mode 100644
index 7b0c52f3948b..000000000000
--- a/dev-python/carbon/files/no-data-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Do not install the empty storage dirs and config files to the wrong
-location (the ebuild installs them to the right location by hand).
-
-See Gentoo bug #417221.
-
---- setup.py
-+++ setup.py
-@@ -12,9 +12,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
- #XXX Need a way to have these work for bdist_rpm but be left alone for everything else
- #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
- #                                  'distro/redhat/init.d/carbon-relay',
-@@ -32,7 +29,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=storage_dirs + conf_files, # + init_scripts,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )
-
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
index f6cf0ca8cf4e..0cb68a397c56 100644
--- a/dev-python/case/Manifest
+++ b/dev-python/case/Manifest
@@ -1,5 +1,5 @@
 DIST case-1.5.2.tar.gz 58382 BLAKE2B f5924a7bf276087e469ec43780791e7eb223daf9649eadb79060066ea0125931e5534762b148b0b3b65805bd05c7111bdb0b598df12d056535c01662260eeb5f SHA512 82c0ed9a788fb57c4109cdbe24822fdaeb59fdfd5d7ebe0c93a39e8e2a2745e911d6dc1b679ac46e263eb6041bbc0ab46b20f3850c12f8f63324cabe145ebdd6
 DIST case-1.5.3.tar.gz 58469 BLAKE2B e535664cc616ac14d1b13e01abe44544fa470030895237711456eefe1aff0b79876b2225344065416149f7de444bf4dc5bef22a184b148e059a8b1f38a394619 SHA512 ae98a571c282f80c685c42ab1dc578847fe88cf8cd07faff505a8df8e3282a602908a8780ab88b36851e3ee6f3c178405e5c50776fd0f49fcc990087575f2958
-EBUILD case-1.5.2-r1.ebuild 582 BLAKE2B 0fa5ba7048c1f84c4f9658dee4b208e526693d230afba5b64effbf957d2d423c236912fc4d440aecdf26a08732ce2c3913d9df0b3d42a09952f9fb4327d5c91c SHA512 33351c5a6c93cb5077717a8f5f5fc1181bdc35b34c6ca5b8ead70dfb0368594f2476c38c639d5fdb92506b014a79d19242469feffdf27135fd74b006e80940e1
-EBUILD case-1.5.3.ebuild 584 BLAKE2B f1a57535f6615f9470397e9ec9c35095d13e48f34c812dcf26f51781b0b17e36475ad00276087be1ec2de5287ad27b9bd0530a0522175e8fa5266dcc7fca2eea SHA512 60cad791a9e6f23e84fb5ae3428764a1f5acf655516bce92e394be2b0d927066d59783e26302370c4f2feb000d35f5a4a8d7a56ece1f45b501dc1a1280b6a2e0
+EBUILD case-1.5.2-r1.ebuild 572 BLAKE2B e7381c9ac627b539d7042ff365507ea05168be517fc136345ef61fcd41a8cb2f326adbfd321a7a9c77e3fc49efec352ff702b28dca6d6b61bea68833a6135d0b SHA512 cc63d61b39ece6bc3cf84998cbbadab57869adf28b7f534b9b15abea6cb5b87c60e3056a3d02e016fa1f64fb609cb9301bee84b59a9b274ecdab67e80cdef2d8
+EBUILD case-1.5.3.ebuild 574 BLAKE2B 9fd93b4c218a82083b0bb832fb4f9515c6031ef6ff332ef3cc3ff4381c7dee193e9832d456191ec1c68ed1be20580fa7d0282f19b854c67dba85bdd489230e32 SHA512 b9c07a4caeb48b32cd29f6da4230e11061e2bf92eeeefdbe288b712a4b239edeb438461a0c6d50421231951fbe2995c6a136f3acae58da4355b7c22242f19f94
 MISC metadata.xml 336 BLAKE2B 4190ad7722be2f40f19911895aa86b9181bac364174de9b3e9016c541b0f1ddf53114533a6ccba680cebd510d411ac2a1f5d32abf04a71016dd7243143d8c7d5 SHA512 c0fdd3bfed03072c578a781b4aeb08728b17c8f9b22f4ac346cd993604fd634de8f94b7803c73f7285f87bc4f0a2245536f9a9bab8a254052bf10b8c979a3a28
diff --git a/dev-python/case/case-1.5.2-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index d078118426be..85cca93f22aa 100644
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/case/case-1.5.3.ebuild b/dev-python/case/case-1.5.3.ebuild
index 6a8f2b244ed3..6dee7201f575 100644
--- a/dev-python/case/case-1.5.3.ebuild
+++ b/dev-python/case/case-1.5.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index 22c92363f555..ff29aabc10f6 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -1,3 +1,3 @@
 DIST cbor-1.0.0.tar.gz 20096 BLAKE2B 0e15bc4984155c1046836c94f3025f8dd451aaad438c78de25a739738e6de8d3ff3e737dbaeaace3d837be08e9702a3b7d18d840c0bc5459cd3919159eabd728 SHA512 996b61c7d16cbe8bd7b056d09286a17f3a6a29cb97ef9e5ca1d1bfe8c53393ae3d2b7565c937a283cb78f377af14c070bd663aabbce995dc7e5b9d2f69a6ba73
-EBUILD cbor-1.0.0.ebuild 494 BLAKE2B 429ab2997fd0b52c4ecf5d5d66715044ae1d53a8ae2df908986aa683ea0db32883ef6d2841ce86cc51aae2a0537ff25e369facd71494bb153f5804deb004c81d SHA512 b57fed6e3c3a8b111ba600d82418b43c42fa256c83c7717906ddd8dc30271a5fbffd8e0b982fbbac5e6457c9cf75082e1021ff1c977315576095853837aae1fe
+EBUILD cbor-1.0.0.ebuild 484 BLAKE2B 32934de8d3cdac01f004d9ec081fb040283d4d35dbc737935d3064b0f0f4637739f4ba1a4e6d46a149a5def4288e5ccd200ee461cdc05ae188cb8e1c860ee5d2 SHA512 f22da8e43dc3a7bde8b8168587772d1db22c2e71bab7d4209c94cb4fa6d6434c357308b43b39a24839222b7653977560d36a1a08792d26f7eed6e58835cd95d7
 MISC metadata.xml 996 BLAKE2B 086a81c0714c78e89681623baec48d9b2ef864a107a1ef87a2bbccc1de657f96e6250f03e028f724e59b6bd70fe9970255d4bd2c13faf20b696a9fd330fbf36d SHA512 eadcb582ff299f943fedef2af5932750a9530f3de9c0962d1a288eb667eec5933ce5b96b5fa9212a3b4020f70b5686ead34e2591f24aec64f1b21c2ff7a69e6b
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
index 2373bdc11cf7..6a6e9b2d68de 100644
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/celementtree/Manifest b/dev-python/celementtree/Manifest
index 2aeedab063b3..c5fd33896e05 100644
--- a/dev-python/celementtree/Manifest
+++ b/dev-python/celementtree/Manifest
@@ -1,5 +1,5 @@
 AUX celementtree-1.0.5-setuptools.patch 322 BLAKE2B 5da2f11073e8f52505bb6c9ed8be446164624ca6b2032343cf5e064534db68804d04848413c2676d4bd50f3a07528cfcc6329bf2c6c31219eef11da8d01379a6 SHA512 d72e17afb23f9070797a0d8a88cb48df8c59de8c4f8db04cfcff7499e68d97f37e79569c1a763aa1670af8a99c9efe3013396a458a33ac8a338079fa25d4d792
 AUX celementtree-1.0.5-use_system_expat.patch 1069 BLAKE2B 2655c03b2e7faf0528091138de58a4bffcd2074b3f9979860a234d8b8ca474bf0f0071b891f3292eb0173859e831a6c78a8d763b7762c21ba783cff848f9bf8c SHA512 2b343a2aa5f30c1aa63acdc47cc89417f3622d837e846e2756098123f8491d140660c123d4dfabb4947e82b9561fbc424e31d3685e223db337a1b451bf2008c1
 DIST cElementTree-1.0.5-20051216.tar.gz 93766 BLAKE2B b3d70fdec8361b003915215e0007460bcc5947f96c293941849ff0c000eb689dc33f0d32a5f473370341f0e0749183717a326e79ae23a7e4c15f4e4ec9970366 SHA512 2cb99e4980580f186eb9b8740bc5a3e6e85e714a5d1f613850a8f12f7dbc125c8aa7770f7fe70480fb96999212c11181ab681822c74429882c1dfe91c20e2af9
-EBUILD celementtree-1.0.5-r2.ebuild 1113 BLAKE2B 5197267832a62fe390282e4a183008dca9b0e42029c5f7ab771c08049ee1fa666f2583b09d4e0b5463fef0ac966c3be7dffdb422ad348bbc299c4e42d1775051 SHA512 6093f51a38388d12aba297406cb9c36e4be635d2159c9d234e9356c989381856390c82c68d6453da5270de692d0cd4042d00ba1a68a11f7aceec33f535d68ca6
+EBUILD celementtree-1.0.5-r2.ebuild 1114 BLAKE2B c45dce637f2000c428e75e2674587f94df01fa38bc4fd766a701784b82b5099846d6f2bd8b866c7b7eb22fe3e4a7394e1105e7978c2168ff1cfa6d9bdd64c3d4 SHA512 22db3a1192dc608ca796519a7a3fb80c923c342106437269f6983a399266faf2f50160fac527e01f18f263fddb65e01725373e54a0a3b9bd7c5730ef5d5c0575
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
index 85287f1cd737..d8117565b361 100644
--- a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
+++ b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="ElementTree"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples"
 
 RDEPEND=">=dev-python/elementtree-1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/celery/Manifest b/dev-python/celery/Manifest
index 56af385c3836..9a887af00c5a 100644
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@@ -1,7 +1,5 @@
 AUX celery.confd-r2 1442 BLAKE2B df6ab3585c12fef2272979ad3412f08827f59e9306b7b997642ee8bd0d4c84b168f32fd9b6427be3c889af411806d37673853588999d366b549908891491bd6e SHA512 ba3172e56a18df963b5886497c51b8aaf5298b5f3055214217561c8c691678b44c762d4f68f96e597807630af4d9185b7a9d557d13f7ffe25fc0092abcd09354
 AUX celery.initd-r2 4303 BLAKE2B 259821a93fc84c45580e06bcb4aa36b72a26290c917afea86b6e095489a1abde7b00f3ed91fa699452b4b7635d71bd72fd12ef9f46a3452f1f0d69c841c83b29 SHA512 722b5d526cad15589a4c26c4871c11255f8f1550b6d6a9d503962c07a6c60167d411f47135d55408acb6320636f885fff28e7691d74831ec1c2bb9d5dc48f3e2
-DIST celery-4.1.0.tar.gz 1331689 BLAKE2B ac134d26a21bfd1172ea7a2ccc5f9934b4fdf56dccb6f840726040adf5b81ab0c675c0c93754340c0429c4eb5777a344be74415a795a9dd6654578979609cecd SHA512 5232adc43ba55d01f2b030382075750033e0c5c2abdc8308903e0cef7a465513b7765e2ae495da6555b377452ae233500530ef9d57e584a5352a54c5f4731c64
 DIST celery-4.3.0.tar.gz 1434073 BLAKE2B 47d9d461a9bf3d3418a7cb37684f53cce58ef1d1bee928e74cc8b6ff8e9bfde19d99a59d7a8ef7b638efa24263d5b35f50c774fb5f81e9c693c9d3c6242015ac SHA512 6a4f99857c2b329eddb5200934b2c83bc2377b5b89ccbcfed548d8f52cff40800db7b94ea321f74e932ea4be42a546fb9b515569266435cecdbe204a0a891b2f
-EBUILD celery-4.1.0.ebuild 3484 BLAKE2B 7f007cabefa307f4254b9b07c1794248132b38cc94ff2404c7418a1449d578575ff7402d06dd318d4436b647122fae3fbdddb19c7162380e9d36f72b44f2ce66 SHA512 5e4e0275f6112e2d75c3342d40bfe20d0b1fe7433e2cb877a7bb9528086a6d98d91fd15c1e9b9c450758d82724b357ffbbe45544ec7b999d8d715cc39c0037c3
-EBUILD celery-4.3.0.ebuild 4110 BLAKE2B 90117fe431faa35d9e9fa31ab09bcb6ef1dc95be29576878290d1cb03e5d50cd16631d8dbfaa490a20ea70a202c36d6cb853a1923befd3711e1c4dc1147853be SHA512 2aa8725ed897164ac8debfad286573812f225d7b3d8d30886628e0a1e7929309b325fa370a70f04cadd745ad71320f2323215dea199c0e236764d907b3683c13
-MISC metadata.xml 528 BLAKE2B e7c57658c1e2d86d4f437649706c340148e6c713e7e1fa8fae06e60afb332562683bcef6f4946555664a1d1a916857addb1e3134c49edd20245fbee58468eab2 SHA512 73fe8a564452f48193e92c3c72368868fb0a6c4ea54e836ac91547f8acd190a4c653b6770f36fb645b4aaad86ed720a4cf4793a8cbfaf3188ac297708508d59d
+EBUILD celery-4.3.0.ebuild 3975 BLAKE2B b150d07cfa08533aea562fe2c780e72087d2ca5733c1be9afcbc42d63fad051e270ea4be6103c57d8915d868b81fc6a6c018225f16d2663dfe2e3ae1d478b074 SHA512 c6814245abac17e5d7f483d0d00d232c1e8a06ad216bd4cb062a5892fff0f7d07cee19b521341f7680784ce576f5d0406f8e2528db078a14f790fad6a9041d33
+MISC metadata.xml 309 BLAKE2B 2d5a0a0dacd3113a16ea680c65d1048c78af98c2dd2f9638f63590d6874b2a342d225a5af03bdc449aba89c00930a1984e12df01fed301b2cd5e428b6809d65a SHA512 931a91ce75aa5b4226054a6122edc341f0b34dcf2301312293a82dc74c1e315d66496fc86d02b287e5af575474a4cff01150cef4f396f2989195f1dbeefd8bf3
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
deleted file mode 100644
index 623202a77643..000000000000
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1 bash-completion-r1
-
-DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# There are a number of other optional 'extras' which overlap with those of kombu, however
-# there has been no apparent expression of interest or demand by users for them. See requires.txt
-IUSE="doc examples redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# kombu < 4.2: #666228 (can be loosened in next bump)
-RDEPEND="
-	<dev-python/kombu-4.2[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/billiard-3.5.0.2[${PYTHON_USEDEP}]
-	<dev-python/billiard-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/greenlet[${PYTHON_USEDEP}]
-	dev-python/vine[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/gevent[$(python_gen_usedep python2_7)]
-		>=dev-python/pymongo-2.6.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		>=dev-db/redis-2.8.0
-		>=dev-python/boto-2.13.3[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/unittest2-0.5.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.3[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
-	)"
-
-# testsuite needs it own source
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	if use doc; then
-		mkdir docs/.build || die
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	# Main celeryd init.d and conf.d
-	newinitd "${FILESDIR}/celery.initd-r2" celery
-	newconfd "${FILESDIR}/celery.confd-r2" celery
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	newbashcomp extra/bash-completion/celery.bash ${PN}
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "zookeeper support" dev-python/kazoo
-	optfeature "msgpack support" dev-python/msgpack
-	#optfeature "rabbitmq support" dev-python/librabbitmq
-	#optfeature "slmq support" dev-python/softlayer_messaging
-	optfeature "eventlet support" dev-python/eventlet
-	#optfeature "couchbase support" dev-python/couchbase
-	optfeature "redis support" dev-db/redis dev-python/redis-py
-	optfeature "gevent support" dev-python/gevent
-	optfeature "auth support" dev-python/pyopenssl
-	optfeature "pyro support" dev-python/pyro:4
-	optfeature "yaml support" dev-python/pyyaml
-	optfeature "memcache support" dev-python/pylibmc
-	#optfeature "threads support" dev-python/threadpool
-	optfeature "mongodb support" dev-python/pymongo
-	optfeature "sqlalchemy support" dev-python/sqlalchemy
-	optfeature "sqs support" dev-python/boto
-	#optfeature "cassandra support" dev-python/pycassa
-}
diff --git a/dev-python/celery/celery-4.3.0.ebuild b/dev-python/celery/celery-4.3.0.ebuild
index 4259161d25fd..f9354d37b759 100644
--- a/dev-python/celery/celery-4.3.0.ebuild
+++ b/dev-python/celery/celery-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 distutils-r1 eutils
 
@@ -36,7 +36,6 @@ DEPEND="
 	test? ( ${RDEPEND}
 		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.24.1[${PYTHON_USEDEP}]
-		dev-python/gevent[$(python_gen_usedep python2_7)]
 		>=dev-python/pymongo-3.7[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		>=dev-python/pytest-4.3.1[${PYTHON_USEDEP}]
@@ -56,7 +55,6 @@ DEPEND="
 		>=dev-python/sphinx_celery-2.0[$(python_gen_usedep 'python3*')]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python2_7)
 	)"
 
 # testsuite needs it own source
diff --git a/dev-python/celery/metadata.xml b/dev-python/celery/metadata.xml
index 4b8a09186e44..183f100799cc 100644
--- a/dev-python/celery/metadata.xml
+++ b/dev-python/celery/metadata.xml
@@ -8,9 +8,4 @@
 	<upstream>
 		<remote-id type="pypi">celery</remote-id>
 	</upstream>
-	<use>
-		<flag name="redis">Enables redis support</flag>
-		<flag name="sqs">Enables Amazon SQS transport module for celery</flag>
-		<flag name="yaml">Enable support of yaml as a configuration file format</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index ea631f7fa2fa..55bbf7f14f77 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -3,8 +3,8 @@ DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78a
 DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad
 DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
 DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
-EBUILD certifi-2018.4.16.ebuild 1387 BLAKE2B b4d64d96a2050b9c5b908e7b7c852993a0af931668c6a63b468557f9ae8e7b7a75f1a01bf20564c7b4663b0263eda1fa43faef241a121d546c3195f9b24667d9 SHA512 c35fbec1c9d20d874e26b832c56617a7db3e244d2c0c5d29a3e43d3131b4c4f5188e177a528c8d6053423b115f5e2b37b82bcf9368adbb711ecf5c1b481118dc
+EBUILD certifi-2018.4.16.ebuild 1388 BLAKE2B f7907b5d646e49ebcabd3bcc26189d9a6413a342c8e2c9d0271ec0fe033a74551862fcf54d2a93e5a81974f9a87d10ac906a924d55aa7bd85693de082b0953de SHA512 80b12f43b61ee3393af42e95363889c4a7c63c57a946bcd97a2061a2c774dba33609a5e4600c247ea582427ef073f9f351ea5a7637d84891ff13aed909bd1881
 EBUILD certifi-2019.11.28.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b
-EBUILD certifi-2019.6.16.ebuild 1375 BLAKE2B ebf8dc433a17973a10be4cc09a7afd71337d8a076ce11fcb593251c83b02d2703f41e5527b155118a438445f3e0edfe22ab6457c98b40c5718a16b960a786bed SHA512 a8f53596e26512abfb53c278a1e850f6473e7987fa0fc435f8dde66e2c8030a24c5578b38621e2e3c0f0908f5522ff8eda7e4d0645bbeef1fd3820137bbb2ae1
+EBUILD certifi-2019.6.16.ebuild 1376 BLAKE2B a48ebc3b6d0121f1242557842c3c8ad24cb0bc233f0adad68782aade3311a35bec4fe7786ec20aa39b7cb2b3ad7006737e4f5b3e11773892468fd914f7979b4e SHA512 f5ae0824a84842ff6aaa461abc2c5c4e63c648c6808d83d26d083bc6d302aea9c7b71448888aadf2255b7d5929583e173a214c1fca645cfa1279fae46fd43b6c
 EBUILD certifi-2019.9.11.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild
index 416a75c33567..cd3a7f9da416 100644
--- a/dev-python/certifi/certifi-2018.4.16.ebuild
+++ b/dev-python/certifi/certifi-2018.4.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
index 8ccdc9753502..f0899ccbb957 100644
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index b4326f83bfe3..09fcc6156767 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -6,10 +6,10 @@ DIST cffi-1.12.3.tar.gz 456340 BLAKE2B bac7265ed9b0858d791443572f39316fdf809c8e4
 DIST cffi-1.13.2.tar.gz 460243 BLAKE2B 74603f2b1bde068a955e94912488fd7d8914267ec2d0cbd8574f62376fc24ef16d85d59e9fee7f6015e6d242726ea25235788faddedc68deb56ae71e627d6322 SHA512 2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1487 BLAKE2B 200c098a677558ccc64dad4aa6e18a4b9e4bab053739bcec60f755fcc762e118cf5013663c426df5772b8bcbdd88714bc2d730fc2a4563c6947765186bafaa58 SHA512 3213245482b1ef824d885024e13cd30fafe9821bd56dea28b61b62d8dcd8b31773754cc33652a80ac4e5dfa3f21a83c40c524453a793d5d1a7e1ef57c58e9a23
-EBUILD cffi-1.11.4.ebuild 1476 BLAKE2B d51ca55c31ca13491922f95c1befd72638980ffca533bc8242dd182de74cee455a2abb1e166d6a19a58cc5e33c4f03ab493b63178283e4da7fea57fe10cd08c0 SHA512 d1a96611f0d0ed5ff8f826410ec8a3c315e7925ec2ca7ba60fc871e1c17d6d544a5eba15f437a77c39c14f7890c9f1ff7dbda18b1f8f74f4c202ac9c3f41cc78
+EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B c97f04a96b3ba6f33030535449bb658f3fcb30faebeb627d66d5b5b1b2e6c6a5ca39886c2223dd7fa02c01b398b43227e14b90f30cbfd55c85050a471e68276e SHA512 9ac1eb070b26bad39e3c2278811fa866a3e86dea8efbda3a525b2a7743474b4cee7e4478e8b5dbdb2020fa919c5d642d17a72acbc497e7fda9174d4529fed0bd
 EBUILD cffi-1.11.5.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
 EBUILD cffi-1.12.1.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
 EBUILD cffi-1.12.3.ebuild 1517 BLAKE2B 0e6221f43acbea90657bffc060fbe383f6df28d2c46bcb2fa4330c841edee9c66eefa69f03dd73704a7bd44b2ca3bebb6e3e7858743d0fd0eab5850262ebf9bd SHA512 1d2721232a0c15327231f20ca04e61acb2058835ba83e8545423faa3ec6e8bbddc9431b55b6b38a1e5713ee260f0329e6ae76a4811247bfe1c87a8395305a54c
 EBUILD cffi-1.13.2.ebuild 1264 BLAKE2B 1b37473e1b200092e8879f1b308342d2edf694ad796373be4da4cf6092886b1a2c2c53fc6ce3d193f1c26c4a0eb715c744db3e34d2a698cf6fcf9b6d3e0afc97 SHA512 8548618f09fd67af4f1f017ee7a0572eeea349c5727052b89414fb33fdc92bcd1a179327cad0aaba3c3f37bb937e362bc6506647f637ebcafa81fa1389369e6f
-EBUILD cffi-1.9.1.ebuild 1477 BLAKE2B 6eb014ff874834255b4a83e6105d6a456e473595b7ad91f919ad6997d9f155a46207852043c61c073651ba3cdc6ee21e79509d9f146e2252ac4d10d18b36fdfa SHA512 e6fb68d2a72ac621ad0290661d3f70f1a56d232e7772d39be63ed381ecb96ddabb5b40e80a8131014162872e220487dd28879ed86c315d4d67bff7bb1fb71067
+EBUILD cffi-1.9.1.ebuild 1478 BLAKE2B e7a810a4897f87d7d77d60de89a2fd818d704d2546313cf3720ebfc5dac0a23bb38a384b4c971624e15af3467ac8169468004899e2571bc7703dc98da96b0b41 SHA512 3596c53d847d0033b5721ac7de0ba7faf674691dca6f8f5e7a92682e06e8f03f2806455926f19523fb2779dbd871794db9548388735b654f0e673afec5e5a79d
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index 54f9c23c845f..cde54ff85e3b 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index 6cd8ed722081..31c62e6cba41 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index a23bba89f6ca..59026fe89fbc 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,3 +1,3 @@
 DIST cfn-lint-0.21.6.tar.gz 2149548 BLAKE2B 36bb80d8b656eddc0e0a00e4728e46ff05f12ff93d70295a045602f09d570880bf087f25165ed21641e80f096b93e3cf4c9cf97b6498b330dc53beaba67aa492 SHA512 c263e6e5ccd03ff5b843e9d4ebd74844f1b4053fa766f5300e4cc66745c42e82771e6af73cf950c81bb66f09b4afd5d438bdcf8489a3b9d61d562a7145d04297
-EBUILD cfn-python-lint-0.21.6.ebuild 930 BLAKE2B 084ee4759c847e21f92fb2f7c0513d389c4c6274bd8fd9ef9639a22b957bffe2084db5ead9fcc04b49db7d44f192ec8df50d02874476c391822a1cfe2fb6af04 SHA512 e7a3d9e42e77d9bb36309c6ccb5ef8a1055b1e14e20be17faf64602222a9f27d0d2e22c05a46939ec152702f1837b6d81690c24c4594639d8f585e025d98b1dc
+EBUILD cfn-python-lint-0.21.6.ebuild 920 BLAKE2B 4717e86468ce5bfc19b37eaa6aff584d56e6253fa3a9484425f5a1419957c1a65c7e6476ce695d985994bc393d9c1c71ee8f42a4f2bc241bd374ea3b6af652cc SHA512 81c95ae0cf526f1d5aefac7d6a3b901e671118ed0f4dd565876fdd19d9e2b7fd21152cc114c108e39e11724c8554398d4eb9bb6ad537f56167948c4d9831b46d
 MISC metadata.xml 471 BLAKE2B 3f9bf2f5249caa0794d35fa4e56d2504ab5576cba4b8d1e22d1d8eab30bf4f2e9fef843b4e6d222c478ba5edef63d7805a854ce788b7f2ba51d46aeb60ecdb81 SHA512 99c9ad08011f920bc7d9e5399e9b230eba05bad6da18be859211f83a0895b9a0a74613d854338ae9de9dc3f4308a7701dee819722b5b3921aef4449f1ca45d8c
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
index 7efc58b4dcf9..f61000596003 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.21.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 1b05fcc6401a..3ee5630b881a 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,3 +1,3 @@
 DIST chai-1.1.1.tar.gz 81684 BLAKE2B 0aa285d3545e445f26f0b088c1b721f2dd14094a8f499cf7b2dde378a20ee15e376e43a91a664be9d6bd11b45d9c2f4606ce5de73743c27b6bb76e9bea409194 SHA512 f51406258327d9a49e820f0489d60e87f576c72232c701e99f96945932ed300582e6dd81608e5b262e2645c4e9c5216ec8f52e98d454c994beac8d1d8137dc87
-EBUILD chai-1.1.1.ebuild 533 BLAKE2B 872983bd2f9f1a4fdc2d4c8897906835c1d8e7409d0add1467089368c64bcdf786bf958d4c3c6d64f86d2c61e7f88cecdaf3e80a4f5efdfe0f4454880b7ac42a SHA512 5c6f2aca88181de5388a22c0641e86bb1e9f18e9ddd93670e7345f6069ea714f420a77385d18f22ce3b7e46477f721e539b428ca985dd091bc733db1a831d731
+EBUILD chai-1.1.1.ebuild 523 BLAKE2B 7e5b3051c6e808129a34533835b61a2afa045a6aac3702354762a2fb4cda00f39963d193e5e13a5e295185c360dbbecb0fec771cb738238968ae5457d0bd1d87 SHA512 e0bf2c4ecd8eeaa00e2c1614a12e5c2767d2d2b5876e3747b05e443e3c676b50c68645e1c6847a19816380afb761df5e8a37ac01c3923f772e468fb92fb4ab2b
 MISC metadata.xml 362 BLAKE2B 50f7aa3c56d7e09aed14029e4b52d3a1e5b765423e86b5e9df00d11f0b2d12f45b07334e64c1ac01854bcc673ab183e491298bc91537054bd4f3df3a014c5867 SHA512 3adf8064d0528af8205ca600f4f3be089872be7a37cdcb0374f9a8fe9589fe3b807e02a194e0cf08a5dfd08855951c842329b6b81aacf5146465e84cdeef6176
diff --git a/dev-python/chai/chai-1.1.1.ebuild b/dev-python/chai/chai-1.1.1.ebuild
index 0a45c23a7740..4ab064a1cd46 100644
--- a/dev-python/chai/chai-1.1.1.ebuild
+++ b/dev-python/chai/chai-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Easy to use mocking, stubbing and spying framework"
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 4a545edb3648..d77a4ddc4de5 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,3 @@
 DIST Chameleon-2.25.tar.gz 193965 BLAKE2B a6ae7768c52807a82229d75fc044116a77df5ae3032a98e44558a1d2b3ee2f427f3291b7c2895639050ea1e9fda0e6868ca7b8299cbbf1d5e1b0714af0d835c0 SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d
-EBUILD chameleon-2.25.ebuild 837 BLAKE2B c9d43a03cdf61d9f2c6a41ab46e431555f1495b47064306f424e9894b3c817b3d43eee426e5bab5199fa3114aee90cab44fe8703577d115d25c695b9e5837aec SHA512 08ff32c79c214415b0c0be55cef5ce6247c58ae2830d527addfffd16eadd258e01c6b62e5f82471afbbe40fcbd3f20e02ae1346a5a7f492b3288d7c6f23716bc
+EBUILD chameleon-2.25.ebuild 831 BLAKE2B b569579d10518dcda7f2d4f8915d4487ab0998f7475c531c270550c49f4904ccddb1491e8591c2c3a2f3dd1091bd2ce405a1649c6791377d62bb0a64e97af2f1 SHA512 ab50e4e374da67ca6c46089e462ed6d8ccf69aecd27b4c9fcb703d33b95a493513ff1a0d3b34aae8043f6a4f8a8004356a058a3a2ac29f5b9d638e527c9da3b6
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
index a82f27e2bb13..ea608feeba1e 100644
--- a/dev-python/chameleon/chameleon-2.25.ebuild
+++ b/dev-python/chameleon/chameleon-2.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 2dee937aa70a..6725dcd09bf5 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,5 +1,5 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r1.ebuild 1058 BLAKE2B 923397d69eb96d9ff54f25eb93d06654476071616ed88e265f08e69f074abd63cca671c611ca57d03d21912b4874823713c7784e9ab28bfff96e68ae2464a795 SHA512 0c06726163716a9866f9dde22f4d4afb386dea0374c239945edbdf00682ee305635c5aadbe9e97bff36cd55cdcdf679442aa10690d23abfa8c2bc6088ed58cb6
+EBUILD characteristic-14.3.0-r1.ebuild 1059 BLAKE2B b3ceda316b8fc26508c766202dffc476575c869d8bc2431dad371b2f876a585ae48be1af65e8eb9480db02eab576a4fc79d942d0c0a42536d34d030d98a58908 SHA512 81d0b7eb68df88aae0b565f2243a391326dd01152bafefd62958225e0fa68078879e9fc07a701b4ab069188c49856356f3e9b3ca33f3bb39f2ee3c056223081d
 EBUILD characteristic-14.3.0-r2.ebuild 1073 BLAKE2B 4d73bdb39bd6b56bb1b04b2e7bd8822c336317ab215a684efd612f39a44ab12fcd3e005cd97b63ba424cb40f7f1aed9c89f8421e8fa83b041ac1842553bd52fe SHA512 e9ecfd05f824745561526ab66a4a6f532c3324b6ad231f467ac5e472c9c7f6cb4f1882bd34d7060b2d4e4690b01bff06e24f4f348748528ad0fa0b10ca27ace9
 EBUILD characteristic-14.3.0-r3.ebuild 858 BLAKE2B e41561a9e97d144d30dfe1390e85c5c670f3a312c9ba4157bc2ddafcdcfc7fc6c7690564649ec6d1b2e4673f2729c6128295c451b3485342aaf70d9e52727abe SHA512 573fe84012542a251271d61f32395880dc3fc2977522254176efddeeba07850d00d16f1d6707b79e72f9abfd497ffb639d96baef64b6ee62090154bd34be592c
 MISC metadata.xml 389 BLAKE2B 0e2226a252bf0308d7bf33b34eee3f035bfd242736b91072eabd77e07216104961c45f8469dcfc3a8871cacb4ed619bebfd3443612bce85d1f2ec4d95a13dd21 SHA512 291bc593113bd6fa148fcb5f978ec1630808a0a6b4ec7fb40b00596c9cd2bd56357fa792af91243d96ac21fdab420d370c0d1f59570e739be22d81b8add56676
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
index ff7c1bd331e7..d0444bb32f45 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 7ecea566a8a4..36dee88ba549 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,4 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 908 BLAKE2B 0653acd177a134e229d4f1a6e66c2e8dc75954e81ac55f95fcd1b19a1e9851f267add3b4aa0b763d7acc54a641d65fa95c4e45da33b91d8ce16f2a3c9e5a004d SHA512 5692def583978a3784d18c589e7677dcae52c481ba2419c2e6ac500af12c769ed952e1a5716ac308511df1239efe1b87d64cd3b05d6c5af8bd7519c2c1773fbb
+EBUILD chardet-3.0.4.ebuild 909 BLAKE2B e25ec5c6536ac4c70721a3bebccdc861df737fb69e96aca489b9be30dc34d04da6b9ba04b52895dfd2d258f6fa5d76eff93338fc54fa406ff9b02ce0db3b0f4a SHA512 26af120115675f63442f6dd1c26e55dc956ff7a036ce14d4377f2c27f9c24a726eecb571d9fd68cd87070d793f58ec9f71a725e2e0c2f69f2f5ed72496fc817e
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 32b7964cedbf..0c4e3713a49b 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
index fe7346fe4827..ff94341ec0c4 100644
--- a/dev-python/cheetah/Manifest
+++ b/dev-python/cheetah/Manifest
@@ -1,3 +1,3 @@
 DIST Cheetah-2.4.4.tar.gz 190989 BLAKE2B 567aee718199021c3de725376da37b2f28081cf8741d1af201f7e6e88e026f460c10f3502463d58285a1340e308c718f709d437185f99f22c11f76c586ba4a60 SHA512 11b8cbf7d71789d6ae83596b133ddbe0bf1ccf2bca4c59562e7cd1d9bb75fa9d3208c0021d7d77edafdb03fd399cf1a26c003267fbffb94f27bf4457b0f9234c
-EBUILD cheetah-2.4.4-r1.ebuild 1212 BLAKE2B 5c320b0cfedeea12c25ef5cd771888c5ae0f6efca6b38008940c8e0c134298ef2b3564bdb75eed2fab0716017317ced5cb3b11d1a708f4c28f36b60e85bc9905 SHA512 78f082d19da4c3a36ba790494529f6054c63a5d28e343d219951a2606c3e6ad8740e42a5c49907ff0c7129a8e695e8c80e09f8e97091210c1ea2b983aa60d8b1
+EBUILD cheetah-2.4.4-r1.ebuild 1213 BLAKE2B f44f2195c6633ac59274e6f759487f7e7a9c4ede60afb481c87e8ab6905453c92a10edf4604d71c2b7781b8cce137035718494fdefa7176afe951ef588f4e1cb SHA512 6215cf301847d49f4ed017f4158f417e2a6442c78cc04fa826dfe86433fee527305dac4af564ef0ce3b1ba383117bc2b23f02e9bbae0416f179e1ab86e6eec06
 MISC metadata.xml 661 BLAKE2B 2808adeb2392976f9343fddfeab9f9494ba8eb4690c77b71c4f66434459d01eb8755f7ff1c97669f84a9e8e4b158fae2d0b69d3b2fccd6f4dacfb0e67bcbd629 SHA512 7c0f9ab56f056a5b878572b16991039ef79e009a50afc44e7e9745051d58d99f4c3f7c3c427f8a165a9a54e76983cb9cc5cd16f0e3629d85e5288b71eb0f38b6
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
index ecc9e208b543..54aae79ec4a3 100644
--- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
+++ b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 IUSE=""
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 95f3c86f1eb5..1b518524846a 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -2,8 +2,8 @@ AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d6
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
 DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
-EBUILD cheroot-6.0.0-r1.ebuild 953 BLAKE2B 91b0ed39a656cf1157b220f9e782a581f75da7a6a575795c459012ed04e4a7544ceefab0562adec37f621627ccd16d49839d237b5a91ef619b7adca455b34942 SHA512 b6e6421785bc4cde9b19ef1284cd6dad2b89f4da3f56e21ed8389af1c93a5848be1128b4bbf58ee2df29dac58afab6c623df226a0f40877fa1c76af20d2fa899
-EBUILD cheroot-6.0.0.ebuild 949 BLAKE2B a960c8098e908eb8f9340251983fc0101d7323c8fe95be8e0448ed7cc0ae454991884e511bdbde85d25a545bdfb9c235490841da2848933d28b569cf7348e031 SHA512 19132e54d92488ee8cf1ef7a675c41a4113d3e605afc2ef94855f536ec2218046092264877b92b0e0627af92805d77148f9372ac38b40b02539c5832fc5e6b5f
-EBUILD cheroot-6.5.4.ebuild 1755 BLAKE2B 469b56035d63347f3b50636461b4b06d3752ec49a66103fda38c5e4c797fe3e07ac27a2af8c2596a00ce7700ea3e7c3df088b4f2c84ae11c0f1724fe238e01f8 SHA512 1d19f865b105af315a7fd5c940d4e5a43982010be7c904f947d15b7b7604579b71d083277b7dccf0ac8616f954b4d9fe9089d7f0b1f174997211567e1924402e
-EBUILD cheroot-8.2.1.ebuild 1686 BLAKE2B 6bedefdadffc34796acf70d670c88ff7bd49b49f61520cfbfaf04820999e2e3fbf9ddf3bbe04df4b84c8fe3f3daf92646b560aea62c6b49d945b6f95d1811d2d SHA512 d68e7fd571c487b73f0c91ba6eb15bd32cbbb25790d9b4cdf1cca1482dbad931e4e85a1dfce0fd196d5037dd8a5403215af703265fd40d5e81533c7f29c8ed1f
+EBUILD cheroot-6.0.0-r1.ebuild 943 BLAKE2B 1e84889e62f4efb283ef2c4abe3a2f0a9d3e7464c30e5cc72c57db284a342475bfcd8cefe550dd2d95c3cd1ea71caab9798c291ded24d32c9357b4cfc4b5d35a SHA512 23b327c91237de42cbbedec267e92daa21db8859c3ada6b2b43ce1b6d3250e05f84a363b67b5b9c26ab1150c451659042433dc8cf6bad258ea3dbaea8f9f2d38
+EBUILD cheroot-6.0.0.ebuild 939 BLAKE2B 203f682d77983b1ec4e35ea8b0fe338e477857251e0d41a4ec527f807aaff4688febf7204e277661bb5905392b7d7494c2e8e8311c1a32b538eeb818e8557de0 SHA512 5f27f8e812d13e3e4f53a2f46631d2a3925a9377f5998e4583b9d60074b4a4e6513083274fae2c11313bbaf6da5e2ba9e361a293be7925a147ee1b1573f0a783
+EBUILD cheroot-6.5.4.ebuild 1745 BLAKE2B 1ca8732f9e3c79bae1190cf9c04a777e9881608558b4a040ea0f58c12165dc32d1c86138aa2b83eeb2b8fa496460284c4aaebcad8d459169f9eb85d9304e4f75 SHA512 f5dfd7fd14360e6d1ad5ac5058c3aa4003a803cdfc19370617e14090255797ee646300bf2121a32bb7f1f981b08368842e13b7c48d3755915938d2f43d62699d
+EBUILD cheroot-8.2.1.ebuild 1676 BLAKE2B 755512ff087835b6b6439fd0e928b3c8adf9d20a9a11e32c95d6d72af595e426417d5707fb26edf0388e72205461d54f3031e249de1b7ad72a746b8b43b3ff1d SHA512 65b07359f0e3d9724669b9898f5016c3602922b68b4b258854f4d2c9d0ce01b20968edaf49c9730a0478993a54aa96737a22c0a029342398069b10e13ab2fd55
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
index 521f18df2856..1022ae4c9243 100644
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index b92338f529eb..586c3328f4d9 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild
index 56b20f23d4f6..6a80492c572d 100644
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ b/dev-python/cheroot/cheroot-6.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild
index 38c6aac0d28a..decfdd37481d 100644
--- a/dev-python/cheroot/cheroot-8.2.1.ebuild
+++ b/dev-python/cheroot/cheroot-8.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 9c614e0622ed..2be02074cd63 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -2,9 +2,9 @@ DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa85
 DIST CherryPy-17.4.1.tar.gz 684113 BLAKE2B 8922c1f6c3e7ac654f84dbc56c7ae17e9ba83e01132dc6a34413064879a5fe22b1dcaa0eac7415b23cf9dc4fe54fd3e5d078121b354599b30c89f69f107208f6 SHA512 588aef80b12bdd27d83fabd466add12753d62760cd0c6beca8ecb78a0cd1e04a507327409bd4cd3c6e6e6133922e06c2f8c6ee2877b42ca635f8001812a4bd8e
 DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0-r1.ebuild 1333 BLAKE2B 13654a74a00c7aaeb88082e17addcc2d0b218f1cf87e20aba9d97e3395e9f9b0b04cb2e79e5b87d99c742941b0c963c548915feba275e7222eeb4ac92963aea6 SHA512 b34c869296eb7d409c72c1e2c466b1cfafa87f1980736ffba2eb7612ba82ec1a6bc945c1606e0acf38d993cd5be9b111f2e1f0897a6a78eb0705d1e5207a2236
-EBUILD cherrypy-13.1.0.ebuild 1328 BLAKE2B e82b1edf805d27c309ac58c2d9b2145c175a9e042f6830a6eb84776dcfbd84c5f950ca1b3ccc11b33e925550d413a70e1ad287617d24f40466300964bb60f1f0 SHA512 014cddd7b0a27c531864f9e849f2e63d92ecb231ece860bd3fa7051533e65ffdddbef845da1d7f0664af6591d8805bcbbf7c04b7689a6f2b5df98cfedcd82cde
-EBUILD cherrypy-17.4.1-r1.ebuild 1868 BLAKE2B f8b9434e763c4fe1f32f6367336dd892d50a3ebb80d0cca6cf81e2517183a5161d016f7919ac4dab39273dca8811b7a674cfe2f97575e112b15cba2e9accb752 SHA512 d2df7bb63575680ef596c02f6075861fc531c4361338d8e78a7c40fc8a16c28f3bf51c063a3dd12ecc4c1c65cdd81bbf2d81ed92890428d39dabed7fd968ee78
-EBUILD cherrypy-18.1.0-r1.ebuild 1865 BLAKE2B 834646e7469b9f243ca11816ef9aaf15a581f0fa25e5714033b19a6fc0cb2808b26c511fe33fd55083335a7bb4434df03e3e3d38e50a9707d716b035cde695f2 SHA512 e8b105e377d0388da923ae185551ada0709b8c7f5eb2c59ccc7fcbe9f641f4a33748440cab929e1ad389497a3f7fa191c7cb84c5f8abd193920401077cbabd8c
-EBUILD cherrypy-3.8.0.ebuild 1644 BLAKE2B bf220dcc718bc88d841ae178415456c0c7e87a8f802fca72a9b0cec7e7ecc83cae2606bc1d2ac35484b55f0f6acbbcb3d1f51a572538c955ddc9fe32e4a91ed6 SHA512 f00bad2b5503302f1d248cae5f23f59c8efce2bd415da9fe1de0a3caf18a11f1f7e4560791be70c88ebc106786875ce94f5b6bd82d644b87d294aed5e39cfb19
+EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
+EBUILD cherrypy-13.1.0.ebuild 1318 BLAKE2B 29ec8e6e740e8d9446001a47f0aa4a505748787dd7efc6db4c8bad98c4e2f1920f0012661d43ab64aced90c88d8b682f2e91d6e8f5fc0a14c890b5f9d4154a32 SHA512 6e00d1aac14b81b6a6f7e2388450071b3da8c6ffa4d1ee67e3d4b5718ef19e61cadf58d4579041f02d36848fdfd8361fa7a1f7b8a1a8993d4e6c9d7777a24bdd
+EBUILD cherrypy-17.4.1-r1.ebuild 1858 BLAKE2B 50ceddf735fed91acaf24a1dfda0be11c53546a58ddf18f70006d493b70a2cc4155248120f53a3835c3729a832fce25bdf71d0927fa69f61d820ae73d9cb7b18 SHA512 8627a1d9158b7a11cdc75346337dbd4202df9b6b15e44b0da7fded16501e89065d67eef9be68d10ca10b1643ee0c02e271979a12d6e01c6cf68d621c6167aff3
+EBUILD cherrypy-18.1.0-r1.ebuild 1872 BLAKE2B f2a9c15719048d83b23266e60b98af4d562ae2a8cc73f50ae76db69ec9c433f731c81596994f22f49b780ca99781e9538bd5f2fd55f3e3fcce9a44ab924ed0de SHA512 4ce3ab84dbafdfa252de809c875790b3baa2f866934b8cd85a7db991131ab5e08e2adf5bfddaccc3dc7fbcdcb651455dd28301b1a297a69aa628dca6289342ba
+EBUILD cherrypy-3.8.0.ebuild 1638 BLAKE2B fc1554365a6c1c818e8145620f84e44af8435b3985a0e9f09399ecf2ca0515317aa19181970950127bc999df645d157469d5f2de5ae19e4d2f3eadbf5a6ae9ec SHA512 3d00b0dedc631498090a3cbe5d53185d1ed329f684baf9a4418912cf35374920eff3611354c85c69237762de9baedae2b7791937d2f4d9bdc260bdfaf68bee15
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
index d56e06649b0e..13c2d5e6fc5b 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index eceb096c1e5b..959cd1d30707 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild b/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
index bc9e5e3927d6..5cbcb099551e 100644
--- a/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-17.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
index 830c8b85f9ef..d48277a31700 100644
--- a/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.1.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="ssl"
 # IUSE="ssl test"
 # See below to see what needs to be done before testing can be enabled
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index b939cb23d64d..c6b1b139f363 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
index b715ca842287..a51e0c21570b 100644
--- a/dev-python/citeproc-py/Manifest
+++ b/dev-python/citeproc-py/Manifest
@@ -1,4 +1,4 @@
 AUX b1a5f925527093b0b5c11507f379a908e3354820.patch 1339 BLAKE2B 0dc159ac56179f13c528a13ad617d1ac52e65b4cc9be59bf6374adcb1ce787ffdc960bc70cc5dcd6287bd9bde4157f0ed1bb1511d2021a476ac61ce9428c2dd1 SHA512 477fc02354cacc75bfc341257caaac23501381c1e233a84a1e0973c98eba350c7cfa1a15503130f3059c0a239c20d5bb5fbde40b754785581c287fadc0183701
 DIST citeproc-py-0.4.0.tar.gz 109786 BLAKE2B 8d8520ad10a9db7b7da1a2febcc594750572a562ada3944e41dd42321a3b9384828ad17e671307b5c4affeca2ec4a3f8e97eec650dad7005323ccb2913ef43d5 SHA512 bdc09a6f632a13cdfa757710c0d137ec73fe590bd01e049847fe013569231426bc72b318133fa34c96c5608b7a30058c27f4cd3d5fa2ba4b0760527b877992d5
-EBUILD citeproc-py-0.4.0-r1.ebuild 567 BLAKE2B d5eee81c2978334e417d2edbf60696cab10c35dafc31656c61956891de7dc8adf2fcc7968ab8d3a32d688c2ddcf6f7097d8dc5ace21f7c4c50cdd033452638dd SHA512 212939385416e197a489fcbd2b4d6ea64c2fb05d02e6750aa097f444004d3a07659b616aadf29c2d283532efc2904b50085e77ff96d297847c90257700fe6bcb
+EBUILD citeproc-py-0.4.0-r1.ebuild 557 BLAKE2B d23439d82a081015b4f47f020a36ff838d2bb6757a866ff83ae696b931dd028f8843c887bdf96d4e1548dd8686606c9a8539fd166258b811b6c338d60e7ec1cc SHA512 bbfaf9c55ea7e41f49cb9b12b77f19333681fba528fb62d9a4528047f5467fd30c1eca8c219810828269d70174fe50bed9fdd9249d6a774816063f7b704b0724
 MISC metadata.xml 433 BLAKE2B f512298eb65cda00ae88968b103a176640dd993d5e1815a1b414167f90014a74957b2043f7177d3f9ffb7b58cabbfae42cf06894e3247ab65d6ce11ec362477b SHA512 375292332cd82155673005e0a0d189120fadacf98e81f181b9540f40915147e895b7ce5fa3bcf1e924c08619944b65b28745f9b76ee520877abf3c6d94a690fd
diff --git a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
index 326dcbec5f6b..5a6963b71c4b 100644
--- a/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
+++ b/dev-python/citeproc-py/citeproc-py-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Yet another Python CSL Processor"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index dac05d8c28ad..7b6fd3884d85 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,7 +1,9 @@
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.9999.ebuild 901 BLAKE2B 1f79a09947039b9a8c1f73545d4007232487260d9b3098a34f25511649bcd1aeb51750942762cbbae87fff96b4830d964cd0d7579d5e9a69363aae883a261da3 SHA512 f346e41814484d59e37c12b2c9aa656faddb05f4599e2ba3cb60543eac666d6b265e6a1abf676294a249cce2a85133e577230264c4b4d6b4851c1e92efca5f22
+EBUILD clang-python-10.0.0_rc1.ebuild 901 BLAKE2B 1f79a09947039b9a8c1f73545d4007232487260d9b3098a34f25511649bcd1aeb51750942762cbbae87fff96b4830d964cd0d7579d5e9a69363aae883a261da3 SHA512 f346e41814484d59e37c12b2c9aa656faddb05f4599e2ba3cb60543eac666d6b265e6a1abf676294a249cce2a85133e577230264c4b4d6b4851c1e92efca5f22
 EBUILD clang-python-11.0.0.9999.ebuild 901 BLAKE2B 1f79a09947039b9a8c1f73545d4007232487260d9b3098a34f25511649bcd1aeb51750942762cbbae87fff96b4830d964cd0d7579d5e9a69363aae883a261da3 SHA512 f346e41814484d59e37c12b2c9aa656faddb05f4599e2ba3cb60543eac666d6b265e6a1abf676294a249cce2a85133e577230264c4b4d6b4851c1e92efca5f22
 EBUILD clang-python-7.1.0.ebuild 1077 BLAKE2B c7da5b347a56f6bde3052e3c06ec398741e545e7b3e672282eb531e7acaff55153d648412bd9310134d037fadada36115e37ca10a66c853ea54d8429d102f8b8 SHA512 f5c9100f4e5c11052ba332ffeca078f16b7a1b5b4776e2bcb07e302502816dc8e4931d58931cb167dfc5ae04fc4ff67c35cd428f8db74f4c9ca0b131fa7929e5
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
diff --git a/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild b/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..dede9129a35c
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index 78e1c6eeaed2..f24b70eec60a 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -1,5 +1,5 @@
 DIST cliapp-1.20170823.tar.gz 54601 BLAKE2B b2a414aa77de872045983a9776e2afd55fa18a5997306f1e532b4b2bb413eedd6a868fe52f91565829be09f42808f745bfefd94ab307a61eb39f64805c3d7cdd SHA512 f66e35faf2cf64d56bfac546cde7e4818d54e4eded9841c788eb7800ea87211594cd9921d6e5f7d2c2b69b031823ab85aba92b09ea204f3b89f060b353a2d311
 DIST cliapp-1.20180812.1.tar.gz 55134 BLAKE2B 184fb65751ce9960f98a62beaeb7ecd4f55cc8bfc9f5dea568900b7be5f5b42277d5ea8b23c20f73c73ab67d605234fe0a5e28660647a985c0de19de0b625ff1 SHA512 61b6f36abb3eefb1c52752e8eb1048c1629c86aa269fcac9c5ee4d875031a040c9c3824131f953dc9bfe568e9e99202750c2e8c11791afe3fce1c1872ce2510d
-EBUILD cliapp-1.20170823.ebuild 656 BLAKE2B 8e58254a5933195fd4ded924a17a5a8633dac9373690462aba7d59c46902c2afa80d7ba7fc6f2ea5de504068ba61e10e3abcb73ebd5e44272c318cdce34b779c SHA512 4affe84e70fa014e8d9891062e720954199906b7ffe183b580d7732e77c140c12be4ccc8a9c4211f66c5446f4683e86425aaf560cf2346ac8844fb8c7d5758e3
-EBUILD cliapp-1.20180812.1.ebuild 642 BLAKE2B 9b0ec5bd60995b183b948b73af319ddfad0af5e14d9577edde248e9750a54b4c59462378ea21391dfd186a368fb94b187c536950e64757f5bc991163d99b7a64 SHA512 c496d0ed80f27f1dd48af3d5f9fe1668c84beefdb4a3219c0114b2fca2ba75d142cca2567d82983afa97bd2bcc09109f67d68614fca661be8ba45480f366fcd4
+EBUILD cliapp-1.20170823.ebuild 657 BLAKE2B d64f74b992559d593664690c48c5cb5cef557c74d1f829c7ef82b5966bd5d9f776315e0e4abfe7c5ae27e06e71519cfd26597488414eb9f98b7676caa58669d9 SHA512 d162a74eb48d74954cc5853128451ad5faa915ebe711fb0e419148b0e788ab5d9a37c1ab141a530a8a82560a35a25d9d51f33f1c0e721b6349235b778b842498
+EBUILD cliapp-1.20180812.1.ebuild 643 BLAKE2B 6184fdd10fc3b982ebd693ad7b54622e183403d210dd6f207acb8024e93abf8b67dc42f7e188920307f6bfe7a66e09592e87a1e65c08252c7991ef5e68e10a6e SHA512 e02bf1ff5ecd222a1bc1b0b2a0fcdc2f00c2859cbd7cfca99aa089c5388af9962ebe49000a2e6fb0e2410d5b9e814d7f5d57f3b4dc935059b4619e812d08e6e0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index 82f944c4e62f..133761ded85c 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/cliapp/cliapp-1.20180812.1.ebuild b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
index 5ede92770cf8..27669738f78d 100644
--- a/dev-python/cliapp/cliapp-1.20180812.1.ebuild
+++ b/dev-python/cliapp/cliapp-1.20180812.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 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"
 IUSE=""
 
 DEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 010dc6a9d0c4..6d2bf6c98de0 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 606 BLAKE2B f9b9dabd8ee86bf016ab449e6f8f5ef466aaf78288194d837292c8e714c1379ae5284c6195e06e5d84e5dfae18b373b11ca349a36aa0f779b035668b7eb0ec02 SHA512 68cc5478ff6081a441db05b4a5684b305f6e1d74d9cb740643eed536ffea5ee2c3189afbed4427d66ee5ae12288f7ecbb820e1f6ad49959923914b52809b878a
+EBUILD click-default-group-1.2.2.ebuild 598 BLAKE2B 4944ea9ec6f117091fc477684987f394bf816759ce7e92cbe835e1b573469238520de0b81fe6f73d5b305a317bbcdb149fc52f50174f0fb0a130380ecff73922 SHA512 3cb47bc5acf66b7047ce816ab4fcab5f1674db70459386b31134e8efcf90a2f62c226cdcbc62e5c57b96eadffbe17c008fed0700ca3395752146648ccb855c12
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index d3baa5db9e4d..1b5f1720bbd8 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Extends click. Group to invoke a command without explicit subcommand name"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index d137135cf587..e299c894aa76 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,7 +1,7 @@
 DIST click-log-0.1.8.tar.gz 9277 BLAKE2B 656088998bd6753f491e21a96dbd41e02e4decf1043217863478841b258b4d6e1c0ad7ffa983d0138ffccb22206b1f9fbe47ea0dbf305036db32d9810b149b5e SHA512 35baaabc54502f203da2fee02f6f63478f4f902bf333331b6ef9ae4b9d1677020ef0dce9f24f64e6e48bfc31280b72882f7cdf1f42ecf2cd941256d2e96a40e1
 DIST click-log-0.2.1.tar.gz 10062 BLAKE2B bc973ec0a7c9b98567b13bf22cb3732dc4ee9bcabee5cbb4942b9981e78893dc5ffef92142ef02d1d013fcaca81d28d5295ebd83a705adce189f7355fbbfdf7c SHA512 4fd56d4514fe3db74fd626c20579bb4bec559e60194d1b8127007281546e94b7b3248ede4da9f896fbf3e06be97db0ac9e7fe4cfd442848fe7b8e5392eced98f
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
-EBUILD click-log-0.1.8.ebuild 525 BLAKE2B f0cf52637e7ccf12750a475fc5c1785bde1327f4bc5856c9ca6991ae03baa0b078758c49a595de4cc04d2ca73f2bf773cd7d38fbfdd08bdb1159e28b2066bc02 SHA512 2b842ffdba50e7ecefbd2863d70cf2c3bb38ddb3caebe7716ca079e59de9e2e7dfd0675614a66c96585d152e36278972133eabdd6e474b3529f4e9ad0b6e7f7c
-EBUILD click-log-0.2.1.ebuild 525 BLAKE2B f0cf52637e7ccf12750a475fc5c1785bde1327f4bc5856c9ca6991ae03baa0b078758c49a595de4cc04d2ca73f2bf773cd7d38fbfdd08bdb1159e28b2066bc02 SHA512 2b842ffdba50e7ecefbd2863d70cf2c3bb38ddb3caebe7716ca079e59de9e2e7dfd0675614a66c96585d152e36278972133eabdd6e474b3529f4e9ad0b6e7f7c
-EBUILD click-log-0.3.2.ebuild 537 BLAKE2B 7e17b1713d3082e5c6c2bf95741045f73e4b9ab8c06653ea2968f9ac50e073044c547076ecc03a07e070f6fc45b5e59b86db39c47f35ef778c4bdc0886b66643 SHA512 e22884b66f1aff9cf9e110078a441d3238c8cc3f37b2c9e8e59cfacb392679cb0eea6e963e80f62cda7e51ecf1e2e925c0bb7a42863a8ff1d3727e03e267175e
+EBUILD click-log-0.1.8.ebuild 521 BLAKE2B 4553283060729d582118421b8ea190774540e016cfbd5ecc0dc8c383ecf790da778bdb15d860a67f702a7e7db09c774045f8d9e88f2fab760c24adc240dacfaa SHA512 7e52e4a2dc0c1e332a982e1a0cd115c3b842bbe693eee181d35a5a46de870530ae073b39507b52c3de141aba0db6910d7166d4cd092fe617795aa33e09504888
+EBUILD click-log-0.2.1.ebuild 521 BLAKE2B 4553283060729d582118421b8ea190774540e016cfbd5ecc0dc8c383ecf790da778bdb15d860a67f702a7e7db09c774045f8d9e88f2fab760c24adc240dacfaa SHA512 7e52e4a2dc0c1e332a982e1a0cd115c3b842bbe693eee181d35a5a46de870530ae073b39507b52c3de141aba0db6910d7166d4cd092fe617795aa33e09504888
+EBUILD click-log-0.3.2.ebuild 533 BLAKE2B f3f37b4e2a55d9b54316ddaed9525a506f5b12bd555d8e4cce6c4727a38079aa6695f7f35c708482cd65be358c15f2b96f1a9b4d66508fe04db5369ddf49526f SHA512 cf2d4915cd4e15600884c7ce98a7d68b0852f006ce69d8d0c870d8719606d526d996e03749de74f306f8b939d539af3fa5bf3bb49d14387004f2ab5c2786990a
 MISC metadata.xml 352 BLAKE2B da4fa1487d5ee53e0f682676dae2d9dbdb581ebe4289d2673ebfe4ab09759b6d7928c24b28cb4ade9a4d55e05c6473356590190327cced4f2b87b723d15d1c2c SHA512 20b7009e52be3fdfd67690972c9ad09d77a505a59bc2a4c65ede59a72e33e7ffeb7c6a663487e01c94aa73507ad5fe4154ee2f9e336c85d8e173c971644e77d4
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
index c2e850628c03..ddd10f31da45 100644
--- a/dev-python/click-log/click-log-0.1.8.ebuild
+++ b/dev-python/click-log/click-log-0.1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-log/click-log-0.2.1.ebuild b/dev-python/click-log/click-log-0.2.1.ebuild
index c2e850628c03..ddd10f31da45 100644
--- a/dev-python/click-log/click-log-0.2.1.ebuild
+++ b/dev-python/click-log/click-log-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
index 6cccea5b2fcd..8843fc394d46 100644
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 7f762d903bcc..eb74746dd2d8 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
-EBUILD click-plugins-1.0.3.ebuild 511 BLAKE2B 04881c48c7b063cd866f0df3aa712c2a0f32d060b3652884100d38a9b7aabc21e63f59de7676454d1d3a1c90dc6816bbf7dc43165f5bfe611b6c5482ecbe8706 SHA512 52cf96f9be0aab1b2f7e6853f2f42578f47fdd62d1c0e011584b0bd0ec8ca827e4b81a2c8bda0c8b0c1f00bc0481f3451c48edf99f28a58fdbd0fa3756d69d90
+EBUILD click-plugins-1.0.3.ebuild 505 BLAKE2B a16018c8b8cf0385accbd10b2505579f59f4e7b3cbbd379be583a328cbabccef95c78f1fc8f51503c1ca52734103382eb893a1bf77d3e62b06ac135e308dbce2 SHA512 e9d429a1937814a46b3a398c539e3ac5994f5821789c5507080da386d8518dc95d2a955ee6cc3ba5cb23405b163ba90aadd9ebd7191e38a1355528a52f0907ff
 MISC metadata.xml 248 BLAKE2B db670c3ae382b7098d9d12959aadf4e3adc1e8d9ca4960e6966b63b88a179376cc32540952c9ad5835e5c41f0c8937c383da2ba2d079d78a868b3274bca00330 SHA512 a16675a6c8b0afce6dfc3591b8c30b89454b6a8aece3431d396a0cf0b32d5e19f529e3e514130881657bbd079347cdc1fc9e8ac5fadc07c3dae3cfaec1ad0bbe
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 34a162ac2b49..0e9e0640deef 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index f7487a6b04ce..23e7d9fa16bc 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,5 +1,5 @@
 DIST click-threading-0.3.0-gh.tar.gz 3759 BLAKE2B 2d91085004c2cd6dd6af2ad4b61284c93ad83b458fb68df0908fdab0de1d87bfd994d3c68cd58e671219b38af55282ee5a17b45a12a4e76e7c40768869ce7968 SHA512 ca535a54f5d88c70c3f8f05f2d423e1b9b0f0b3793a1c04cdc90b61d4fa99f6906a327143dacb2b946ba8c1a9977d9c96ce9caeac9638521641d574316a0bad6
 DIST click-threading-0.4.4-gh.tar.gz 9815 BLAKE2B 57f4cd386c0d1a0ee999ea7ccb91319e8bc2d177e9f52b9979b4a93d68a1c3502f8aa05f163a991a8f78c90692c65d026295a710004035f2c48868453bf2f2a5 SHA512 4a7af23be600cab43dcda267d9d9d3ed0cc885f9829f2412844ac9cd3f0f41d1bea3f157f9e37cc3333c4b0a3d65ab4525edcaeec767850efab5cc037e95e532
-EBUILD click-threading-0.3.0.ebuild 584 BLAKE2B bc4effd32961bcf308a26c607dfe2a11a568a9167a0cc5cd92a789d087b7ff95dc1031f59695bd2d6e2d1cb35742aa4cc0d905daa66f3c339e43301f5f75f1ef SHA512 dd6d36bf71c16928438915f1477585939c5fa0a364a53e738139f49146e31d4a1b498ed6ae78e917d6402c8f1f3c814733c7f98e13188a82fe8e458a49657183
+EBUILD click-threading-0.3.0.ebuild 580 BLAKE2B 9cf146b8ae56ac68b6279b9dc9f179a509a42e118b22c35eef7de07490e4e9b0e0b612b21497552e4d423788efeb09b4eae8717d8c0be7ce321bf17f678b93c2 SHA512 5a5e78c82e45096fdeb5a4a8da0fe667f892ccc8a7e9d7e1fa2ea289608c555c383db3851e1fb97b4b40f765348ce963cef5db3efbe7748cf9081bc3209bbd7f
 EBUILD click-threading-0.4.4.ebuild 585 BLAKE2B 4123c0118416cba55031d356312cf9e463e7b5a2ccc396997a458025a6c1e6dfa2eee1dc8d5c0afb0d5ef44e6eab1ccff37602fcfd40e9c49b9c1b3fb8fc3809 SHA512 f1719eda6d77b39f1e91f6e70e270992b194ee6272ba320275279d45ba9f73aa2a93c02014f6357b8dca001407a025b39c5a5565c5e8acea777785503932c1c3
 MISC metadata.xml 364 BLAKE2B fed4e1a2699583fc6fe19fed19523c6f452639fb8a6fa7ecc3280207808d83d993e336d2482341390bd63ef8dc41746ba3a476995cd34c436e8360ae2b2012f1 SHA512 bdc9d9789f853bc0bb5a1cf03141f34baff1dcd7d4d169256213b08df47487ffd29edfc5e567239881b00fa81c6452ec50b19670676039044b80d6ee5dcbbbbb
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
index 5a71933a3286..8a5fbf49af16 100644
--- a/dev-python/click-threading/click-threading-0.3.0.ebuild
+++ b/dev-python/click-threading/click-threading-0.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index a91da58d35a5..d194073af5c3 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -5,9 +5,9 @@ DIST click-6.6.tar.gz 283420 BLAKE2B 1fdc90ca65d18153d6260b6753e14a1d94cae77ab7f
 DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
 EBUILD click-5.1.ebuild 1231 BLAKE2B ca2e0720f98342640b0d8a949decf5e379e637ad11a5336f015295def7f14860f3c183ae33f5a1da7ae91d2aa53c693085feb25733ee25e4990be3dff2f18e7d SHA512 c9991ca5a6fa15323b4b6fd4f3e40a799587b3048982a575664dfac1fdc9bb93f6baa9002692beebd7de506f7a3fec63ebc76847afd7a80140a2edaebdbf1911
-EBUILD click-6.6.ebuild 1218 BLAKE2B 3b4ba9ac24f1feed62a04512670bb2bbf61c86881966efccc3d3563703585bc576ddeef4c2cce83e64fa2d2180e4a479d6de4eec30ad83ed73d9cca20e1c2a6a SHA512 bf49b2cfcc9444e51a92de39a31824b52bb75d88fc656d1fbfe286a413668c01704a2a77488a1706b8da15aa8be0c2354283ebba6b43f6390354f7c1652c419f
+EBUILD click-6.6.ebuild 1219 BLAKE2B 461ad024ae19fd1365138287f0ca28bbd64b103a9d51d3b8eeee864129f8a462fccfd7eff1d444d4ae4187bf06c02b49c942ee027cce02cb87c95116c9e8e8b4 SHA512 9c80873885466b898c215f17c3d8771cad0b9abe80f17942a54914a531b33eb9366622cee0320174da1dfa3c68c08775c4dd68df24056601947ec003096b5676
 EBUILD click-6.7-r1.ebuild 1439 BLAKE2B 4f92b35102b92e4c232741e81e57b2a8b9737bdbf914ff9fd63fd5cfc128bbee419124983a7d8d585e3cea27f42c5d706b44464cdaabcb9b2d8c7f4a853d8fe5 SHA512 5ea892ff450c607fae8f8e62651a4b99c88d8f4fbd7a4bdf8b04101ce62f0e1ace0eca1d81ebf5a24b8e111a7d32b433e11615b65214d9268c64ab32a6dd76f9
-EBUILD click-6.7.ebuild 1325 BLAKE2B 4192928138100819a675e035dfae712ae6892840ec623b4882bdeb93c9cd517bca99e77019de1c0e9c05f039dc93513b6c72ac2be0a788928be60e664081c51d SHA512 60e808a5195eb92073eb37a326d76faf9d1f494c7f2ed848cae71d9694888f00c6602a4f57806bc048f5b6bb78bb183fa2fa82de72c5b50177475d2177e6421c
+EBUILD click-6.7.ebuild 1326 BLAKE2B ba01cf0dd9a48acedb6524f6cd91945346d16d36a36acb54409107349f4a28920f6749274152c49ef0dfe85fd69bed42066a1ec0ba959123f3dc864cb5d2da39 SHA512 e7b29210596f9ecc3089ce02492e13c64095f607c5aedc598eb1d3f0f1592a90d8e1572b8fb7080615e79b13ae10728458d2503bda62c1b710b4df45dfaf2331
 EBUILD click-7.0-r1.ebuild 808 BLAKE2B b5ae0868d11fc0ae664b13287a01d204ab24cd54a7a42c11cf53b8071a80107e73aea5c8ece549b026b53111d49feebaca9f2d990579f19bda75a4fe031df7f0 SHA512 9641d4014bf61ee0c3057a783b978f77edfb413278acefd680f37fcbf31441b42669995076a9b7a6d3b9968fbecaf144b509814651aea2d986f28f9a735ceffb
 EBUILD click-7.0.ebuild 1232 BLAKE2B a757ffcfaedf68a5c537179af7be15892c6807ec645035eaa14ee796d3fc785d6c68f701928c7d1a8242b9eb42023aba3e19c65a8d524f3dbcba64c3f9e53616 SHA512 0f8aec6ee7debab6e5bd1f0bc21f6c1e414af4fb7525f08f9149edf4d2f692a8e5dee58d2c4bfe8abfdcf9da33c594a5d5d3fa48b1983cd7bf5ab6c5dc9b7ab7
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
index 2b9e8a2c2df4..525c8d670891 100644
--- a/dev-python/click/click-6.6.ebuild
+++ b/dev-python/click/click-6.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index 9502c026f716..73806494972f 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 38998f8f7a54..92fa9c0f6c25 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,4 +1,6 @@
 DIST cliff-2.12.0.tar.gz 77405 BLAKE2B 70b3865837bdba1396fd76b4937c594dfc9f50db24f684c6676c4ac1125ab34f6cdca29fe63a490d41abd49a268d6246afc873a5805446d06b07cd754aebb727 SHA512 5802cdd17b6aa81dbb344efb8ef53212de999ab33eaec1eb06e1d002ab513758d3634ae5013ece6375b1bb98c9fed99aa74cf92752c34e1132fa5ac20a969f4f
-EBUILD cliff-2.12.0-r2.ebuild 1771 BLAKE2B 556f55f4d37410f970c47786efa2a61682e49f8fd29c7db2c8ef2d1291eb9198e081b572fcff63304b9a00a2c4fe73a6b11ed1bbfcc1cb77c4764b8fea620660 SHA512 3216ec357f2a96df5eec762042f69b8b720d30fe604d27ec46f01e9f53c2db19993adffa8739a9d3a96909ba0ccb64e1af8fc9a4911c132ed11dc0855533f29b
+DIST cliff-2.18.0.tar.gz 77905 BLAKE2B e371c4025fd3bf0543d3f4f038ff891a27f8116d3c833a2ded4e9f619879501868c3acf9e2f1c36023b79da404dcb69f8a8c31fbbbc2847b6c7dfabbd7ad666e SHA512 0748f8f392b11ceaa63f516860f6a339a9bc1233134562b13384bcbaff0b9e84e82a1544658ea3bf9c0fde973c563bfa1e92cc418a2fef0bfdced3f88d93058f
+EBUILD cliff-2.12.0-r2.ebuild 1778 BLAKE2B 0b0b5479027e8b0800b7df9b3f650ba1737df84e7c7bf8bf06d0530d9bc975d6c2a3c541f667b507c03362085412b70800513fbd7f505d366ab11fe051aade40 SHA512 a298fc60f36d7e79d4cd04a79fcf6d9fa12b54d61a4927ba943c469f6b272523b541a3533afe4fc691a723fce491f063d2cd8e8a5540b853fc62993a1ca4a05f
 EBUILD cliff-2.12.0.ebuild 1559 BLAKE2B dd50a2dd0ec4aa1ab3ec27a20cf24cb7b3e0fcbe32d56b8f422fd4f6ed89cfbfccdd722963b5ce5f85d71fa27df2855ae46c9019fe016e8bbf7f352944a6463f SHA512 f0d5304d8ded0f4c843df861353ea15d5a697173e1d6e67f703b2ed1f4cc5b07ca8638256c4ab732d65fc028ea3e471d9a51402a26be3c08df083941ea54e1b1
+EBUILD cliff-2.18.0.ebuild 1848 BLAKE2B be0416b57c100f4a3be061d653263074b37b1e365c5f6af1d665d22ca14e94fa617efea41dd7eac2d83b787209c3808dd4dd48236cf5fc23ce141ba5d26382a9 SHA512 3e617b936c6abf5d94452127fb7eec82a8754bede72bf4580c4f379c73c505881031f7ff1f2c6e363f9873c5fd582b02478438933673aa7b2a7a0613d6226d75
 MISC metadata.xml 709 BLAKE2B 05e69832a5cff97a52caebc4c113a39342e62803fd523a753a8ba119f4326a9814c7c382e88906514e539922c1f22683a09dd46b2c11e3d60b8f885072a08e72 SHA512 f031fa34d06b4c12c8eba5a046c07f1e391fd84bd29d6a4ca8c769c2d774262d66d7bac12d05cb8ef669db7e2713d6862b6a118e9f9ca810e9ae0fa9fb881892
diff --git a/dev-python/cliff/cliff-2.12.0-r2.ebuild b/dev-python/cliff/cliff-2.12.0-r2.ebuild
index 0e0821fea9e0..ad16b17bab63 100644
--- a/dev-python/cliff/cliff-2.12.0-r2.ebuild
+++ b/dev-python/cliff/cliff-2.12.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cliff/cliff-2.18.0.ebuild b/dev-python/cliff/cliff-2.18.0.ebuild
new file mode 100644
index 000000000000..6087508896d4
--- /dev/null
+++ b/dev-python/cliff/cliff-2.18.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via [entry_points] in setup.cfg
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+VIRTUALX_REQUIRED="test"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[${PYTHON_USEDEP}]
+	)
+"
+# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	# needs outside access, so blacklist the test
+	virtx stestr run --black-regex cliff.tests.test_app.TestIO.test_writer_encoding
+}
diff --git a/dev-python/cligj/Manifest b/dev-python/cligj/Manifest
index 8360793102ab..50f195eab763 100644
--- a/dev-python/cligj/Manifest
+++ b/dev-python/cligj/Manifest
@@ -1,3 +1,3 @@
 DIST cligj-0.4.0.tar.gz 7281 BLAKE2B 7795f28bdef6ce5823bbf0b346d900e95cca4655cce985823318b8fd9854fcf245b523f3ecb06b44d6810f268b658ed4e4276d7f022a9085bbfa623914b68a2f SHA512 35c075192f39c7c756a5abce2cc706818a5c40ed91d25a5763483b01acfffa29b50ce58e758b0ca42431978e436ad45a93049e05c6dd0a98da40d74c4a329669
-EBUILD cligj-0.4.0.ebuild 529 BLAKE2B fbba482e904885d449d5fcfb5ca7614016019efedead7e556557721f2c58bffefedf3baa119d1e7b85212b44d7125af0a6fa7302cc2977abb62a55a175301140 SHA512 c9be3aba872408dd8ef6fde7c8a955e298ee5e44919712d8196293c231de2c5ae6a8ad2146e97f0c00a2a7b908cdbb48aca85adfbaa2f3c5176f6ca583bb0f32
+EBUILD cligj-0.4.0.ebuild 523 BLAKE2B 08496807944ae34b5f00deeefe06d858d43a37bca3ac6f5ac1d1ca29a20ff63fb6e495a37431802bacb59d57f2870e3b274d0424de2b9bba31b967902d45177e SHA512 1d04c635c7ce0ca6d196c3f52b5eb2ebcd5e6dda4c5b24d4769ffc6ee75361852d89ef8087026cc1fa38c610337d4aa8634b39ac702686d7fca9638f39ab5ce3
 MISC metadata.xml 294 BLAKE2B bca7d1cd438a89c87a8e56a37280f0c3154362b1245e169b8803a5727f7558abf38158badbd0767cbadc34f3fd1fec096331d1f5f1b95aa4bf34886b900c2d94 SHA512 855a3e9a0b306da2c0fa957e19fb1e57c798aefabe924a29d6f4f53715a891eac7fc31cd1b8543b9553230d79ac4797bcdf2bdd50c1b63a1cf729afd6ba5be57
diff --git a/dev-python/cligj/cligj-0.4.0.ebuild b/dev-python/cligj/cligj-0.4.0.ebuild
index d20b2c2d7248..fb5249de17db 100644
--- a/dev-python/cligj/cligj-0.4.0.ebuild
+++ b/dev-python/cligj/cligj-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/clint/Manifest b/dev-python/clint/Manifest
index 394a42139062..14c588853b53 100644
--- a/dev-python/clint/Manifest
+++ b/dev-python/clint/Manifest
@@ -1,4 +1,4 @@
 DIST clint-0.5.1.tar.gz 81140 BLAKE2B 5b42e7d46321f0416d3ffb51edf66c53476d3e4a211e971f36cab54a412f6b0f0ec26486c2b95871956ab09e7e4adf68e8329dd7e9e3c7ed1adb3f8a0dd2a728 SHA512 3ad8bfc587acb1322c7d7c3e73756a07c98f3b4215a3d4dc409b5a2067bc70dce2dd98d19250b8122b319b7bcf5e2859251de2829780345de06f93b35447c4e8
-EBUILD clint-0.5.1-r1.ebuild 961 BLAKE2B 32af5313b110bb2cce5c0e0d6c7ed8f0f9661e6436156cae4a4215f5c0326688334c27b276ee2107a5965261e29a94378b863b5f62e585ca6729f5dafd611e49 SHA512 25a983177cb48285c65cc84f4412a2b1a40cc899d50f5efe008ad66734f36e822a85f61593b9ba58e0403e52c195825791341cb3ad5d659b73628f70134bbb62
-EBUILD clint-0.5.1.ebuild 973 BLAKE2B 3bdecaab2384075a53bc6359be4fab8dab8891a1198781d263f4b3a1b3c507077ceb4f3ccbea0de2ac0b0d35574a8de614a04abb9e9ddfb15a44a7633cad193d SHA512 4e9590c071a0b33990c4bfc869da4b8bf5ffac27196a862797e70dddffa340637a4e85ee71dcf68b6585b117ad81ec4e7b05eae08c86f9671b6ac8fca8edc9bb
+EBUILD clint-0.5.1-r1.ebuild 956 BLAKE2B a509f04ef77b5d78601095d95e0df5dc85a23ff693ba8a02c6c5d444c89b9938d439870077c62e30260478bcc7a6084976821c933c38f41bcbf2d90074cf6dc4 SHA512 e6fbd9faf0b705edb493bcbca0d0746c8d90f1173810cf182a88c021110103f2cedb7199b2932db06835b89d82f92a91dfb4e71dfae5f8e9630040c185c3ab0b
+EBUILD clint-0.5.1.ebuild 969 BLAKE2B 33ba296026c17fa4df56bd10df08a4227b5684d7cc5be7355172b99a319cbf8bafe965005eca08f7f5ce7556026524f12a52860bef081507b1c8c4a3ccff965e SHA512 2e805168409122451db65b17e5adeb1a6c5382d39feb9e9aed95b93a7b6b16ed270d4a6a1ab21eafdc80f8c56ac07e76fd84128de96de630d643e15916953ad7
 MISC metadata.xml 248 BLAKE2B 886e9928c5735483e1b88968c7c68b328965d8b77022184e2428115042bfa146439a44a5b3b6ae1c813fc9626617bc5158d0be4d0c173594dc93efa84f1c2268 SHA512 28daaa3233c61835448e78dfcf4381cbb1d6789f0fc16b309aa9317d36f81754d1757ba5d6be5b6b6209fad9921708619b4e92011d91c879eddc440a819fbbdb
diff --git a/dev-python/clint/clint-0.5.1-r1.ebuild b/dev-python/clint/clint-0.5.1-r1.ebuild
index efed5775c96b..295b4a9f6f5a 100644
--- a/dev-python/clint/clint-0.5.1-r1.ebuild
+++ b/dev-python/clint/clint-0.5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kennethreitz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/clint/clint-0.5.1.ebuild b/dev-python/clint/clint-0.5.1.ebuild
index 1538323f4541..f410d95fbc4a 100644
--- a/dev-python/clint/clint-0.5.1.ebuild
+++ b/dev-python/clint/clint-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index a03f442d9820..647a69b9ebf1 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,7 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 DIST cloudpickle-1.2.2.tar.gz 43576 BLAKE2B 9b99d106196ff88bde8c8add2eca7dd0c6118c89b3d68892b17b11ad73435b83387490e4c5c52306b4355033595f9783e3a313a6bd58f9eebf4517ff77d486b1 SHA512 44f41433bdb12e6495c14b7a470ee671fde3fcddf1a57d8f6d1203925a63944a1458af3ae7fc0353602f9900bd92581699b1f7ab199668f0425447ed8337bfb8
-EBUILD cloudpickle-0.3.1.ebuild 640 BLAKE2B 75f26c9586e5b4672ef8ebbe3f2126dcd542548badb6959658f380747aecf6cd15406ca5d462c050b014536c4740b1eb6cf1e83794dad5a37eaa55479d1c61e8 SHA512 905ab77f282591cd0943d0a888a980fc2428ef46a29f2c0b8f70077dcedab8a54562c6ac6494e2a8c82995572c66af960eb959e22654ce6545b35298cc2fa98d
+EBUILD cloudpickle-0.3.1.ebuild 636 BLAKE2B e22251c43b8083e5b1575f505f8b5126d1afd275a82437318ce2b3d0b24623719838b0c065adf55d95dcffe4b72efd649157344e9f0e97d92c7bf466634d34aa SHA512 acb3a830e77ccd6659c49a57ccde19dc191ae61fa62a6f76967971799f93d82ca8ba361c3c499d114868def7cc7d072a3b1e571dc17323c7f23b1351f56d7439
 EBUILD cloudpickle-1.2.1.ebuild 745 BLAKE2B 9631d4066278bd4f8e3013dacc50a15b906895ef8445c7a4adce80bfa8f0347652163f23d8778ca49dc9964c8c8d3735fbe99568f0ec2a0aeecfaa4adfc24b9d SHA512 bb4a12aac5cb563b6224b5d18fc01575de5c8042cc44e74a2bcbcaf0ae4b113ee518667dbb4ab7602a47ede91f06457827a3ad6466cd042789a5aaf934d7957e
-EBUILD cloudpickle-1.2.2.ebuild 752 BLAKE2B bfe4fc924d6b1813976723f4fd5dd91b761ba35765bff4ef0a001495e50115e8f9a04cc9676b8ef5764f1556f58dd0e4e0ad1f355378a4c848c314bc3c30463f SHA512 6e2c42453b2ad7ae742193d25f116c2832a5a3c8983aca081d5879ac9f90742dd97f57aa028adf96b3330b955a39bf99d61717f243b1d0a083eee2ac1af2b10b
+EBUILD cloudpickle-1.2.2.ebuild 746 BLAKE2B d76b4eb9ebd1f0ec0ac71ca310633634fa5f91bfecb734afaf704f8feaa1fb86b8274f9a4b1fe935aa63ad3b7ee6441e495a725b3adda833ff5735cd1092d0d2 SHA512 2c50d862b22cbc2e924ccec83c0d9257f008f2836179617a6017f5c768a2d8194712316da3b110e78376ae7ad4d0efaf87f3814cfb3f293cd4ffd4c226663635
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
index 3dbbee18a2a5..086523e0f051 100644
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
index 1a4644082e51..96720e650777 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="Extended pickling support for Python objects"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 076620618ad5..ba964c58a48b 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,9 +3,11 @@ DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
 DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
 DIST cmd2-0.9.24.tar.gz 580456 BLAKE2B 0f4e32c52589d7493db13aafcff1dcc37b45d27120f546baed0e3541398f7ffde1a381b44fb4ba2f822ffaeff0ae52b7ad5cda509370685c480a76e1d677f7ed SHA512 0d9cf8d203914f9a62ff15fb538440a2a506b1751c381cef75054839f04fedaa3c6a43b7da8ed99dd0c3b17b55641e2a1cf90826cc7948d2798dbb45e53b6639
+DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
 EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
-EBUILD cmd2-0.8.9.ebuild 970 BLAKE2B a784b56d861c9e799a75ea4bf5626fac0a846249eb4de2b90b0f14b25d4435d6a4ccb8e98cf64b799aae1b53ea86079eb63ac470cef3e17277655bf2bd35ecde SHA512 fb5f2668cc8c607b8b49f66c9f1f9216a346e53d3184b383b173fe7d0fe71feecf149ee8196998ca9af40a82d93050028f987b5086a1462a0fa3e03aa50d16fb
-EBUILD cmd2-0.9.22.ebuild 980 BLAKE2B 98e6cd484b1e109cda69249627a4c17b3656e84b2be47ac7a16e7227a108a71c4d914f2bf88eea445463edbaf15e82c39b98790521d8afcf4537e57135187a6c SHA512 d9afceb31e3b128b34a39623c58728ec3d49b365df04c3984102d927a06c6fd0f7c21a94647d657df45c9090dfb9819b74ad275c84891d9b9a7ac5a6b2e196ae
+EBUILD cmd2-0.8.9.ebuild 977 BLAKE2B bbf9af55c9193292961166d278515b5ea0977ca77101e80f7a4d121f0678b512f3e2b67dcde76081b26d736294581a239f5033878c8d6b800d2027659ee53f04 SHA512 b2c39ffe37743f0cead927ca0b120a1ac6cf842fe7235168be60a8fbff030905c02bad38db316ac92a5d30eae018677473a4acae2b2a48fe07dcf10755b898b5
+EBUILD cmd2-0.9.22.ebuild 984 BLAKE2B 0972dd77534ff95c19354c2befd9b278422a5316b937c65faa1f12d268ff209034dce75f655a77975c8c166c9fc049640083cd4e92b543b0ed73904e980506da SHA512 54b39773b49af3479f43932affa8257c9313387309d735223718e2ebaaa3c66acfb30e418d35d042aac0f839e3557f4f497dec2b25b18df4c5a305740cac8165
 EBUILD cmd2-0.9.23.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
-EBUILD cmd2-0.9.24.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
+EBUILD cmd2-0.9.24.ebuild 882 BLAKE2B 46429886785033d06affa3036a9c0875dcc97d02e003fa059e3f15e0370d3e08483dac9f43c491dde48b014d68c015af2160346f7599974e877b1f0eb5c89bb1 SHA512 cc0a636ee115f1677c987504411434ff2047aa1db5bc0392fbe308e78f2295743bbdde4f394258b45da5ebda3179f2299f2186148a8699d7f7adabfbe20110b6
+EBUILD cmd2-0.9.25.ebuild 841 BLAKE2B 0b8ff83c19092accd68d8b3bf58ae5c8c2fe3c416e5c4e937efeae72d3e8815d5b22b431fe6e7f0ff71e900987b8ab1695425aea36a19171420e6c1f636524e2 SHA512 cf45b822dada703a4939416bae1cc6de55edbbf96f5372811fddcee13be527c5b858985775be9d6ee395bb55aa3a0c5f20b303095d78611267a0406ff0ca1383
 MISC metadata.xml 496 BLAKE2B eb23ffbf044908e43bf041331d04a6d9f70f608845398e9ab5a49150a2231877bb5daeecc14f3201344575c6ce6c254f60c506b9959d82e6464b124532ad7ec6 SHA512 21d529f12aa96fd0a2b444daa1fc44a93a09c06c190c984f357d9c1cc167379e9f42997aa8ac284b603515bdf38742185646eb9f457ea5898e87834fcf09bdd0
diff --git a/dev-python/cmd2/cmd2-0.8.9.ebuild b/dev-python/cmd2/cmd2-0.8.9.ebuild
index bb951d314309..02dd3f6816dc 100644
--- a/dev-python/cmd2/cmd2-0.8.9.ebuild
+++ b/dev-python/cmd2/cmd2-0.8.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # restrict tests because pyperclip is fairly unstable...
diff --git a/dev-python/cmd2/cmd2-0.9.22.ebuild b/dev-python/cmd2/cmd2-0.9.22.ebuild
index 347d10c90d72..6afdae884efd 100644
--- a/dev-python/cmd2/cmd2-0.9.22.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cmd2/cmd2-0.9.24.ebuild b/dev-python/cmd2/cmd2-0.9.24.ebuild
index 502253d32c93..78b85c913b6f 100644
--- a/dev-python/cmd2/cmd2-0.9.24.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-0.9.25.ebuild b/dev-python/cmd2/cmd2-0.9.25.ebuild
new file mode 100644
index 000000000000..0a6f24240007
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.25.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/colander/Manifest b/dev-python/colander/Manifest
index f75d35fea17e..488544496a2a 100644
--- a/dev-python/colander/Manifest
+++ b/dev-python/colander/Manifest
@@ -1,3 +1,3 @@
 DIST colander-1.3.1.tar.gz 119999 BLAKE2B 8677dc49eb24b353dc42e858da4e745e711cf852226079190e475f45e6dec341d429cf3d62cfa6b4835b9bd137956ef6a04eb7f1684807bd5f230e114f3ee2e5 SHA512 0aa9063e6f88ef63b5378cd93d3b121c8323e4632dcff31f143d2ee6dd33edb93a7fedfa06ca250288f7bc194a534f1027b89c9c6cc92765cf4348709e539da5
-EBUILD colander-1.3.1.ebuild 1542 BLAKE2B 87330afe85d695127f64ee8cea5beb921374f03166cf62f5d7a67d0d3c54ebad68284debd5a83d7dd9ae216570a5216c2c625b1965f41d7802b62612cb28dbce SHA512 672e348a6a579ee0960228473c1cc963aa43631d4663427e91d6f765f17dc96246339136590a0617408a43512141aa4438b4e2985544621460c6e0fc49580597
+EBUILD colander-1.3.1.ebuild 1536 BLAKE2B e0b2c6aada24bfce63e03a01b089b40769290fd41df59f8a04b8bd66c2d942f7aa6901b2a2818be5385f46088cdb66ebb6e9bd7f41e06c4a74cdf3aa94ace263 SHA512 0f43126fb04e5254d889a50a5ad4b7ee7ead4792cf87ec7aeceb2d12fee755627ce4880f380130ac15fe4371a9cf71e6aa695cd7c87b1ffa9a558a3a023a5dc5
 MISC metadata.xml 311 BLAKE2B 369a77b1ef148e7c46c7f3eebc89ec61b45295ae10c9882bff3ed33178ef80e671cba4327d31f0a1c7a3ffbc65c52c8e546f9e663b7291636d6b764e88347324 SHA512 c0fe889c10d25c88c37e781c6e355c51f1c2c24615d616170da287c6bce490f6cd6b501a783c5a4e98f7c00c945fb686e066422271d5f43495c5c68e459c7f7f
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
index fe15d24ea55a..6cd4cf288987 100644
--- a/dev-python/colander/colander-1.3.1.ebuild
+++ b/dev-python/colander/colander-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 0d16fa727a33..ea159cbe4df3 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -4,10 +4,10 @@ DIST colorama-0.3.9.tar.gz 25053 BLAKE2B f633a188d032c41d0b6de60540ca1774dd8f3e8
 DIST colorama-0.4.0.github.tar.gz 104679 BLAKE2B 416a8bc5af470dc22b71a84279e4d984b57fad7ddb617c80c9104830127efa4f545eb08c003d263e48edbc0db39bc150e74f64f68f22075e759c11a6e84c75d5 SHA512 e2214c0a4ce1dd5515cf12cbb91220d2314da747b1a1246641117e70ea81b162cb4748b2b5dff049e102540470617a0076a3afff64bfe67158bf7bd95e1cc6f8
 DIST colorama-0.4.1.github.tar.gz 104708 BLAKE2B 625c6ff325ff0de8113c5c9abe9dd296eb614b0483a2dce59b163431ec4ef1992073719160143b68e76d3ad77f77b975a110ce19496be1d8f6ee90b3f66b6e7b SHA512 006069859ca05ec8a6808860ca73ab541b246e6e6443b1bc8426973beaa5268660b48994f21edb6492fe97c4b9d29949b874b861ec200b1756d40e8abda8dee0
 DIST colorama-0.4.3.github.tar.gz 107251 BLAKE2B e09e92171b6ea4b3db4801feaf794e9aeb4f2b3e57079907911cbb909167b192eb857f0b404fa45673bee3bc02c122326bd05091846755d7dbfd990a74c60a24 SHA512 ab41a2f95fe75de0b280c174c6166b86645e5cc675dcedf784fe15170aae630e831370527c9490342b77c7d088a023a48428a519b52ad1c70be58904742a94c8
-EBUILD colorama-0.3.3.ebuild 663 BLAKE2B 99c36aba507188afd87c5033ee90934aa3d2c009bb2fa9090ac848c63955cebb66410ceb5304d07c5bd23dda7d24e53a565bd591d1aca30bee694664c754109f SHA512 26298ef2df9bc496f0355fa524ed3181f7e7165abbbc655612c9495d4c252ba8ad8dd30329cbb02b3a8161c94e7b35e3dc7894710dd1ec30f6e83ea0b1687bd2
+EBUILD colorama-0.3.3.ebuild 664 BLAKE2B 74db06feebadf915b3108f291c989447608c6a24201d651e96c4c90ef05137b68237b2c42d8a2a50f8a81b518919e63c2314bfed58f2c1ab38f12fd9e5eb0712 SHA512 082f112a0e6832725a9c9e8611389969176e649915cd03b90c728a1d6e2e982f2ad47a181166a60af413ed1fd8901eb3f0a750a55323c84616bcf9551f6457d6
 EBUILD colorama-0.3.9-r1.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
 EBUILD colorama-0.3.9.ebuild 761 BLAKE2B 7abe940a7bb508c6fa06e25fb80aa72290ca632353955e8fa3741c4ae973dd10cf6e11a3fd11c3ccacaf360f81a4d6cdadbb79ececad79db639a2ff238be1d0c SHA512 0f7981a23288f1466bb8bc5e8c61c8195865b217c320534c3eecffe54ae668bbbe2fc57090fa8613996f43a9046ec582a9ad5c2acdaf0ffd8ae7f595783f3140
 EBUILD colorama-0.4.0.ebuild 1146 BLAKE2B b1921f7ca267a296cd4bec50b23b23ffeb8d671350e67185ec48e9e290717dd9755c98ca2156deebb35e92fc5ade74a68bdc46eee233348b0c9e555b4369d264 SHA512 537ce9e9572954d23b93303ad985f09db33fa79db9d0a33dc2c139ca0d45aa72f8a51b892a7054db35b67201d7c5d583c8cd4fb752673cb0685cd8294b9b3f0d
-EBUILD colorama-0.4.1.ebuild 1140 BLAKE2B ac535623d482bc7134ca7533aa2f7cfbda90de56c204cb5de6a80f097d011ce64a77b84cac09e20d39d45fabeb52a0bfc9935e0b77ec48de34aae11442a3a2ae SHA512 1da9957818faa25ac8f130121055414f5cad26ad618515ad4fe7f14e8258bef5c83c92ffc879f5ab6f0f885ffb46980a2ccdb71546417c1617e2ffce333944e9
+EBUILD colorama-0.4.1.ebuild 1139 BLAKE2B 08799c4903bdb7d73be3617a1db03e44f4364616643023ccaa3541704c766e298cae082422c474f1bda9346226ce3381d022b1af203db26b10d53bfa080383c8 SHA512 689ce469516b22a8ae0a1aea5ba190af9b1cb7b5e867f074a76cbe481dbfe1b1bbd2c92080f620c2867bc326d3567a8c500f18c895bda685754fddc9065117fa
 EBUILD colorama-0.4.3.ebuild 1107 BLAKE2B 2e691950b939dc790fbceedf8ac7cfb349cd1a9e1fd18335b0df1daa6409ae70a4184d82be5b4dfe454b30e86e0d43c5baa7dc009eaf0ce4b0832d12b61f1f01 SHA512 dcadb2b81cb3e1cc729cfc3611ed499006e25781029c0c02ae846e7c91372c38da0db0fa1a943beb9ebf5b50bd3cf71313e3dc56dcafe0d36af2d64527754e7c
 MISC metadata.xml 682 BLAKE2B 9e9eccb56152824c5d47896af7ae8a699a9a614437f20008fbf9c793e0b79cf3dfb0fb6b9da6d36be4d699b2df8817f74a74e098b8fa945e08734d9f068cca12 SHA512 0a9144ad52b490c2e607eae85aced164f4c2f15c152592ca67a588d659c34c3baa16105746fd4a6894c49ca31ee4b0e1b18957cb7c421fc788cbc933afb3e895
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index f6b2b337305a..ccd957768b2d 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -15,7 +15,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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/colorama/colorama-0.4.1.ebuild b/dev-python/colorama/colorama-0.4.1.ebuild
index 2ddcb44bd200..e6581e95a27e 100644
--- a/dev-python/colorama/colorama-0.4.1.ebuild
+++ b/dev-python/colorama/colorama-0.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 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="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 077aa06224c8..601ce0c3279e 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,5 +1,5 @@
 AUX colorclass-2.2.0-tests.patch 483 BLAKE2B ea0a953102fcb693e451f837cd35b77a0a8430ed7f44e898a8c6b8862643c8f51ef6d793153af795862561df4cb6046c98e9658409aded87ef74073e0858a26f SHA512 f415192d9de61ee8d0d6ac39f33effdc4b107069cc9a9abc3c0b1ecdb903ebe9785036385bac59217a33a75c0bd267dab2a9f2e9b9127b00e4abf4e7632123f2
 DIST colorclass-2.2.0.gh.tar.gz 486151 BLAKE2B d8f4c9e826cf284df47bf2aac4da71f448818858e2383b331b5bba791d9db3c5c11d5aff74b3eb740e657914137b2b74b217854ab589806a22a0ff6697cbde1c SHA512 c627cdf6abdb5a60e9ecc1fb3b669898edc027fdc3f8cde31be2e10402ee308c2067fcd50d1228759e93fc58c521b7fc12e6b259233a17cf99f55cda26279fed
-EBUILD colorclass-2.2.0-r1.ebuild 621 BLAKE2B ebd65d9063b329795015717779b989b55d0ea67410d88c9258f87ba5fc515b63e1f2e6b4e24d26921474c083860c8deeeee7d271ae35cd59c64fc5f0214de7eb SHA512 812940c012057eca67f4bf6b30fa94d01c8941967ddee459a9d07593201dcdd091d4a4d8e274ebd8f4065e9efb4aebfeb78f162041e665ed6756d55b690e1076
-EBUILD colorclass-2.2.0.ebuild 677 BLAKE2B 32a5941d5b4fb2f919dafd6976de5b0e1dc7d02933e0e1ed9071d54c521195079736296d7e66ce1572eb9ffba0bef648f806b096eeb27f43290b7dc29b6ea476 SHA512 1a7f10e789b23418b4487aad446e6bcb105bcf3b8c8ac742049503dd495a281b12a9056a5df6793f1499c5fe51e5879e64a7f864fe062d859be53f4ed30488f3
+EBUILD colorclass-2.2.0-r1.ebuild 615 BLAKE2B 90b87a75c326c7946dd36e70687685e881bf4dd7ee8d986f6e78e1aa67ccb225c4fe0fa6b6318ae4ba9b86a22e74af12d2098b0d4a2529426634cb95bb8b80a0 SHA512 0510a94481cbe44a2312b1af1456daf11abbccabd36d4974e20014ce2e3a5983d372ec4386b061b397eb397f82afd4e4f76bec7793d0e124a1506d5f8a2d0209
+EBUILD colorclass-2.2.0.ebuild 671 BLAKE2B 31ea6199fc9d483c171368edaa50e3388b8d0e17c6f4cb96e8c7609abc931139a593bf6c3f27ac06455de27e9a22446f174bfad5e5b2b62611b13e6eea5536e5 SHA512 3fec636b7365d5ae4bca7b21ba942dd8438cac1ee0583b4e13b9328605a36208c78d853b5933ce2be98396385ed54e094b8501d27b6a341a22bc3c425fe9ff93
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
index 79704c087f4f..eebecdb2b07d 100644
--- a/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
diff --git a/dev-python/colorclass/colorclass-2.2.0.ebuild b/dev-python/colorclass/colorclass-2.2.0.ebuild
index f955ecd6a25c..f9e47ecfee38 100644
--- a/dev-python/colorclass/colorclass-2.2.0.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index 0d4d3675cf42..07e86712a5d2 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -4,5 +4,5 @@ AUX coloredlogs-2.0-skip-cli-test.patch 842 BLAKE2B b6e17539f22349bcd20ba4ec64f0
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
 DIST coloredlogs-6.1.tar.gz 28057 BLAKE2B bbb5946db3e6cbfae0b9947d2aa29769858833e35213a44a5be4ceb434021ee8c583ff00c980b9ab4fc533f6fec80e151895097b6a87c44257ef0fd5c7ab0bab SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405
 EBUILD coloredlogs-10.0.ebuild 968 BLAKE2B e13edd601efe9c4d301706fd74a703476181f2d90f66225cb3dbc84de425f36f1a845ea9401a02e821a96ebd803ea3680e00af011faacbb8496b237ac99bfebf SHA512 cfbcbf80a0c0534e97cd30b99ba728d5c3e05847f2a8588fc8c2f4177bedfb54b1808922d32a600654ba2b9151f1c12ae64c5c5d5e9d08edd660f2e57399d442
-EBUILD coloredlogs-6.1.ebuild 1224 BLAKE2B dd2629e708f1014b04c6bf5e7850aea32c3fe2311f9f5ed1585a5a2e7ca3e030d58cab595b53ef20b95c66b71917f9e799da159a3a6930288de3e75530007cde SHA512 9c69905531fad4d9370df1c6a98757cb6033ae42f2d20574b5f4b0a02df1740d0a3b87be6d22abcc29652f9be6ae9ab9664e5b535c7ea7b7aa9e1dd32c3f02ca
+EBUILD coloredlogs-6.1.ebuild 1214 BLAKE2B f306f2ac203596bc54c579b680bb41d42cf54e5b0f30af34ef228bf122e5b521bce10da8269b5d851b444336c9d45966bd601711f5a307fb4c5ab8135e3d6c5c SHA512 58f57b9ab8e1a80d7c9ae35954ccf219d136c6090c823dba0f810e4b942c68641119ef3d53c7df55d53ac21e89f06897a72b8c216f1de1d5c04c07beeb67785d
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
index e5f3a194fa47..74ef59cebf37 100644
--- a/dev-python/coloredlogs/coloredlogs-6.1.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorful/Manifest b/dev-python/colorful/Manifest
index 017d64f697bc..bae1ac80b495 100644
--- a/dev-python/colorful/Manifest
+++ b/dev-python/colorful/Manifest
@@ -1,3 +1,3 @@
 DIST colorful-0.4.1.tar.gz 19696 BLAKE2B 9229200853d3050ebe61817fcfd975444a6568cbd490798c8bb2fdf3bb0286f7263d40942bb5edb28f64c6dd28e7a02cab5939d562bd2b091c05232efc3ac37f SHA512 41ce1c35193ebd8fa22bc06afb5536d02cdfc6bde89068693f6ddd1fec140f8823dafab10cf40496f48cb38ad87f874edd6819446b824028575030160b0adc7c
-EBUILD colorful-0.4.1.ebuild 525 BLAKE2B da441bbdf93aef7fe007409e1698b3b7c00a3f88c575808c99549b88b32fc6abd9ddf8eb4f49c0596f332193d0c21f0bcb6048ebf6db99bf9c8532f27c147c22 SHA512 3bf62d22515d2bd0843c2f5e566e86297b16e120f0256d4f253ab79db270540e57490fb6a45e2cf04bf427b714e9a0b2902de345c09e763394234faffe0c2723
+EBUILD colorful-0.4.1.ebuild 515 BLAKE2B 607f00b315d3323f3a70e3924228abb896be4f232bdbf5da37e5029945d1588360339afd0174a3751ae161805b72b7074c3162625a53463d3479aacd2defd623 SHA512 242fe89ad3058fa4e077febe9d33690871c50755f789f9b95857310dab05f3c430888387db0557c91ab9cfc9a82182f1c875874b945d131b49746623f6a328f0
 MISC metadata.xml 414 BLAKE2B c31b4109e46e8ade1be085620f1fd56f1e9f56dea42ede3a4a6c2d78c4ad3064e1b1b461f4f592fea22d43c2cd9ab8d4a77c5c538253fcc2bafee93286e6a270 SHA512 7115621b68130df38d2f5f1a40b4149dad94b96d985ae2d3385e717a163604cad5d38901310b757447912d00efc5c6a24f51729d7396a652bf2d8a97fdb466bb
diff --git a/dev-python/colorful/colorful-0.4.1.ebuild b/dev-python/colorful/colorful-0.4.1.ebuild
index 75f2c8b247df..e99d3dd84bef 100644
--- a/dev-python/colorful/colorful-0.4.1.ebuild
+++ b/dev-python/colorful/colorful-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index a22d6bbb9a8b..599683d4ea4c 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,5 +1,5 @@
 DIST colorlog-2.7.0.tar.gz 10153 BLAKE2B 5e3c1fb3dce5b9a925739777b3f7569cd10094e02385888cdc2865e47bae4dfa0cb9960a3144794fa6cd09c5143adf4df8f18af1c0d9cf561165595e10322053 SHA512 765923004a2e2b0c0e34f7cbf2d79ac7232a13e9aba68166c8ba295303cd7187317d9a34a405a78cc5f7ca0281fc3b653848e419c0b3a0dd473ad0b859216703
 DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
-EBUILD colorlog-2.7.0.ebuild 670 BLAKE2B 68eae48cef09d199b6345ab1f5658a278a389dfff68d0eeeb9f31ab45b369f15323a46aec63612c895aed8e675f3528df4344ff92515dc04483af0a0993dac5e SHA512 5f4425e389d95c5521eb40b926d0ce225ef00ab3353183e10cf1fcd972196825f8fb03bb8cff57f8daf0dff6e69ac5188c2a6d2cc1ba019e973175bf0a68eae0
-EBUILD colorlog-3.1.4.ebuild 615 BLAKE2B 3519527555eabf2e185e9a964cee991d733becf01e378db89e01fcef01247c5daeef94a2606fb92aea389f31d61a12e4492461c7fa0c83d823e73abf2b8cb8d5 SHA512 ea5b0cfb7f1bc503b12d55b543aaaa21a3309b6450fb4a9d99d5160cb6c7c73e08e01bb5870c0a52b94bf9db60e00fab6e2477bf61e87ef792a5b1e2b55a92d6
+EBUILD colorlog-2.7.0.ebuild 660 BLAKE2B ba8913c2e7b3be9fd7ce6bc3960d1cbf77c215fe6a3ce4f0da0fa2762b60f8052198391aa80a014811612cf1c963517f493fc73a23a69fe35c451129cecaa367 SHA512 2c4950512472b2e21a4f023f5774455e755996ae908b7496f9f746eef7af76d31ac5b413cfeeff5e6cea40dedf84ef7bba58c898a460f78232c56f5fb41b50d3
+EBUILD colorlog-3.1.4.ebuild 609 BLAKE2B 54edce385761b882afcaad4840f57516d7fe86523642ed707e81ac7fb6d97d077be5f521445bbfd54704c062b4efb02649f4d116ce86f27cc8c6227c14e1897d SHA512 c3daa25d5d9357d21943c08d931dd8dad34e1f8f47db21f40f635650a193183b98b2832bd1f00d95a31ff8b47fc714d1d990868fb23d414c467a627a7d875be8
 MISC metadata.xml 389 BLAKE2B ded38a2f991252ac74f592870d12edb503ed77e13c60a393545ba0fec689f355ae1ef7bd89190e9d6837bc932f6d61e60e48e567c4ff09ebfb21ab666fed1867 SHA512 04b339e2ca89bfd8862d5491081c7b66f5211dc490b650140499f5a4fc6f66e705a5ab805a6c0bc4d867183e699c3c73a199a750d156862346cb68e3647f8390
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
index 19b9bcff80c1..b4472c808af6 100644
--- a/dev-python/colorlog/colorlog-2.7.0.ebuild
+++ b/dev-python/colorlog/colorlog-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorlog/colorlog-3.1.4.ebuild b/dev-python/colorlog/colorlog-3.1.4.ebuild
index 820ef8ce9409..0f8764bb6d35 100644
--- a/dev-python/colorlog/colorlog-3.1.4.ebuild
+++ b/dev-python/colorlog/colorlog-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index 8e1d0e21ccca..8516b27ef334 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,3 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
-EBUILD colorspacious-1.1.0.ebuild 695 BLAKE2B 591c3e74b656e589095b23ff60f9d27f1af49d4a5debe9a84bf16f28b4fe350588c0cc21eee8e850a1c13fe4c6f285ff8b3a656a8708a09014e57d1c393b2963 SHA512 196b95b7de8d4be45edde09731a8f4f825a97baf3bdff0452456e77bde453cf4eb3c241c6c56edca2199904df40c1b9b35c14a105a78aebe5fd0ccbc03887fc0
+EBUILD colorspacious-1.1.0.ebuild 685 BLAKE2B 4d055b7e7cfbba60623b6ce67263723f069ef68a884cb6fde70d3bdc3785b60908ea88eb206f931a2decb73135c3d4327087486cd22f82aaa295d02b0b523b15 SHA512 57b49770d3375969f2685878daa939a3cbe6e0fa3eec8cdd1cc59fc78c88729ab8b55a8d2c70b9779303b9cdfbf5771d941020ad9d74fe9cb1ef641a96af42c1
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
index 0f597b43087d..33083edf02fa 100644
--- a/dev-python/colorspacious/colorspacious-1.1.0.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Powerful, accurate, and easy-to-use Python library for colorspace conversions"
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index a7bd687d4b6a..9de1fff5678d 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -3,5 +3,5 @@ DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 EBUILD commonmark-0.5.4.ebuild 805 BLAKE2B 0bec3226c65ab5427ec6dfe538a6e21421a26632d61f9485567db063608bb29761fab8b697e5e54c025ed0d17aedc8c478c0200fcb4ea00970b0619d2303f3cc SHA512 a3a51a5b6edee044913e9f4b9ccd4071223144b979483fc318c5740d1b1faa12071a0f8129549cf5a12a129ad32aed92602c2dc74300d0af5769b8686dff0d58
 EBUILD commonmark-0.7.5.ebuild 1088 BLAKE2B 6afe1d1ce15f9e40cceba308f7f523aa37d6a3b6b57464c02cf53cdcd640d533a51b0ed42f7c6c8ea3368c42f84bd839b0030f9837aab4fc7ea56e6c4d3c4d51 SHA512 4e6bc4943e32a5bfbc1b945ce1f6e59123afeaac42c52cba0f9ed84cf26ef99608bfedc18710e5362a9e7e0a36d8b9d8d93d5fe19a534de0149c59e4456acdb9
-EBUILD commonmark-0.8.1.ebuild 1041 BLAKE2B 1e6642426786142733edb175018bb83e84d280084588adfceff3ed3a76ee5627e17e5f2a55dc169fe46d5e14f2529b9adbaed5b30b200ce66c22ba93910afb39 SHA512 40ce5529dd683716b1d148cd2481ce49c49fe0db024b6ae39af33e5ebda90c62166d9404586b1285c13652b5ba12b8912e45fcd3ca787edb368974059d148c23
+EBUILD commonmark-0.8.1.ebuild 1042 BLAKE2B 1125cb64cd5fd7a0cb4025830a36ab06fadb24d6fcb3d21635f91610f5f6d8b6ec84006c0ecf70048d8a61068943f4e2974b2f849a69809de133070dd1c21dcf SHA512 30644558fa3887cdca6c90b81a5e92cb297a48e16f0df58ab12f80663a7d225f56f031506acc86ed6b5b7e70184d4a368cc2177b6acc3bd949e7698f99f60795
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index ba49a86e694b..cab9fe1b4b01 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 75cf53d3b689..14c1b59f79d8 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,5 +1,5 @@
 DIST ConfigArgParse-0.13.0.tar.gz 31775 BLAKE2B 252130b58a514f667655e9fa0bb73c00be410d9c817d3dc57083a9a828d9c25231667720ab7c99068b502bd5eb7c79fd7053c500862447b1213d912568a2e57d SHA512 232ae25e9daf3ebedb8757912a507576a154a3b09c297db7684776172c32aa7ad03362f60d26961499c17dcf0e3cc5763b40004a75ebde5643414bceb4f3eea5
 DIST ConfigArgParse-1.0.gh.tar.gz 26460 BLAKE2B 0dc83125116139e9447da8a9c660ac67db8b83a3b09c1e3ff148e09053ca10d2ef01447fd055d11804ad3903134043672ce7f458d990ff69c0ae07024539a3c4 SHA512 8e2af22dfa08bcf4665289285cc8f94aca00b650cd9521e9c02d4d83b546f4d79f2fd2cae2818ad0f2d38a16907e145ca7165071b78c557fe0be1797609e1cae
-EBUILD configargparse-0.13.0.ebuild 636 BLAKE2B 94cde54d54d89fb87007fb780a3569dd59275280f9c9fc8020c0c07b4660c3f07f0f18b40b29092106d3705b345c0b3258b1e5d9ad0290ceafa35f3c852e0967 SHA512 5c732d2310de50f8c3dd6ba140883268bf71aa8568ace7a875fe94b14f33af4d82de2e539bdeceffb1ff9f67c2d13d99334f95e7efa207da1bc9a2cd818d9928
-EBUILD configargparse-1.0.ebuild 736 BLAKE2B 6952c93cfbf43cf16e4b122ac3be4bd7f244ea01a83ba3a215b9b3295634f06fc76bec40033c2326d4adbde482eab0b9e5a44ee60be6632d81c83fc5b51c156e SHA512 7b1d9bb68b2250421405b582d8153ff2f56357418368769d1fa99bfeba7f0f73737a62f840d3441dd1013470b2cf644afeb2ab01193ad1f941b64da2e24e7af4
+EBUILD configargparse-0.13.0.ebuild 632 BLAKE2B c4f28c0b7b297875532ae0ffb9efc97b0db620c9ad671cf3d3a4c2420f20d76de53b8195671ae1be1c74381152accb352345529132580e91e253ede54eda4802 SHA512 225b430c82204b66a59826c60aa205cefa75e6ab941adddffcd9003aa79d261afc1ac376492926b7915621a2b74dd152ca96e20b47b0eb2e4763bcc2cde29bad
+EBUILD configargparse-1.0.ebuild 732 BLAKE2B 22fb723aecec2fcbf118dfd228cfa7651dac6fdf93c3e20cfecae85d45a58537a7527666b122e11d183cf5fa2c974c7c9a8c8921113f5130edaf557fcd712d3c SHA512 31571fbc260907beb683a085ec91e1985d348668644b995e01ab1820bbddf619e8959b73b41d55c715afee3ef20e28013c65d3c5fc8d77d1515ac44a5a4b3345
 MISC metadata.xml 387 BLAKE2B 36e5244634b47be38d833ffa6fa4996fcf06b54d030e147314289f0d2d920356b6726c1f8ed5529b7ebf74710173dee122ad40195796121855dedbdc07a91ac5 SHA512 5fa5e8515c41658a734dd17f3afdf59310c8347cdc9d6c3c1a9eb35dba26edb13e273bb5f577fc55fb3e3a54c1a8ae3f62d644be7cfe96900545de7b4f796e09
diff --git a/dev-python/configargparse/configargparse-0.13.0.ebuild b/dev-python/configargparse/configargparse-0.13.0.ebuild
index 7e3fb31dec40..ca836c0c4398 100644
--- a/dev-python/configargparse/configargparse-0.13.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.13.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="ConfigArgParse"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configargparse/configargparse-1.0.ebuild b/dev-python/configargparse/configargparse-1.0.ebuild
index 51199ce8306b..7ff26e3c4f65 100644
--- a/dev-python/configargparse/configargparse-1.0.ebuild
+++ b/dev-python/configargparse/configargparse-1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="ConfigArgParse"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index a013d6300fe7..1af73b735442 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,3 +1,3 @@
 DIST configclass-0.1.0.tar.gz 3246 BLAKE2B e97ea98e495dc920d50e7240eed4d9182829b664baac0e8712b5551703f730f7052228d693a60784435fbc839639fef9e5c29caef2f8fa26827016aead182a8e SHA512 d3a83c742916a9d345a3e8b2fb29d8742cff67a110f9bbaaee6e04fc1134faa6eee13f7344a95f133107afcdfccd394f6a3b5fc516b21dbfd7ac38a5bed00d34
-EBUILD configclass-0.1.0.ebuild 498 BLAKE2B d4f87f95f3076dacf3c42c1229cff867b2ebf3a1821343124a566851a28fc91904e93b323d793f124368e093e16f62dc39d178d77027b0716bc555d306b4e2dd SHA512 78daa2d046139d10787a1aca752f70fe1241d9a37fff3889a5670a83b8851ef06e959f032801e17be8e78a62740b8f5ced78313b207d3196c9bc7bd9ae4a0aec
+EBUILD configclass-0.1.0.ebuild 492 BLAKE2B ad088328a1b182b09b3e6ef1c65e5f08bdea2405b8713f0590c6d13a2a4f76c047140d42cca5c10df9ca756cbbdbe1fe0e5f2c01b7594857136b5bb7361e6652 SHA512 7cada6581d49e2d2fb2dd7f0e3821620378fa2560f50a189417817b0f927aca8a341b3f4c8ae21dade2f5e1ce258afa7785b9c719d4f5547c69b89cec7bf3716
 MISC metadata.xml 377 BLAKE2B ea0b67dc8ddceaa21470ba69394b82acd8b9b946992d359c2574cfa69ddc49597b971647edff13a7415251e5b05e2f43cfd1660259f864e6c5414b49c226bf24 SHA512 6307100bf5465c429ee480c4157953a4a7b24a5429197bb43ec7141b846247c13570f946dcf1795afe2d3c97039d103ad796e1626c0ad80ae7b19814cdbe44a7
diff --git a/dev-python/configclass/configclass-0.1.0.ebuild b/dev-python/configclass/configclass-0.1.0.ebuild
index cb12a302260f..e962c072852e 100644
--- a/dev-python/configclass/configclass-0.1.0.ebuild
+++ b/dev-python/configclass/configclass-0.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index be6c99168cde..9dd71313b17d 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
 EBUILD configparser-3.3.0.2.ebuild 488 BLAKE2B a9a751d2a7af1c1e44c943a8580693c31f6617f8d4377ccbcd151cee9366ea2d9f1443de67dc8bddc0938a85d6d0576d2af5a43d1e08dc20f2fb1c0d356f0a92 SHA512 152a1a22b6f5f0b6203c8c1806b6e07f93f002a66b237350646d97faa33989a5451d963da20a460419807a74002672d5f073b27cf2e2ab80568080255eb796b6
-EBUILD configparser-3.5.0-r1.ebuild 675 BLAKE2B 9338f605613d6b95e1339a406a1123001eae247a477a377ff306d5c892725a42320a0769f7ea4e88491731bab25d3fdff74b52c63c3de404ac7dc4b62a9b1de3 SHA512 4ab24657c9b2dea057c46450e34658d0174a3875f89c5a48ff29b2437ff93b517ade6db7d2e036d2c91ba40183eefd8a7b14d9c253fd1cd71395c69155c9d338
-EBUILD configparser-3.5.0.ebuild 468 BLAKE2B 226e65d685d2bcf6728cdf08ae25c0b24acb14bfa6d66351ec5db2bdb7f49f30971f085f6bf7153c92cda790a51bcb6af0373f4c20a52b65aa25a335b749df44 SHA512 eeb5082ea448b90aa2938c750d8dcb63c95abd05e2c98a4ec2f817e9aaae9b85405f6c4d17a0a23b3fdd17ebb3bb6190ebd35de3787c49fcf236b4c6f13895e2
+EBUILD configparser-3.5.0-r1.ebuild 676 BLAKE2B 47d60e5cecdb5d6ebb6294b3449173501e3a4ec4198fdaaf73cb5563411d31db2476172bbbb86cd5a4baca72da88f097fe4510472b967fa1dbffe7bf124fe22e SHA512 a37f76dfac382799271280b46a775b77b7f6b57a87b9145b9f76726dbdbe8edd585ab3a42a73bb3e28e6370fb2a93b2a924b67efbf4bfbf5ed3def882a33c135
+EBUILD configparser-3.5.0.ebuild 469 BLAKE2B 4e265539b2fd63556fdc2e27f49ef7974afc63de3b170500e325c0701fa0dfe3dde4a280692cd1a66290270aa69c7ab369d5d73de399b2f555f2709722566b00 SHA512 484b2967b64a5954bf6160ddaa7159a1ee248fed28586436ea0cad028f57e3724f7b153401149d154f7197c7d1e674785d5901a130ceb57388967db712e5add5
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index ff585f05a164..8d9a814d860b 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
index 349b4a8448fd..174c2604dd73 100644
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 29e29fde55d8..ed516f7cd22e 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,5 @@
 DIST configshell-fb-1.1.24.tar.gz 56946 BLAKE2B ddda3313bb41a346d08006f1d3c1cdc708a940ab9fb2e0042896947b89e32cca872fc8a19a392eeebbc6403f042aadcef2c78962c069e9c1ed10a2f5d4bb102f SHA512 34aabe6fa5c2f00112748e35fe3859fae09baac5ef13b9aa80e6f00908290a0d724119aa3b2ce86da8bb171c60860304e650aeb16bc678354a7464bd0b5c9b48
 DIST configshell-fb-1.1.25.tar.gz 56900 BLAKE2B 00f16c401a87cde0e70730ec74fe5885af3ebf22c3745851661fea7de874f5609c49e0b7c521c5d3db16eec903e0f24331816acc8e19a080043e8399c98bd18f SHA512 338eee8eb7b0fad533b739bb0c9460757cdb90103c44c37568dd86158431b67e1b0ab050afe2670abbba96c5d8c18db9b107d9f7650937a2be7f53fad26efed3
-EBUILD configshell-fb-1.1.24.ebuild 595 BLAKE2B 2a76fe91e7fd0e8e2c46173ece40a20e66e05986839e0142d3c85932777decfae42dd36b1a9c3b1b3ee93ee3e7f1806cbfd6c2e1265ae2d606bd044a30f3bd4b SHA512 d22984c52dd8876340369c786ef7f75b7ffe8c4894bb7366d76f620eb75cab3c9693ade96efacf5cb3e7a38ef88c389ba3f47971e030671713e19cfc2d9bf7c7
-EBUILD configshell-fb-1.1.25.ebuild 599 BLAKE2B c28dbc86455cc4ea6cb3c3a8976b43dc6475b401d634751722f7749641c5107f855b97b608692bac44b12cda653fa7b3c330195f462e3430887458c3607a738b SHA512 a628d3aa0fd8cad79510bc53d78c4b9fd7d48ec04cf7e0f0c2de1147a4f62e6cb83411ec9c4270bc44dbd1d87ea862c730d7ac12a7724b719ac38e51cae7f519
+EBUILD configshell-fb-1.1.24.ebuild 585 BLAKE2B 37ae03e82fd2c6fa5e3780692295797b1df5b56772d0de81f986408d5fd713689222bd6c99b29db8f1023c95ed45b99abe5a3a7a3ce527dd62abf0eea14e5ec6 SHA512 50d1d0ee9583f34fc0811480323a49ebacd6eed91c4674bb987e0ea0ecbefb63af1429e609918b701087f43e53016c282bb729cd42d711c10e39b19ed2982eb3
+EBUILD configshell-fb-1.1.25.ebuild 589 BLAKE2B 8a525ceeb46a67cb70aab77b2a621bcd9ac359e38418250cf6831b1bd09f0a72c1e96873f4ecb574cc5495f973b2afecafe4c0782c11d38bee146af1495d20ca SHA512 880088776f95a18208cb2b26741fb19ff0ed2d729aa72ea96be6eb931507b611f92081def60df47a1074a09cd908f838e65b7dba62c00c26293d1c8131d8d56d
 MISC metadata.xml 937 BLAKE2B 2d5ded6950c4286478b6867241f974274b06fefb406117b7b1b6123d092f680e998967c0892fee40f268eb6530b62ac99f4a23859e0d208b6b1b73c730c3343b SHA512 fc2d86ea29566dc96e24e9126c28f76d83bb97e11bc336aef563595602a8342f7e1c2f9fedf6db1aea603d736e5dab3fef7e89e5b8ef4e3e5bca671019a87e73
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
index 1c7e2b98e61a..412d80ac824e 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
index 8f0a3486e6cf..0b261dd812d9 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A Python library for building configuration shells"
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index e64849800a2d..0bf3edf31036 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
-EBUILD consonance-0.1.3.ebuild 935 BLAKE2B ab921e4a81f04a42b22ba05b851e403e46a704f41cf13df956007e27e1755019c5c6fe8c344366cf453c12a384161e0662ca2b8ce4c18a66f28aefe535b2a15b SHA512 01c04e539bb701051fc20fc5a4ba5ef4a1a031a14de4fba9d54bd399b5305402d808bb404cc6cc523e59fb3eb7e4c9602ce60cd5ee5855c63ab41741eab9d4de
+EBUILD consonance-0.1.3.ebuild 925 BLAKE2B 5c22a53189fef9151568e540df9b9606ca00d3538087081a601fdcb5142327f26e4e2c6f71b23e9c50d22b499f1bd07b550c0b1133b6da1831c55d881db7193f SHA512 085fc50e4d18a10a082736b686604b6ef6a9e5852293e5550c83ba16ccccc3dcca57f368bbf031beeb881eda7dcda091ba37518673805ed4f03f1e67d72d4945
 MISC metadata.xml 582 BLAKE2B b36276e39edda1de4250583df9a2deb2118b0433ffe44c20960108f79857efc8b3c86950e8fe1b8cf115d40dfc767eb14908886b7e86e108582d3262ec960561 SHA512 fff3526cfea536ac2704be7a8da499b4d4a64f07f5682ed48ab84bbd1ecfdc9e2272d46eb3623a8623097544da121ad8de826ba474579e201b614ff7d61c6572
diff --git a/dev-python/consonance/consonance-0.1.3.ebuild b/dev-python/consonance/consonance-0.1.3.ebuild
index e20cc9128560..68b4e499ab91 100644
--- a/dev-python/consonance/consonance-0.1.3.ebuild
+++ b/dev-python/consonance/consonance-0.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index faa2893382e4..9cd97b54935f 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 709 BLAKE2B 6aa6b9e16625ba85d8ecdc840bb2af480ebc47c9a52aeb553ba979ea3c98ecbd824ec54e445202e157c58529ed3a6fa3d89ae72f5d6c4b97f4d1c158d62039b2 SHA512 fe98020189c3cb2b79a1618a03f11fc381a52d2fc1584e0a75f261bfe0c4039e9cd42cf37bcc7d10b782d4835fced599e7dcbb5d5bd93117c6a6706a3d594e5c
+EBUILD constantly-15.1.0-r1.ebuild 710 BLAKE2B f416a71a18f06f1b6d06bdd9ef68e47efc7474b1ef25bf38445d7edeae30ef6140e3f279f3a5d3993e75d3e2b551f1eae783890b169b53f09031c082b4d2a61b SHA512 fb5eee571c52a426e6b76fb7d1ae0e5f72635418db47b6e003f3bf26d19fa8a5248b9f57b77cfbbce5a20f45ee020d6e4ea26b413b611959969cbadb995eb1f3
 MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index fca5a2c60885..6354449cc31e 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index b5abb815404d..1a23747fa35c 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -2,6 +2,6 @@ DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf82
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 DIST contextlib2-0.6.0.tar.gz 29607 BLAKE2B 674d0ed2cb71837ec8bed46b44790c31601347e315abb3ab666aac3a7754f07602bbc4f1591a8c905e02949ed9178fb6230f600ca35d244b83353286901510e2 SHA512 01901ac226c7fca40add00e95cedb2535a802e0114a53ae1315c6dfee20744dbafa7d9619986ad76345ad9b9aa3e364ac01d23f51b5eb70dd2febd5af1f1fc56
 EBUILD contextlib2-0.5.4.ebuild 636 BLAKE2B 6bb7a505f6a7eeee6119909d3de9483d565a3ef4b14da3f6f19cfd71b5635859e522a4fcbacd252825d72a8f86a114d8bfaf3c63837c15d56e492f45267da55c SHA512 f2e5d45688e91f1b1731d1b03a3f7fb1c520165f8fdc32f6fb2d860e91a28ad05e9f617d9f4140954b68b99cc703f2c14d0d370be9be39142751ae0f064fd1fb
-EBUILD contextlib2-0.5.5.ebuild 679 BLAKE2B 5c8415fadd3ea2a86780f61f95756ca87e95c6a13edb3acab67b8c611f9fa37c7c10c054a17276fd00763ef99ff2fb2b843651b5bf966a572b06b6b492ad7bd7 SHA512 d9270d73de537ed52a5ed5c417ad68aba36e8f6ca24208c3afb275deac802a1a43648ab2dcb3efae69d936ee0f05158adcd22418467bdd10a5850aafcc5aeb03
+EBUILD contextlib2-0.5.5.ebuild 680 BLAKE2B dc7c5f14a2bb36da63f45735b70000d79c6218caf9fd30fea5e1f459e1235af028c3081d09da5ad30449a02fb104eb2313367b78526897c1f66fb43d6be572d4 SHA512 da1cf7d417736e9db61f64fb3f5f2cad86fa9f8c7a778d1357b8cb40dc27154e232fdea01855fd92e45d8103a04f62f1e950773514bd34fd6ed7628e180b83dc
 EBUILD contextlib2-0.6.0.ebuild 913 BLAKE2B b8dcac943cce16bec9c304dc51bcfa7da0d0618e3e7624c98043cf4bc9e3e3a525d4374805aa14223897058397cdb0a8d622cd1699eb317543b27fa3a4022292 SHA512 ae072dc7e0fc31de7b24d3e649ad1bba7db146a7e85ab9afc9b1c84ba74076bfeffb647191644aed6d70798a28efcd9280b4c3d5952319c81c0b2b4c65b25c6c
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 3cd97b6ce980..5e3fddf02fb3 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 5bc623b17c16..1fbcade36094 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,6 +1,6 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 660 BLAKE2B fe159ff1ae2691458689201071043ca0423a7ee6c8c55ec664f256785b03449a903c5d6ed7ce67979c874636f5942baf1df8349ef6b48d3cc328c5849dc68328 SHA512 19e250dc0c59506935aa7e717f119a5374a164e489a78e692f31d3959c43d3079f798700afa1bc28cff6c8e01547a99734c61b1aec15d6b5c8b4d1297c765cf5
-EBUILD cookies-2.2.1.ebuild 578 BLAKE2B bd5c53fd4760dcc8e95f033ee1041dcec7b3f4d480dd49009f3ca7e28f0e6165d8d5ba1bdfad4f8458df82f5972d01214848306619407d8a83f05f94797c169c SHA512 38e5982619219e8a0e26bcb9ba60ae6a1aa3765879323a96d928a52493244e35875d6d0325ab1c68a8f06b2148de5b45df5caf81afd3bb91fcc7bb02db3afe7f
+EBUILD cookies-2.2.1-r1.ebuild 654 BLAKE2B 9a7705be689c31cb8751116d674fac442c90a7413398b1583ccbb3ebea68eb0a86118a53707439b39e85b98d23bd37b616bc6cb1c3c65853b1aeef54b03e6990 SHA512 3d60af636dd19820c9960d24238e7ed39e8f53009315a35419a1afe3d505937c7c35e9d6f4fd0df2660fb9167bc1ab6623a2e10e273f270ec8291aab29c4f021
+EBUILD cookies-2.2.1.ebuild 574 BLAKE2B fa9589f6fa18256157ca275602fe71e91907a5f2b359cbcbc63d70278d6b324d0f38e69b290c15e998d190bcd9fd64587d993facf441e498419cf8a14451ade3 SHA512 466c05495a142cea401d8963b5b9664481d7365bab46ed660d292f324c052fe0f830e5712a9626c548585e1c80c8db0681df24e2ca84b1f2c9d555da8278b680
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index e973e6e15b0f..d6ed2171ffda 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=(python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cookies/cookies-2.2.1.ebuild b/dev-python/cookies/cookies-2.2.1.ebuild
index 09dcb5dcaac3..7133e4418b4f 100644
--- a/dev-python/cookies/cookies-2.2.1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 inherit distutils-r1
 
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index bf042b0e2648..80079b989191 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,4 +1,4 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
-EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B d5600ecddf32dbb008270cacf246eaa0ea1d90b9ad8c9b761034c00c7b7e23c3289ec6449942c85680249202806357f19d522f89f419d0b37d82f0372c098ac9 SHA512 c1dfcdeafeb44a5e63934b716b1e9d987db79bdaaf8eccec26e4949475ade12aae9720c52dcbc2e42963256a4874529ca41817f4da696226a84ce8f8bd33f82e
-EBUILD coreapi-2.3.3.ebuild 480 BLAKE2B 68917051cd7f44365ff138e6ee4ce38de6d73dc7b3dff5faa53a8c5f357ad3b68f6a1181c338b1a7862e9a916d55972a67b12399ac877d0720c193121896828a SHA512 435d34273e6e66bfcc19ecdacfcba36cc6817ef520296451ffb140508039f72e1ca0a20204d673b604903be3745a65909083fea1a733cc012913244e517fd1d9
+EBUILD coreapi-2.3.3-r1.ebuild 598 BLAKE2B 998cd11e473eed824b9d91784dc4d64a86281118be03358a3b6c2adb50fd313a8fc396c0edf9641863dd969517b74420d7a52baa041f26903520e213226cb347 SHA512 973e4d54b14f3442bee47e457cc6e3ec31eea7e1dfc1c27de4c9fef7854130da8c780e615b7e2dbdcab83254396d9b65af975a25842ef48589e7c165bc00d220
+EBUILD coreapi-2.3.3.ebuild 470 BLAKE2B d0bc6a5bbab7f92db983a05a398871c7ab317413c93d0c4fa9ac6906336dd81cde464daedcd7cfccd2ecd7968f823c31839de1acac59536634f8ea3672966f12 SHA512 fce61e063b634edbf71edd56a2004fb90e437c0777c903bb45d627250150fab71cabca691775cf5bcf517001382208f3bb141703317a0c336c1a2ae485e86f2e
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
index 54c411dd20d8..61a0d757cfe6 100644
--- a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Python client library for Core API"
diff --git a/dev-python/coreapi/coreapi-2.3.3.ebuild b/dev-python/coreapi/coreapi-2.3.3.ebuild
index 6220a9b1d43e..fc7702bd5e63 100644
--- a/dev-python/coreapi/coreapi-2.3.3.ebuild
+++ b/dev-python/coreapi/coreapi-2.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python client library for Core API"
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 27985d7062b6..64c0f16d89bd 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,3 +1,3 @@
 DIST coreschema-0.0.4.tar.gz 10974 BLAKE2B 8bddafea9eb82140cdf2b2cd40ffc31dd4a0457f8ca216986807657a5021f7a4319f1e3db27caf7d471f8617f6f0c3a6d79ebfe7e0285bc9a6627f93d6efa760 SHA512 21a35b29cd0bb96dacaeeb0bd0faaaa4ee8875bf9639b431b59f17c41ee4829173932a6b35760caa3b46a0ec39ca173fe896b26b740fe97df36943270bc2bd3d
-EBUILD coreschema-0.0.4.ebuild 457 BLAKE2B d7e0737a4a2599e40f73b25424cb6c7c1077c9bda2956463ccf7a852e45e1eac266af9a53f007f0b87c0f91a76c40e9de182c2cb65b48ca457691d5a1cb7aa0f SHA512 38bac7520fd1bf3566829930f54f6d38eaeb44b554e753f63c04e4bbefcc6664aee1723292d2b060a5e6b51a1178ba76925e2911fc320072f81dddfd4a4ab380
+EBUILD coreschema-0.0.4.ebuild 457 BLAKE2B 648eed117503ceeaa99b9b867b882301d48f3649297a65984965632da9961e3bc578bf01f13bfc69ed38f66cf9845ead12e6955173bc33705489a0bd41a32a12 SHA512 4b5b8ec09494fb3b9f0e4449eb5b2f349377dd4c4eced2b63fdb2973445a19469e4745b535e455cecb07bae0e049c13208d6860b3e3560b1dbae7a3da3dfeb78
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/coreschema/coreschema-0.0.4.ebuild b/dev-python/coreschema/coreschema-0.0.4.ebuild
index c3812509b807..f402f85a12df 100644
--- a/dev-python/coreschema/coreschema-0.0.4.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Core Schema"
diff --git a/dev-python/cosmolopy/Manifest b/dev-python/cosmolopy/Manifest
index 20c32a665711..f81945e36f45 100644
--- a/dev-python/cosmolopy/Manifest
+++ b/dev-python/cosmolopy/Manifest
@@ -1,3 +1,3 @@
 DIST CosmoloPy-0.1.104.tar.gz 65162 BLAKE2B 5cddcd9aaf923fbd48871e28b11b2a480a58409a686df942d158383a3f3f46bb5a9f687cba05058ac716f63ac9eff30948854a2e465710d803ed17de94b53d13 SHA512 b79b5b264a6bdd68082fc3f62f40957421d9a6914d1623cc89bac9b64598e5fca5d52290632ab55878c893223aeb3283c9b088987a0927d2c22160bc521359fa
-EBUILD cosmolopy-0.1.104-r1.ebuild 1032 BLAKE2B 1d0eb43ecdd573d9887fa9586d0a1f6a5b96328211d78676cb18ea583ee785b045c5d8fadba03fcf1b8c54cdfcffe38e25e039600ed51f348499e45ec615decb SHA512 d906415a694fc3571d15e46977ad025c06a3208a87efbb565f1e16afc1b8c4b9dbcce9ed822d6ad71b244653d811de5f9eecb7f6e738bb9cef560b1bc65f8d68
+EBUILD cosmolopy-0.1.104-r2.ebuild 1084 BLAKE2B 7a70eb31684b4f1e3d5ebdcee2af6e7b33c91ed05182debacba0f5934f3abc38c9bc0c829110ceec26781bbfe3c0b9555204de0c8d98d30ef62c7371db86d11f SHA512 ef1b6aaf42e6fca3b44572e430b1d735a592ae60772ca4962a29b38310e879437d84c743678da26c7501b148dbe89974361916009203ac47dd5f0af4748fe7ad
 MISC metadata.xml 551 BLAKE2B ac51efa3b41437dbfe1f3f9559ebe3d19b9e39588a79adea2a5746c50a1d845096b44e96f3a581286fc2619df2a52deac03a915bff47e5e9f6011ddc4c44f9c2 SHA512 0f6da8ea89687a2ad518e19a53e6814cc26d96c4451e7d968ee103c66f2a4515b80cecb698ebea0c7e9fbcf00e571fb45b72311cef9e1e0dea18b94a025d18b0
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r2.ebuild
index dd5245d7c1f6..42224b91b0f3 100644
--- a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
+++ b/dev-python/cosmolopy/cosmolopy-0.1.104-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,11 @@ IUSE="doc"
 DEPEND="dev-python/nose[${PYTHON_USEDEP}]
 	dev-lang/swig
 	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
-RDEPEND="sci-libs/scipy[${PYTHON_USEDEP}]"
+RDEPEND="
+	|| (
+		sci-libs/scipy-python2[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/couchdb-python/Manifest b/dev-python/couchdb-python/Manifest
index d179c6f4e7e5..ca18a291bd47 100644
--- a/dev-python/couchdb-python/Manifest
+++ b/dev-python/couchdb-python/Manifest
@@ -1,3 +1,3 @@
 DIST CouchDB-1.1.tar.gz 60839 BLAKE2B d3fe1195083f0e0e36dfc25ca25d08e5f447ad34b8908bacedb43d81979ce7bf926100297422439103f8ef3a8bd398e408c19ad676461ad5908d79b92b4d9661 SHA512 f68a0bb04f74cf91ae7d190eedec2a9c24c03dd0ef333c27cca7ef7abc95d3d355f78d653d68371a0d27dcc9a8d69f5886627f0eb0c6af49b632becf6bd0668f
-EBUILD couchdb-python-1.1.ebuild 943 BLAKE2B 1ec77b933cf9dd9f26f862da5692306ba64dd246305609580198fabf929bcd28829db5262550b71ec2e1d1e96651723ba437bfb5b9ea63bd75902dcc39f24978 SHA512 26753d562d6e48be83d3e2334dac438062fccdffbab0a13737e197b0965f1674dd2952feb4ffc4ec3a8dd70f4eeb01620d7cdad385896d4055c9eab315d283a6
+EBUILD couchdb-python-1.1.ebuild 933 BLAKE2B 7ebd20eee297ecc9355a949af05a082c470b568981f128411b71a12c519079f31d3e98c7527eb4d32fea34676619e2a83dff01bd38bc93e856e0472d87b4cebc SHA512 8070ca8356afec7a7c432a3b34ecc872f5765ab8cd8403954483061f6244f96302ddec20a9b62d7b4534deb544bc801c436d59d1dd58b41fb9bac867e13662e0
 MISC metadata.xml 492 BLAKE2B 238ee8a64a2463e5e261c9d43fe9853fa7b5cfb135d9961f798e60937c9618e11dcb3d28ba9cda9a6fb017c1f31783ffd0aa15d3a9e94cb1418a768b327e1a81 SHA512 69b7bd6ace846417beb252df5372a01726879e839a14c8586deb33a6ff53a2279b088f822cd30d86af58197d9202526eac40d9394f74dbc4093b1dc23277b10f
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
index 9224e54f5d72..22089250d21a 100644
--- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild
+++ b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cov-core/Manifest b/dev-python/cov-core/Manifest
index 1c336900bf3f..387acc95c4ab 100644
--- a/dev-python/cov-core/Manifest
+++ b/dev-python/cov-core/Manifest
@@ -1,6 +1,6 @@
 DIST cov-core-1.15.0.tar.gz 5890 BLAKE2B bddab94ae47ba19ecdee5aae0198d9086a423673362ac64f0885f773bd8b8ab3f4d6abf1203ee901e272161dfb4b64168f2aa5f2d0f4426ea279d6d7251e921e SHA512 1b962a6a7253c1f6530248f3a71058e7709ee5cca274166807f040163c9cc240e9e85e42820063476c1c0f6dfca81d45277738663ed818fe715b30db151ace16
 DIST cov-core-1.7.tar.gz 5972 BLAKE2B 0f1304722ea590ca6331be85413dcf614a9a4584101824e68775a0fbd41e82d92d5dd74115bd525e155937fba710201bd184873caf79c5f88a4bd10cefb5d848 SHA512 8e1744f686262c5affc6e2d7b08ce6277b60e79156a4c2491f805325048702f765b64c40acd53d59b5fd7358d85bf3ab367270eef4a12ad209db5f661612b140
 EBUILD cov-core-1.15.0-r1.ebuild 623 BLAKE2B a8879320026db57228d78d1d32dbfead858b191e0e25143afd36e0f3fad9ace45df79d2c88b70bc94f41839bc577638092faa8f375cc930a5e21795a8ed97d6b SHA512 6a04873308b83b724c9d1529d7f94b47c0c5471f1012acd99b94762da2dc97af3b887c58cbfecd65be82c83f6f1382be3c8ebdeedfbb4ac973e8682622e76296
-EBUILD cov-core-1.15.0.ebuild 606 BLAKE2B eed6ebac348dde0563efcd9509560ed549771fa05d3ae97988671eeeecce3665e5d9ea7e72cc8599dc2a34d6b08dc5e1fac282cfb7642dfcadc860f3a6c705b0 SHA512 7fd2c3f5fe77a8c1feba2a4c505027c50b2517a1ea25beb9f0ee3dd7664ac9fbc1840048aa9e896caed6848a4a7de65bd09a3a61e01be70be3fa40950789f8f1
-EBUILD cov-core-1.7.ebuild 525 BLAKE2B 6c6c4c0240f8be8b16db20ccc583a4668fe5630ca5f95741bd585fc59e38add4cd3a4cf0b933f18d481d1f0766516f66bb0c8f5dd58e823c3fbf7362874a5ee2 SHA512 c0ee7ae50011e3a682ebad0ef71234e52f25142c138ab52473b4d013ac1d4fddb16c136853b0fa72521aaacad9543452f7cd9ae73e61c73e78b99824e5693b68
+EBUILD cov-core-1.15.0.ebuild 607 BLAKE2B 50f4ade26406ea1b81368dd7cfb4b31a07bebdd03808ca5d91ce9368b9c2fb6c3d53c7c1890e6c4208213070806dadb09c941161003b96df4381258dce98bf6b SHA512 4931dfc3dc5f3e50e788eec021c46b4751d5bf2264591ea2c5553e57781a14610bedb3af1759d9f40bc8fdb0ffdf5e44667b5a3ad0af89e4654eaa9da24fdbea
+EBUILD cov-core-1.7.ebuild 526 BLAKE2B 2878bd56b5b807e839bebbbc9b0d4554d6c4c16bf71f23a837b0a8faff939281bd51a692eb233e1468d39e9f521db5473418de237e446afa7c87defe96af166f SHA512 18dd9728e69fe6413974dde35b8f9a184230923f7273e59094476fe6c36d9f108a2bb7cf24aad3687ac6ab20f643c1938689ba2e9173c2740318470842502280
 MISC metadata.xml 393 BLAKE2B 087b56c47500bbecddabad8a768033971f29215be751378ccc272f46dc3aa2b4cd14a6ef101989a12f3b540b792a407dab5f4e65ea5cc619f3fcdfd0b596da8b SHA512 6b76948ec29858288c7604b9153e30d347f6b718cac4d367170694ec7d57fabb48f3d07ef1478e87924bd39f07be9c1da7a07a393818ddf5d9c9762f44a757fc
diff --git a/dev-python/cov-core/cov-core-1.15.0.ebuild b/dev-python/cov-core/cov-core-1.15.0.ebuild
index 7b223c4afb42..a950edf483f8 100644
--- a/dev-python/cov-core/cov-core-1.15.0.ebuild
+++ b/dev-python/cov-core/cov-core-1.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 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=""
 
 RDEPEND=">=dev-python/coverage-3.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/cov-core/cov-core-1.7.ebuild b/dev-python/cov-core/cov-core-1.7.ebuild
index b67ef7e15ab6..8dec4df1d0b8 100644
--- a/dev-python/cov-core/cov-core-1.7.ebuild
+++ b/dev-python/cov-core/cov-core-1.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 hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]"
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index cfa6ab9cb5bc..4aaa07aa4f26 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,7 +2,7 @@ AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c50
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
-EBUILD coverage-4.2.ebuild 1238 BLAKE2B e0be01e7bf8d4bea99aad231749f0fd2144557bd8033cc73c3a10371c78e09eee15fea00c04e20bc0413fcfa246966fb663d1c1bdf13b5020ae8a343d1311bca SHA512 d35c3ebae1ab2dd22ca5b7fb178cc66485eec9cd9059a52caa80214b32658a80912cf95fb406ed69d10a7977fc3d584fee402be386dce21dcd45936c1cf61d82
-EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e546c56cde4ef3c69502cd573a1a0399f3bcf6f9986977bdb2e43b91477b519ad8eaa9c0656bb9bda010d516a58a7af4f29a38dd75c45b3cdb56d74dbca34f7f SHA512 23a5ceb376aaa3c6e71448d67473705efc62ddb69172e0c7a9dd0f30f8e7cfa65d7b5b36465a87d0f4815ebdb23d438dbda3ddb0eb4e00770501cf4c4fa617f5
+EBUILD coverage-4.2.ebuild 1239 BLAKE2B 26b4914acabd505051a51800cc21603fe5cbeb6246302535a6b962d6bc09fa281acbcfd6369ab754b8fc431d5049c6614b6dbbfe871e927d9be558a26bf5f222 SHA512 b3e6a1587e6faa4d8f31263737cb2bc3c6b9c5d4ce4eb7cab127919b955b49cf2c027ad72d16491cb3abd7d00aae5062eb193a47540899c018cfe40ab6348cad
+EBUILD coverage-4.5.2.ebuild 1238 BLAKE2B 9d939b333e89f4142ddca84df803fbe626035f732b51924c5257a5ffdd5a3647e5ea44f4d9c2161ae1c3a9cb4daaaabdf7d6ce69a25cd23a10b210feaa72f21d SHA512 727d33c349e6af343aa76ea8e325dcdfc5e5b353505beb85ece08230f2adfa3c77fc06814432e5eed29ad4076aae06aa5cfd83706d2f8c9088ca2a6c297627ef
 EBUILD coverage-4.5.4.ebuild 1733 BLAKE2B 3c82cafb1eaf929a0e7ab17db615e796bbbbf204432167b88260d3bfbf73a1c888058e9aba16963de00b6f170179e7011d18f24908c6e735c8fc66dd9f43c76b SHA512 6184ae7b6b1926b88f35417bdaed9358fae0af316a48b126e233cb166ac7eed4e035c5ae5e20d08a68b09701cb7224ba69be32620738adc873c265be813a26b8
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index a885974edece..a15b6170b937 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/coverage/coverage-4.5.2.ebuild b/dev-python/coverage/coverage-4.5.2.ebuild
index 98e11cf637c0..e16b2f690d34 100644
--- a/dev-python/coverage/coverage-4.5.2.ebuild
+++ b/dev-python/coverage/coverage-4.5.2.ebuild
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 76ef2ee379ea..4c68c813d0ba 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,7 @@
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
 DIST croniter-0.3.29.tar.gz 20276 BLAKE2B 951b9f2e998be496420dbf08e06a60a0eb3eb8538d9e63bf11182bc449bc49eaec36c1d1025269974fd0ff24430e16c3cf410d2b50873498d077ac22e0b52fb8 SHA512 0333e8d801aa7453ea6bc2b49abcabb24390535eecb5af2050512cf69410d21179405ceea14b8037c8f107321ee53a10c6060796c86c9b24ae48af65068e9b87
 DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
-EBUILD croniter-0.3.17.ebuild 728 BLAKE2B d3910bc517103ead2e3d829d3db2b2a58208692d1ca2d20b799f6ba402fcfbf128e669057b6878e7219d8e151d3bc594ce1476fbf776d1e07f27ba4b1e7d4f6d SHA512 fba89e6a66fba23384a09c553ae94c5cb90283d399b5056b7fd1f9956028db62e6fbadcecd608a81db161f4c933b4b4e2cff0ae4e0f4da9ffa04d9a5cb12659e
-EBUILD croniter-0.3.29.ebuild 732 BLAKE2B de79ad620d6eaad78a3dda0fa63bd86b0d068ab0d86a93072eaa9404bb2bdde2dd3d03f963552271ef09f4b89f98dd3efb4170ed71a051d341098dccc597e50f SHA512 52c9f20dc4b3a4f15c1fd350ba6ea77380094a8e85d4c2bad6a4b6dbffc3f5cb8c9fed968d3f9ff199b8c0374fea122487fbce59617fa6bc78604c016c1688f4
-EBUILD croniter-0.3.30.ebuild 734 BLAKE2B 4362b4151aca832acfde1d4808f62f842f1673cb689c771e1d7580cd7447508475a8104d42575c53218b1bb6cb81580ae636881054978b3018ffe525a5910952 SHA512 7b9a0a4cf849b1497830330817277019b7598d47a8f4a45168332689a1e6d64da6cf83662a2e57ebad739952cd1a91537881634e01372749b5f9bfb347aef218
+EBUILD croniter-0.3.17.ebuild 718 BLAKE2B cdd7b806a456e915a46f5e6a6f5e08497e5a3a0ce75227d576c812472e8fb6d21c771bc106d495fdc2ee5c54d1d9a2fc8c22498aa57c399f7019d57db42bb902 SHA512 278ccf40e6fe05df8266c7232d87573c3b1229c24bb29c0d43549f6692bb1241a60e51b91303443fd19859812ce45d65d7bd03011a1d156f6f978fac36f03fcc
+EBUILD croniter-0.3.29.ebuild 722 BLAKE2B 3d7d147540e417632ab467a52a12f1a88bc103730dd6013f48f32acc01247079fb4dd619aff923a47c270bb13b32a6d370516f44fac4ee0a5381cc6cf920f932 SHA512 fad1871b047eff48a4d6a9fc2235a4651dd9375e257fe0ded37b25c791217ef699ee603bc79cc4edebdbfc8f87ad9109de2ba8262317be99d4bb59d8e1f8eac0
+EBUILD croniter-0.3.30.ebuild 724 BLAKE2B 7c0a8800e77b4385455fad2c5d32208342d79e00f0967970074fc27218c5c35ae70a4c66456f5e767839ab863ab9016a48b169fff70a4e52126d2ee0519d0a5a SHA512 55404ff53fe696ad32c1cbf543fd3fc3e936c6b50446ea258deeba335aa0a8801e1ddcb1a9632c720844362bf49333baa2ae6cc4734def94a35fca9c3526b935
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
index f25fc007d12f..28ab4725320a 100644
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/croniter-0.3.29.ebuild b/dev-python/croniter/croniter-0.3.29.ebuild
index 882e559ce1a6..debbc4fd5e47 100644
--- a/dev-python/croniter/croniter-0.3.29.ebuild
+++ b/dev-python/croniter/croniter-0.3.29.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/croniter-0.3.30.ebuild b/dev-python/croniter/croniter-0.3.30.ebuild
index 1e68e1d777f3..df279163ba05 100644
--- a/dev-python/croniter/croniter-0.3.30.ebuild
+++ b/dev-python/croniter/croniter-0.3.30.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 8c04cc6bf398..0f5f19478313 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,3 +1,3 @@
 DIST cryptography_vectors-2.6.1.tar.gz 35097785 BLAKE2B cf5784e97d288b464d79d0aa13bcd19fed3e1c585c1589b52092d654a9988dd52e64c317c50774d4dc54f535d37296df8e5da070fbaa5f38d4eef3cade671a87 SHA512 44d318d5f983955f42791cf182dd80070a87c3c05f7353e204a520588243041fec97367c6fb6d9febcdab0ce7bcf1d135a8e6b44a7387b599752b7c87fc81d9a
-EBUILD cryptography-vectors-2.6.1.ebuild 664 BLAKE2B ed56b2d148b29c4447083c3f19627d9d49cffe4414f59663581a5779f0db716f68598a44adc4dadea87d84fdc822447458b1ecf7de865a797fd1d1822dc0d73c SHA512 b1e114f098e9857d03fff4b29f1bb421d46cf2de8a2295157378505232a193a1aa84735a669b930c30c8006161604396fae8a416503483359cbe1ed597066f0d
+EBUILD cryptography-vectors-2.6.1.ebuild 665 BLAKE2B da95de73598fa3d3e49e7f441630257d46fabbf5a3ce910c9972be5ff70a68678ba8b7229b6b56c6b7f642b62291de88ea80f236c3740aa1f078a5e1ee5b0781 SHA512 7f95e5e31ace9e62560114d8ad677f5e835c145975a4340ed508c144fda0d6ea95120807cff8bfbaa935a316519a22664b322b037425686c5306e3307e2ffa40
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
index 65806782ea8a..5f047489a0fa 100644
--- a/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.6.1.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 52bb1672a040..52ee9505fde5 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -2,6 +2,6 @@ AUX cryptography-2.6.1-libressl.patch 2527 BLAKE2B 090e0fcd78a6661f8a87c27f572b0
 DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39
 DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7
 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
-EBUILD cryptography-2.6.1-r1.ebuild 2236 BLAKE2B d0bf98ac1a5a4e3f1ad8f4538425fae8d9020158bf400a5e2f06de64aade06e94bfce70fcbcd4c53c1004ea07860badf3a47fbb2953ad2e40175443360335f3a SHA512 70b5dac1e58a1265bd5fb4b93fd8b4901277bd2d5cdc6be1cac9ac0fc5dd3b1f5f8c9a60420dc923d90f905802b167a981fd04b8c1ed8bdb874638c4e21e6bc3
-EBUILD cryptography-2.8-r1.ebuild 2225 BLAKE2B 2e57f651f05be3144be7b0a854e94ea73d5f157d27c242b719c9b4a55133b2100dffec12ad49805a6fb92bc67f040d9e4c15240004da1b96ffd21691f6d1b406 SHA512 817ec38de30488d5337b8179b1b58e2c950db13e36f3f4c42f03246297d213156fa75b0701b2002d4790a5dc0945e421f8707f1719b641aa5e81b1f1ef4bd87c
+EBUILD cryptography-2.6.1-r1.ebuild 2237 BLAKE2B bdd563006e3158369e19331f9d6f292734d305460513b3e388e7bd91657887652da5e6cb27577c93a9a81e6a85cd379e3f92d89087e7af9a7516662333f96b64 SHA512 c6ef4c387a5c5b4516ff00d09dd2dd766bca4571a7c5f76861217a39c9790d88b940b7099b896d066fe7d8cf04aab6c4586f57fcfe238c157685f0ea12417858
+EBUILD cryptography-2.8-r1.ebuild 2224 BLAKE2B 00aa2e6ee2ac5390ee6ec9b4138492ed019d4940b383c22a20c301c715c48461e22e6bdbc4d3d3b6b41fe9588ba2f2ddd00840e62acb8f95601239f2130433cb SHA512 82a5b40f5e8895a5996c8e7b123a0b3211cb8aee7e0cba910128579aa475373251db51225f92d3e6552c6bc891a5bbdb455ab0283bba236518cf0c8a8093a4e1
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
index d0c85a6a8fd1..1cfcb46fdc96 100644
--- a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.6.1-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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cryptography/cryptography-2.8-r1.ebuild b/dev-python/cryptography/cryptography-2.8-r1.ebuild
index 93cb6bcfeef3..65d300d2eed2 100644
--- a/dev-python/cryptography/cryptography-2.8-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.8-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 29db9cfb1fa5..662b070771db 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,9 +1,3 @@
-DIST cssselect-0.9.1.tar.gz 32952 BLAKE2B 7f7a78e8085036bed72c2a1a0e4a97cd1988e8d6981ae830f15d5fc03f5fdd43f0caa7b94d2923181f9dc926a6a11e970b3f091178640124286aa680fa023aaf SHA512 c4cd2c8d6fbfa99b836554685dd59e1e794e1fab06fcf4419a226b0608a05d58be5af54e507003f2a233a22f03d59d3d63c0bf19b3314f15c95ab3ce5f4db6cc
-DIST cssselect-1.0.1.tar.gz 21849 BLAKE2B cfe3637746329db224a44b680cda044238fa831ed0d05cf3484be6181de13bf8660330362626ddc03c7284a80e7c4a814bba293dfdca07a529d9c0c7163c95d2 SHA512 060c4b8d427a935b851b4b20d10ef89b9d6f685692b7144afc8f848e318abaa182ed60538355ea3f25050e358f24904fa0d9c01fe77e3d2428e2ef2a825e2928
-DIST cssselect-1.0.3.tar.gz 34027 BLAKE2B fff15a50d26ce83a0480020e54d00a027a7f21ca2c4c45d5552c6b4c19f7be21c390650c4befa61b7ae2b63946de88945deb488ebd6c7f7fc470950dab233671 SHA512 08feb3a515cc75089657a508cd1a80c6aaa97d710f27e99f9e749a1519adc13c5540134c6a4e0d7f548b022b8bd23dcbe360530d2329c5da36e43aca1f9627d1
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-0.9.1.ebuild 1133 BLAKE2B fcbb4aad5f9b3c610500e4cb532a252baa8cc72b5ccfc433e89f6e931631bcb1295e3c58e79c43af2b2b97a52ee31dffb3e356abced18063382f8fc5b459209d SHA512 1a8430a6b94502358cd33b3c74498bed832e4bc64d2aaf49373ab4c668dbfcea7c7ff9182a20af10a7d2049243699b8e91e4136908a9869aef03d27257961266
-EBUILD cssselect-1.0.1.ebuild 1232 BLAKE2B e56b62f74fdc1ac71339959a7ea350aa36bbdb45ea57777300a16bd1b2935aa57d37946ef1a636de8f96875d28358ec412158a1d1080b848bfa787edee4f9abf SHA512 747746a711b4db90e20422a061c96e483cf47df13e7733c8da046dbb3368b5536dd4249deedcbeed3362c3f07c5a1868755fa912e2f64a2751e7b85ef901a240
-EBUILD cssselect-1.0.3.ebuild 772 BLAKE2B 2c9f4e896918b83b7b6a6f6bf0e6e33ae2c0d771b51959da15aa9969368f14cfba3f91065d318ac5c82d762f3ba4e0675f937770a1b4723a84199ee62bd0415e SHA512 097987a11b6dfe643162ce3d4aa3d84ebfda80b43fb022924899baac29a2eaec66f45dd319b66333c6b00b2a08b0b21ddb0d2d019a15de8caf321bb9c91bd506
 EBUILD cssselect-1.1.0.ebuild 764 BLAKE2B 859238f8e8ff645d697fe7a2c6ffa5a8be334df3766bdb0bac235e7a7a2ac6f726dcf6552d5b69e92c60003d06df4218dfbb71cbdf569041889809f78167f90f SHA512 80f789c3ce28fb9be4316ad3de231da50b48bd778f8cd3b2e9481c519dd7e7a46033dba9bf4515b4cac9639523fd02dacd338002f5235f1b9ede0b20274d10f9
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
deleted file mode 100644
index dea1a10f1bfb..000000000000
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-python_prepare_all() {
-	# prevent non essential d'load of files in doc build
-	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc ; then
-		"${PYTHON}" setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
deleted file mode 100644
index 83c87c580073..000000000000
--- a/dev-python/cssselect/cssselect-1.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
-
-# No tests.py file in this release.
-# Please check on version bumps if it's still missing.
-RESTRICT="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-RDEPEND=""
-
-python_prepare_all() {
-	# prevent non essential d'load of files in doc build
-	sed -e 's:intersphinx_:#&:' -i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc ; then
-		"${PYTHON}" setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" ${PN}/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
deleted file mode 100644
index 004a8ab34579..000000000000
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/
-	https://github.com/scrapy/cssselect"
-SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index d5fa63d995c8..843a598359af 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect2-0.2.0.tar.gz 28197 BLAKE2B 447dc915ff550ee137c64096ed760e12d8da4dbd732a1b48668c2843aa90b11af89e3fe6e31d7128ec713132c7dd5a8b17ed271e0afc3a9219b5839f5e1292d7 SHA512 18069dd22892d8457865c2960630e984e791c6779b8d3a6ce4542c3ae92535a8ab23fc964e59776095a999a38ad2c40facce3b9164fef68870bb54167b6dc49b
-EBUILD cssselect2-0.2.0.ebuild 507 BLAKE2B 42b02700c08d900581f61ccc295d04e74ff014a226a81dc463ab12ac8c0566bf4f2554eadfc5b9c1692deb680abfdb47059a85fe8a41407bbfb037e1713087a2 SHA512 acb7a2c7cd30813f68008664a0c8613b0c5babd0b71cc3008ba66854e9b84a660b98d27198d608d150c9ebfe5ff31c6f8f542a5fb0a41b2210892020944648e2
+EBUILD cssselect2-0.2.0.ebuild 497 BLAKE2B b1def95901f1f4665e3027e5b9006c1e8c7229acfcea7fafb4feb9c51793bf379ee8df8c08d0c6e3d9ca8b820cc3a43a4f0adf7cf150f90fe5c2d0635515f189 SHA512 1f66f4466b174fca99d171ea39f68ef2bd33b4c033eb4335b361874a40f64439ac2dadae742ffaa6641270c27bcf227986492885058efa2d2c6b9ea814aa44b7
 MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
index 1868a97a3e31..19fcc6a7c20e 100644
--- a/dev-python/cssselect2/cssselect2-0.2.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 4d63e5c3bbc7..f8a39591e9cd 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,7 +1,7 @@
 AUX cssutils-1.0.1-pypy-test-backport.patch 1215 BLAKE2B 8a6859fb3721a1c36541c816d10da5109a525bb8f92e07df79c0bf0d002240f838a7b58b67779acf7c41f331b218fa3342385ed3ecb2d15e624f14cec1336536 SHA512 a0072d67f034b066a30ec9cd35b5f618ce8e0beea2b1236b6900d7e028b1ed7d6095ca0beaf0eacb3f7e8a4649e22b98951df9a303d4761f15d7472e2e57b41e
 DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb40840602bd204f68a1896ea92b35dfe2ce6f316d84cf5d21a2ef8047f4748294b908057fa12cab352b42d7ab2ffcfaa6f SHA512 932a128443cc31f689d91c7c75a04ddc79824b4e5c0779e48d30fa0a3a760cad82d8208264ec95a3b120c38962f2eabf6b3456aa8f81d24e9c9718e95fd6bf83
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
-EBUILD cssutils-1.0.1.ebuild 1317 BLAKE2B 529ad01400b420b33ee03db7094c8832b54b9e6fcbeaef55619a9c60e0a14c2497f92dfe0f56d706eb68f8745d49429185bc1faf5ca8505ed0d68330d32dfee5 SHA512 a0b5b2648bd8be6f322dbe52cafc885f1d335309e6996149ee19adb45ebf518b613f334e555c36ea9756e87f6d2ded62837de9dbdd55b6107b134d398172a3db
-EBUILD cssutils-1.0.2-r1.ebuild 1513 BLAKE2B 9ef184a37a60d62ee5e5f267f001923a481c9e03cb273a72647c232e04bd5f77cb20531ed1f2655fc901243429915303cc94c108cf96d761a555ccf20607dd19 SHA512 21fbc26e09d1e9aa34624181ce5758f3e58e432c8e15e3c46d7ad71ff473909263fd7884b9b7c3e460c9fcba3b859b434a71588e566556c135a4f90e2f8a4c36
-EBUILD cssutils-1.0.2-r2.ebuild 1517 BLAKE2B d7ccd17ba289edbb14a95ad42a79454687877b0e2e6b5f7a28625660dccafb925dc7dc70f5cce884f856e2ffb4ebc9d5391dd4b619ce19448cf31c1117babc42 SHA512 0f3e392f202817be0872c57992c27ed9fe693eda830252a587630a0fe224aac73bda8ab99d678baa888201fac097641bcbb4b1bcf8fe3c6fb9cb31e800631a5b
+EBUILD cssutils-1.0.1.ebuild 1311 BLAKE2B 70a1606ac3db1370fc5160ec421d89ec4639653834e4ae683e087c9dc8fa648614d7744a2aa44963301c50723f9619880afcf00464d1191b1b416854ccddd0cd SHA512 d8c818491c267f59bf95c9a458915e39257f683453f74d5cb9dbe1a72850980e93a1bfea8ff3e4f38263a281be1ef4d4dca737f5baada4202665b3675ec68adc
+EBUILD cssutils-1.0.2-r1.ebuild 1507 BLAKE2B 617dd1fb973ebd1640767324c07592460d400b1c3dc8b187d85721f7e523e2d8179d5408fd33250751bb305e72d8b1256c3e1bb672f05bae38a14a004d0c6695 SHA512 a54bf52cdc82bd8a5bf231bb490cd349033a5123eb38439123554a6ae08b3d96d52d7b738d10d42ee1d6a4a1a0e3ad36f85d041b16d177213ad7d0aaf50cdc3e
+EBUILD cssutils-1.0.2-r2.ebuild 1511 BLAKE2B 5b2d03de1278cb3a03d67c9ab6f0597d0e320c0c33d51a6d332456f4dee24303c981a5fed040b9e705df12a4eb86865a79cd7db2a05f9c0861ab67aeef7df409 SHA512 fe576f07af73fce5b1d1a7f41a678b38dc4d75210ad1eaefb63c5ea4c2e3632566b68ab0a0e6196dedb1a1fbb2a3b9bc2a392ac233c7d39284f6eca037966ba8
 MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index 8e3bc6478cb3..f3e9e622067b 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
index 9536111a6c7f..4c06df2a752a 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
index ba3995b9145c..b1dbd02b135b 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 58b30abd6f25..5341d73a19ed 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
-EBUILD ctypesgen-0_p72-r1.ebuild 800 BLAKE2B 28c05cd7d1c5e5c174fedc041b7029f23f4433edbae910ea174dbc239ddbbd596b157f8b71c957014e6f57f96e5bcc904c2826fed8a098e98c8fd80090582350 SHA512 bebfe7c9a346dc033e79697f1e23c63caf10657be143ba9c1102a1590863ab05f708a42ccd78ff956dbe7c43c86e58238ef195e695613575e96ccf74dd9e83c6
+EBUILD ctypesgen-0_p72-r1.ebuild 801 BLAKE2B 4090bf5998441ca862bac30bfb82f8b6956937a99268e743ba2451bb4e8618daefd8402fcddacd63116fd7cbd0dff2bcfa4bd0e62201f0e3edcb8331f9712e58 SHA512 a1bad6ba260ddc730cad5aea5fe7bc66327316245a61f187fb3724df71553d4dcb6c8a96003e6ec12844c675a974ca4e35514ec890fff454c6b51711c7054d18
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 49d6e95cef2b..8f6da2fb563d 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 53b4fef36cb0..5e2572f73a73 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,3 @@
 DIST cvxopt-1.1.9.tar.gz 1872932 BLAKE2B 50990b8432d32db68580243a5f547a4be2fd36f23196b1505e90eccef9fab5526ea485bf9f81539842229eb276345edce12b064065a1e13125d5adca0de07e8c SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b
-EBUILD cvxopt-1.1.9.ebuild 2880 BLAKE2B dc899c3cdef39a1d17bc468a54222aa5607d487ae817ab8cf1f173af78f2a1d8e8cfb083b130f65b6ef72acc4a880ec999eef09fb8a72a786438cf5c70724dfc SHA512 e738603f4d9e4e0b9f87ff4936137b705a04670240eb220a8589d89492014564464272e12e223db3272fcd2e91589a86dea208b9949e44616ec5d13d6eeb9fb3
+EBUILD cvxopt-1.1.9.ebuild 2870 BLAKE2B 06a83d282ebcbbfac993413cf904aa192db8bdd32984c831f1ebdf1d45af67f3c7878f7e4026170c6fb39da4f5be506daa9e6ecbe9adead474f1fdaf2fe5d0a6 SHA512 9fb34e722fd1535e94e67d2ac436e893594fd4a9ce9e5e2b8b4923f48ae3ed013af213b8b9f41b567b35e377fa76a093dbe89942faf85040e3ff3b4496520839
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.1.9.ebuild b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
index 133148d8684d..8846374a525c 100644
--- a/dev-python/cvxopt/cvxopt-1.1.9.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index e1d1723beda9..7866c6e03748 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -8,5 +8,5 @@ EBUILD cython-0.29.12.ebuild 2205 BLAKE2B 562168a2bcff3f94a596a778937559a7e1c59f
 EBUILD cython-0.29.13.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
 EBUILD cython-0.29.14-r1.ebuild 1965 BLAKE2B 24f822ffc042de44f22cc32306f70471bdef6357d215bf8b4cd6b850f86da11de1822aecb078b569e2a934cbfe791069d16d78e5d4fe85ba8f6619c08608f659 SHA512 2d81f01b57dcb5734a2ba067b872f2fbace9768d928c757e68084938c65498afc2adf56905f5679250d436a4db8b73ae35865f0134145c5955956aa5be7d3634
 EBUILD cython-0.29.14.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
-EBUILD cython-0.29.4.ebuild 2176 BLAKE2B 773d1e0cad44940dcb5b17586b690584b957a7551b0661880a97c48dd8dfa8fd186099ef329274b2d72cf4c0d03e3e18d77c7ab328dbe7f83bec6745a5a487ca SHA512 3464c0ba73b52f7a7f9d04b309c786741f9f2409d923d1d19d9e8618bb4d04eecb259cdb79d2451802d796120dbb12738bda9dc7929577af63f9e612d76963e1
+EBUILD cython-0.29.4.ebuild 2177 BLAKE2B 8861209ff6f7180426a211af4f2c4e4599453f5f7ebc88f4c5b2aa97ebb62212f92f53f74f32f59c5d0f9fdb68e4853e0527d80e24dea4228bd8d5f8fd479571 SHA512 7ed078aab823d630698cce99e0c466a3c7d3a089874ae643745c0f3be91c124fca412228707a2f8a94d602b50b40ac6bc301247f9a10fac04f20a48518fa3a3d
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index 6d1dd848103a..75983b818893 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc emacs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cytoolz/Manifest b/dev-python/cytoolz/Manifest
index d0bc42b2658a..fe8c6eb32ff3 100644
--- a/dev-python/cytoolz/Manifest
+++ b/dev-python/cytoolz/Manifest
@@ -1,7 +1,7 @@
 DIST cytoolz-0.10.0.tar.gz 475069 BLAKE2B aabd1bee4ee5b17640cc1e4126920c4e21893286315e3e4a5e968fb52dab371ade7a00f3082a704dbaeeb00af5ccb3cb9743fd66a3d23ad5879503f66c4f0c49 SHA512 62e90837125fae5dc6b96ac13a7fc2193604cd1250173b8e24ba3e65571e9394369cad07e39e7e6e42da0e3dab04db98193ba55195267c49447cc7ec0ff7b840
 DIST cytoolz-0.8.0.tar.gz 349493 BLAKE2B 4dca289eea51f34aa0faf869778a289c12c7e7c43893680c3f6c6302312e47cae6070203b21951a4a9c38f373f87fb773e9ccb9787568b378638d449d82ffb47 SHA512 08a97312602b3bd71cb9a3b6f879121f739c73065210bcbac227e366112b2157d479912040296d58c5aa79d3fab8496fb92b12e0ee8df0cca15f46f151312b73
 DIST cytoolz-0.8.2.tar.gz 386259 BLAKE2B eaf31b9e40cf53ecf32b7113d55d4600ea6105187f78a4cb6f0b0ceccf02d2c5fd637ecd3d8f80328b209eb694ef67c7c188ca8c458f896868bbc2a71b2e9ce4 SHA512 b75408db5c13c1142fe71f37c43e7b3dd73cba294571ddaf5dc1bf03ae0e18fb7b6d37f42980db65a4e074b923ac1243a90f1dd30302f0f9be3d7b1904014082
-EBUILD cytoolz-0.10.0.ebuild 1069 BLAKE2B 47d53b3a7530055ea44bf291171243c016fabbc03774a797e29f5c3051fe47159e14020a9e37f8539daac71823ca20857ba288e21901b6da0b49851d7c436d2e SHA512 9ecc368f35e7eb7d125a1c400545f9418fef7418f172bda2d1fa63df7b40faab7e2545347c55fa257dc8a3b3ab8b0e71ec26acbb1367ae3c3244a61a0e719128
-EBUILD cytoolz-0.8.0.ebuild 1039 BLAKE2B 66be30869b87ed16236f0dd4f220509c804af8a480df0e58f7997e2e66cb20d7908564f513473a1ea58488c076f03ca707b23bbdde6140d525da053d5f987e86 SHA512 3fd2d366bdeec7379eb3c4051095e5e1c6fb35e184cbec4dc73ab5d34133913ea48fb5d11dd20c721f79e30d4b34272192388bfde07bc62ab131a11b4b01eaa5
-EBUILD cytoolz-0.8.2.ebuild 1065 BLAKE2B e39ef512c65ff4685f4dcf93111d3b0ad207a3119ac100318a09457fb362eab7df00c7cbb5e88b6f5eea631a824646fd85193f2433776c99660df08a1a21b1de SHA512 04a5fae5303bc7a0f01093f5868b2acd6b8f12ec8f8055126fca18aa09bdfed030b9c9ac5061e195bd97e59cbf708c9435d19d845c57f4ee76d3c3163e880958
+EBUILD cytoolz-0.10.0.ebuild 1065 BLAKE2B b4ebbd6bc82cbf1ec22ae2d0090640e1d9ff0a14b9ef6fdeaddaf7867e562d773accc3d363d7788cae6818a00e2db6b8341cd5534d2a061126e54e60e0a7d7a4 SHA512 8ad016ec0d077f438438d6b36765ce770f6b008c146f2defb3e4f2bf274ca41bd0d8cdc19771277f45252ae9652437b859eb4b6e67a4e774dca52e10e5440ff4
+EBUILD cytoolz-0.8.0.ebuild 1033 BLAKE2B e82746af8b83e5fd6b3854293b679c9bf106b2c2f935857ac087088ff044746d6dd7389e1f7fff59b52310ee68b6de54e8430c4c77d3457809cee535c477aac9 SHA512 2e023b2c5f267ae0c958c3d0f4c40245925e998162d9fc4f4769c1347e7addb7cf3b0de90846c1b43d2f9790076d6b217bb200bd794eb15794e8b6fe7806c4f1
+EBUILD cytoolz-0.8.2.ebuild 1059 BLAKE2B cc4314ed359bb58daf9800d150b9148ccad5da96b7a4184666cc320eb85c0ad740be3d546eadad2aa4e2098ac667332d9fe0e441fa165229d2beae0268993bd9 SHA512 f95ed90d67174ee1628352c04496a2ea384c4d3c168d766f9c9a8dbecd8562d56380a256ffcf4fc344655bb9b3eeea800548afcb5b23e9c794784d42a493128d
 MISC metadata.xml 310 BLAKE2B e591a8dddc9f32e19aa8510333860ea3ed1f833005b621d59f653b97e0863dac0acc67ee66a3a2c53062bf4ef0c0028e67082d24c0793d3bf0ac2ae60e2bec08 SHA512 3858eac51c768acb385d86f38529d983b781efcc4cb0ce8b6bc326962df9541d13f21881c4deffa19b5575ae7fbd1b97da58a3ab65dc724eac7144a050de540f
diff --git a/dev-python/cytoolz/cytoolz-0.10.0.ebuild b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
index b2617dcd9569..b458df04bf16 100644
--- a/dev-python/cytoolz/cytoolz-0.10.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
index 1bad2aa4fd85..f1eeef58cd52 100644
--- a/dev-python/cytoolz/cytoolz-0.8.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
index 78b48b218d8d..ecdfa27160c7 100644
--- a/dev-python/cytoolz/cytoolz-0.8.2.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index b7767fae9cc5..f2b61caa9f4f 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
-EBUILD daemonize-2.5.0.ebuild 460 BLAKE2B 41963a65c2bfd265fa932c909450f56556b081318ae7f6f3befd806aeaa6e7c4e6e6acf5d4393ccc3379f9f4010811c834d0c146c8b2c60ec3c4662740eba046 SHA512 1616e4d347140956ebc3b3d0d6c8740a04da08c7687a1cd9874923ca53ff2d39b21f02695d420a250417cb24d345f4cc762259c7f5002dba4d03aef556dfd765
+EBUILD daemonize-2.5.0.ebuild 450 BLAKE2B 943b33a52f5840d5d94f799d1f25b483d531ff16a4c5757e9f45bcc6e0bc36feda4072f20eee5802c8ac0b0fd43dfb2c0b4aa50feafc7db9ef037fb8f51975c0 SHA512 1fa23ab8d1391acab0ec5359cf29fa50e81639ea47ad3a0e9184d9192e80dd51a5a8184332ea3d0a374a708930d98de97e8902ce56dfff707df05878cf332628
 MISC metadata.xml 377 BLAKE2B c8bc7c4e33e27cb2f208673e213460e02fa448f41226b08324f44d700d856be8b1bd408dce6f24dbdc1ffe8d2b15d99f56160fb93727066d887362fee7a532db SHA512 7d2e4141f084e93515957fb82473b1504b53c5082063b3f4c97fc1d326bc03b589405df8b3f19f8f926656fd52d7972b1b95a479c045d8a691cec255bb95d4c0
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
index ac079e318e80..1d2f4adefbf7 100644
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ b/dev-python/daemonize/daemonize-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index e3f3301b290a..8f148ea48f6d 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -1,4 +1,3 @@
 DIST datashape-0.5.4.tar.gz 99343 BLAKE2B f976a565e5a099949e359b6b2de0cd9ebf0520e780fc096b1e528e54b26d13fb68a27cc86a7ae6f402837ecd76a6f889308cc79adc9579a26173fdf2f8abf234 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa
-EBUILD datashape-0.5.4-r1.ebuild 1176 BLAKE2B f71271bb5dea9d4d8525f1818af0d6e5b30807eeacb423406eb9137004eb3272a5cec11b1e4d266d0247f35e4f05c7a4d04196db4bcc20d14f2a6d66e3e0bf55 SHA512 35193eff51b563333d09064340a602e739fae611729cc0a71d6c4c0962e2dcd564ddf0edc34a575283d649e12f640e80a9aad047ee248ccfbb1d4fb667a26133
-EBUILD datashape-0.5.4.ebuild 1180 BLAKE2B fd1b06c857a0710242647add17ee733a6cf91c6c10027b5f1acbb4080dea23f6894a3617b2eab118013d0de8ceb95b7939fe76dd97a12dfb7756a625b01e2ef9 SHA512 e909e1ce1c413db6927d4ea66c39bc7442d10a75fc18d90ac75eba3411cfd55cd7e94306581bffe89e99b72064f3b92fee5c606ee1e6127703ca112035d3027e
+EBUILD datashape-0.5.4-r1.ebuild 1174 BLAKE2B 5661e2f9ddde428d261d584aab5495721499bf31f18458cc17dc617b2f71dd6cdcb9c8140f5866ec2caa430d30b7d653fcfd5b2d1724a369fcb688ba1b3e1344 SHA512 66f5d78fcc944849f9a002b744a2aa1d8447222eac5ac11112d4a29984e813db41964e0a30f4b20f1002bf1dd3245bfabb35db1ac7516594b76711fe060f72cf
 MISC metadata.xml 510 BLAKE2B 631f7ed8106fd090953d4969cbf687d3ed5990af3803ca8315a848c95c9d8a0a5293cc79b7428e5f8f1c5e8bec76ec18b3cff2eac4f6cef8ab316cc28cc0d185 SHA512 7216551730e65c069c1315ccaaad65434106876e4a33304b9f7214610fdda9919a44bfce6e8f4cff680976ff51ca10ab23ee11abf5987e7b25cdaeac8a174bb8
diff --git a/dev-python/datashape/datashape-0.5.4-r1.ebuild b/dev-python/datashape/datashape-0.5.4-r1.ebuild
index ba87920acb00..e72858a26c4f 100644
--- a/dev-python/datashape/datashape-0.5.4-r1.ebuild
+++ b/dev-python/datashape/datashape-0.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/datashape/datashape-0.5.4.ebuild b/dev-python/datashape/datashape-0.5.4.ebuild
deleted file mode 100644
index d62fc5beed98..000000000000
--- a/dev-python/datashape/datashape-0.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Language defining a data description protocol"
-HOMEPAGE="https://github.com/blaze/datashape"
-SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? ( ${RDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index 08a5f29c48e0..7133613e9cdc 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -3,5 +3,5 @@ DIST dbus-python-1.2.14.tar.gz 576181 BLAKE2B 4e36c3d0ed07ce6c7514e2699b6cf5d0a7
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
 EBUILD dbus-python-1.2.12.ebuild 1742 BLAKE2B b1ae50267ddca708cf171d1362646f5facb48a2afe18ac6030a84d26ad3bb4b342e2576ddf87340bd14b1ecd0127264b2a7b6e5fb0039f60f369d22c3b1007ab SHA512 61a435a9bfcb14c17f8bbe6cb964ec6f7c2f58782412eebb79a14379ad8f8eae175c49120b9fe5cb590ee51a1d38fd3814533dc3f9aa36ddff481db14101716b
 EBUILD dbus-python-1.2.14.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
-EBUILD dbus-python-1.2.4.ebuild 2223 BLAKE2B 0f143aeae17e987b69fa84637bc1f51a9d72ef4ab37e13e5c176ca5066ab7f75d5885423ed7c47707fa37db9ca92bc689025670f449f2873845b06aede86d5bd SHA512 86f5b36535526f0b91ef046732ffa375a65ed4f691119923dad8c5f04df1563892aa959170e8f94067089b79046e5415af60fad889d018ca5964ecd281a287c2
+EBUILD dbus-python-1.2.4.ebuild 2224 BLAKE2B 61ec4ca30a4a1c01f7efb2c5369c7f25220014f34be410f99dacc6d1e3efda363dd489398330d20e46ed6758f9810100b0a8ae40437cb7871e49b700f75497dc SHA512 ccbc82a25d9fda46b5cf252a5e076d9c9c5263641b0ee5a0af2c9b39bccd847f50feb015e19e4018338cd6f45eedebb4f428c5670ef5db21f3879bde357303da
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index da990bedbbb5..eef973ebad8e 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 # API docs generated with epydoc, which is python2-only
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 2d5465d4de12..221834eb4ae6 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,4 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
-EBUILD dbusmock-0.18.2.ebuild 1073 BLAKE2B 9088ad956ebf752f7d0d788fe2f6952966924f898a252be84b5c613442d98bd32cddd196870a4ee5430e388b64f4cc03e9dc83d361dda1e2dbea6c47353336e3 SHA512 849d3710129657983bc30517335de517162507664302b7577a94378960c4688df206562d4c427a768e765f64536ee8f3ae8e0d97a0cf149ec936168480222749
+EBUILD dbusmock-0.18.2.ebuild 1064 BLAKE2B 282628d0121ef32532f38bc4e98e42bc1636025f5aa8d776a3d9c448ce951285996708a39b05ff6c6ebd2cfe9e1d8aec49eb0981151da22970868e6f5714ef3d SHA512 b3ed90e0af1c5baaf6cf2df15674d9db6766fe8a0e834bbf98fc0f2817dcc5a34e7233272c75a091436683ddb0ebb8e7a1b86239c94d403803c5c60f69d2a53e
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.2.ebuild b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
index e2df5eacf945..0e30599771c2 100644
--- a/dev-python/dbusmock/dbusmock-0.18.2.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index a8805c802ebd..a1b2f47e381b 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-1.21.0.tar.gz 28472 BLAKE2B a7c4a2d41ff6df1df1bfc2b775d888c1f9839ddb76bc80ff6b9bb9d1fb8e14eb225006021a0889d2a49c317c48f65cec024ff1d3c4e9c9bee1c0139a7cd1fc71 SHA512 a5a4f66a4d65134e84164de6953d4c6d5b2b9d36974055d26263b6d8505c4a131d693c371287ccd9c76220a9b59d6c3d1f0015db1d0f2bd8eafcb79c0bef0822
-EBUILD debtcollector-1.21.0.ebuild 1499 BLAKE2B dda0827dd2858c0601ad708eedf2f23d64c1270eb7b7b4a24b3b346a4bb3003555dbd4e84e3ced3561b0c14da84d9a2208f728755e21de607a6de23333764d2e SHA512 294d05cdc61659d0b4c444e81c7a25056978d811694bfecdfe0c452368df83ff86152a21a0721d5aa4a9578ad20a4b67361faa53972d85eb776e39176e5c4c44
+EBUILD debtcollector-1.21.0.ebuild 1489 BLAKE2B d2e1cccc592856d2e2708b28455ef15e26d74ae5e346126f0b8aa2533c87baba28809daf0296a6961a078f7756fbd3ec374117970e2316f6e9eb79ef68fb17fc SHA512 1bbf09cdc9f8f1a565de9c0122fcde5d87b6d2512baf7c65a056acceef1d658f87e326b428b67ea847a854eac5123a6eca320efeb3b4bae2f35e7c6ffa599828
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.21.0.ebuild b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
index 1f91538f8b82..89bc19073f21 100644
--- a/dev-python/debtcollector/debtcollector-1.21.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-1.21.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 22a0071a91d7..36997a24e61d 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,7 @@
 DIST decorator-4.3.2.tar.gz 34892 BLAKE2B 49485ec0ae25947b27dbc23c8f17194bf5b03778e7e43524e561c320487e1b6830a1ab39e9fba2a154e1cd00155af779965e497724f01d81d301a0ca979ba058 SHA512 87102e1b314086d008c48bf53f1061b28fdbd3ccd3d301773102fd43e3a4ce8b5ffeb9107fb5d5f47b7bd45c26e5b3b2913ea20745ffc9b274e2c0b24a69ef70
 DIST decorator-4.4.0.tar.gz 34559 BLAKE2B ed8cad0081ca47cef15f30d10afda1d19dd496f482a4621a1a349d0b5fa63d41ea4daee389d21b8b176be09949f8519c117a448003b2e8ee5f5c2d50d3015cac SHA512 32c35c80581cb7fd0b2461d21c7eb14190294b2ccc9f92749b6bc74449f7d02a26281e9a2817f6f16871a6cddb7b02b8fae8119c22256fe43a6aaa31a7599dd5
 DIST decorator-4.4.1.tar.gz 33350 BLAKE2B 75544aeb6dd995edc091515da70f4bfff8a12a02442b47c945d4ab18e90eb48647cdc86540de542ff3357cb2114eebdefead7edeeba25587a15fb1e7c87519c6 SHA512 12378702246b212d5fe0153dc97cafdb2afd4779c51fd224385e3c3562e1a1e3439574aa7c37c8521fe5f86a5f0b4d4b3075e0407cc249f8fa4b341e1ebe06e0
-EBUILD decorator-4.3.2.ebuild 696 BLAKE2B e845b21309eb6d40fe35ab98db655647e22908f84ac4d278d6138e1d43f2f94dc053a759c5806eb2710f53ad7dfa1216706890fcb33423014839399fbf8d772c SHA512 ac07c624c1eb85c4e90dc691cd7f2891466c8592f95d78da2a5ba0da8f86581d3a0cf149521493616fe3e67ff5adbd79b4a09bde99d86fe32b1d6154ff364056
+EBUILD decorator-4.3.2.ebuild 697 BLAKE2B 14f269e68dc1466f0f4b27f569a499f1c41bc3ffbbf8fb9d090154b592a589af0a839e938722eb69e5ea7e970ab801791048f71b021f56f18adb42aad1dc64e0 SHA512 0f27d747d91785561158a4ce02a1272292a1140f64a16aa057bd6d76ce685971543c4e7d1489f1ef7c5c5986026f0eae656f679503e453a871ea9325a9018327
 EBUILD decorator-4.4.0.ebuild 659 BLAKE2B 7e48cb9e9b81dd433cd25dafd3422395923cf6f8598d6b51ac7e53e13532bc128f754bc3b44e0a4caa9a88473bef625cc8793e6978e5368a9d0241f9db2f9e14 SHA512 b3d654e90940e4433fd6b1b8dddd2fbbe9b47aa37280d71120cb7e78fa4903c1a98df2f9f863a6593a42bcf5c8a2f769b3e57a0dd13aca1f1fb9f8048e481515
 EBUILD decorator-4.4.1.ebuild 647 BLAKE2B 62024ec39ca7030ff3e13dce570af6331d467222c54fc1f4cc35b53b6a5276fb56d58a847801a39ed1c7744cdb525aee00ef63e55953f94ce09432bee8e04450 SHA512 bf502ded9142aa27b8db5644baa02a4f085b52a05cfb90472ce79933b804f35104d6dde51305642f6930a4be87bf57cbbed48ea3d76474f14a5606add7763426
 MISC metadata.xml 731 BLAKE2B 9dcc846096fd68b11b1af0259b9707ca288b962a871c50b1701dba0e00011db27d3bc17970310b57b70301a51f083d41a3f6659ced9a7c34e48caaa60333af25 SHA512 6df81157bc757c8a8218fd75a28165cb8349d5a17a320db78582311d614a4fd586cf928e4d1c2158d8fa96cbc6537e26d85524839b688e82b29e5d7997819219
diff --git a/dev-python/decorator/decorator-4.3.2.ebuild b/dev-python/decorator/decorator-4.3.2.ebuild
index 92f2c7e3c24a..b607f6f01636 100644
--- a/dev-python/decorator/decorator-4.3.2.ebuild
+++ b/dev-python/decorator/decorator-4.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 41f031fa1d6f..612fde2b5046 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
 DIST defusedxml-0.6.0.tar.gz 62670 BLAKE2B 352202cd8157bcd18ecb06921eb086cfc91e567dbbb18592e526caa4fed69bc76842eda849813b829ef4389d3df74303529e7f775d56be2f919783fc7fb19b04 SHA512 dd1313802cf8565fd319ef10af04075019d00cba557e6414b2a2762bd4302437a32c05cd8c9e4cec5310c68c6a95d2951acf1360244e7974d40bb3fe963b7226
-EBUILD defusedxml-0.5.0.ebuild 748 BLAKE2B 01d4e3b4747422227816e9e61ca37e3d9b62d39d980a980726ad0acb722baaeecf1590578c845014d0ef9850eb174f16c6fa76ebad342bba02853bf71d4a67c7 SHA512 98974274931ed405eef9ccdf3665e3c8ab7ff00c27522b1c687273249856845a09b1a59695a679dc24bd3e376bfd1b05942f444e8df69aabe80cac18bdcea927
+EBUILD defusedxml-0.5.0.ebuild 749 BLAKE2B 1c17b1df7da3d5df62cac5e5eee1343b291d67dfb4b56cb75ba468461ec5d2e60a858195c78133ec40bc0ed13b4a3cb87e36c065deb7e3bbf699e5a0d0803237 SHA512 987076e80c374d3474d341b8721899d7344fa0793d8444d6b08b586624e3aa48d30e83a5cb87057e63304de1fb3ff9736235739a1539ffb618805dc5b25d026e
 EBUILD defusedxml-0.6.0.ebuild 719 BLAKE2B a229cbb1b4701d536842ef2f92113fd8c5a60970afd34784b6d9f022abfbbda210ef9e256b092eb0f69d395e0b1c7add2c094237b7d112e42e99b505d713a9c3 SHA512 cfda8d21184f5f1733582765a8937bd8d4932d186ad55095fd1527761f787c2bfea778c5fd935b18f21370221630420437bbdc84101ea3e141531967ae3790b4
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index 4de368eb4718..64ed2fda1526 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index aa2d6f5d6dfb..c7854e025efb 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,7 +1,7 @@
 DIST deprecation-1.0.1.tar.gz 9596 BLAKE2B afc4cb457ce224f120d41944e6eb71c212ef4d40d5a7c5d6d695d31bd105a4a5291daf5d3c7af0f94b58049f7e745e7e5be462495de88c48cabf5a28c22b3637 SHA512 fc35e6516e1617e2baad598a91e5d83ca95ab8a2d6a2753751d6752675de93cb44210109450a2aad9eb52b3c772a8b753c1d42ab2356c6663d2a03c4f779f086
 DIST deprecation-2.0.6.tar.gz 13381 BLAKE2B 1f21a4b8bd9293d50e9068762d4f909afe02fb1f7a8f352c5b3d5d10e0da90d122927a97cf060bec626ff8538478f83740dc1d79e050fe43dc27ade8729f26d1 SHA512 69dcf5e07cfc1c746564e03063088cce65690e2b34cffe327d59edad24f00d23cf9904089ab9ff5e67dce2b6b02ed617e53959be4a907074440ddb778576aa2f
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
-EBUILD deprecation-1.0.1.ebuild 457 BLAKE2B b2acfa21d69bed5a03848d6c85c604c8efecfb1adba98739b6d89e7f7bd96eab87e3dbefeff2cbfee2b1216f649f40286e068b429f78be6d86dc52a1c4628533 SHA512 ec9d1821e8f3dc00658cd6fdf39c7239e887b7e0fbca34ae01a826cfd12ae9e05899b5a3e99a7b169aec38134d9d69d93818e6f502304570d3650a6f44ac5e1a
-EBUILD deprecation-2.0.6.ebuild 700 BLAKE2B 794546d2226b8b47fd3550f7d01c5b3e84991730fbae31247c85eba947feb3cead1197fc377345758889e20b05b10bdac9c58d7b41a7196897014fdd82aa3119 SHA512 ae9e0209678c9de665ec9a32c0615f07f14a3185bc498ed8f0110e2b179c644f2c36dcf435873b726b14b3b8e40ba4212dfe954a0daa39535702e69a8f2a67ab
-EBUILD deprecation-2.0.7.ebuild 997 BLAKE2B d532701e8ed512b9ab9fc3ac2b88aca720a459d4dd72ed0b770ce36138ac0a9c3f4fa5a8e807f099f7f93becd83e269c9bdbec4f388561723a577efcf30a4b6d SHA512 25eb21953bd622ef5cb3679ba6635d658ea4705a34d9593d39a44ad65fa6313a4e4276b1dd45e4736c915a1a99cbbb24c6ef13604ab68f8f1440dc1ee209e838
+EBUILD deprecation-1.0.1.ebuild 447 BLAKE2B dff575266ee4d76edef2f35880e1c7553cac9aa46b6690786a233aa5946ff309a1276883c64583f35ae3573db8505717b496b641a1b174dbe01e265b58754dcc SHA512 db597fcf9681844b06a7c15bb852ca6f155fcb67f6c7eca839e74d2574debdf04afb31af810dd67bb68498db4b28d1b289d4b1b030dfbe04b858102bac326095
+EBUILD deprecation-2.0.6.ebuild 694 BLAKE2B 72137dc6b813c5e272200a2a26a2d45cf7e478b7c222b0d9d362646dbf960289183fe127f4d402674cbff473b7a28bd96b5d92c0f3a759f29475adf14bc4f7c5 SHA512 3d72397089c3f8459adf5591f21cb07b9bb89c15f12ca6682c4228c1a3b56f61af8bdf8f0f4913521e5762123ae328eb4308a04293e95adf167700e208688f5d
+EBUILD deprecation-2.0.7.ebuild 991 BLAKE2B 6d6de12173100241c64c6a9a4841f2039e46fdb9ba50f1f74db61e07c420f85f52a97f9a87cb35c7209e6b83bbe04fa1cb88c8947eea4481d0e4f59a0dffde61 SHA512 a96214267220dd9ef12024a7d20739bbef64bb38114f9e47a06c610a0107f90f99192f7ef71289a0850724c6c99cd4f0a89877eff3b90890a35877d59d6b0521
 MISC metadata.xml 635 BLAKE2B 5f363fe7d6dfea7c8e2a2d250134dab625e1b349be4f12c7438adeb6bd81ee1332762259b38a9460ad6de845152151e272a8454aeef86ad8994a0f755a8db89e SHA512 6878bae4d120e4d0db92023f5fbae1eba8a056515fe2746f34fcbc931d6cae8ca0c0d972eb91a571ad462fa140bcee15b6401dbbb96af09eadffb147ec3a826a
diff --git a/dev-python/deprecation/deprecation-1.0.1.ebuild b/dev-python/deprecation/deprecation-1.0.1.ebuild
index 823f76d0e981..54100da58a3a 100644
--- a/dev-python/deprecation/deprecation-1.0.1.ebuild
+++ b/dev-python/deprecation/deprecation-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle automated deprecations"
diff --git a/dev-python/deprecation/deprecation-2.0.6.ebuild b/dev-python/deprecation/deprecation-2.0.6.ebuild
index 18e20d00af4d..6d059b817144 100644
--- a/dev-python/deprecation/deprecation-2.0.6.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/deprecation/deprecation-2.0.7.ebuild b/dev-python/deprecation/deprecation-2.0.7.ebuild
index a3979c046d27..2be319862dc2 100644
--- a/dev-python/deprecation/deprecation-2.0.7.ebuild
+++ b/dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 6823c3b98d1d..1773711318e2 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,3 +1,3 @@
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4.ebuild 445 BLAKE2B 0bf22cdd151bba10259170c20891e2053d29463cbf6445a88ed4e2f39dab464c220f569355c3cd7c5ab25c7cf185b582b2d6291b6bb9fee8324a5181d1e4ab81 SHA512 37a5fb21d92f41e72d9cdbf057d0f7d90603a1a5de76d77d84420bea39352e84070923e68065f47f4130b9ef61534c36592158e55b46f1fefc0b79ecb449e522
+EBUILD dicttoxml-1.7.4.ebuild 441 BLAKE2B 8717b909f3c47beb41cf55c3a9b19831ffe8d146dbe5739a3eb9bb4d6446ebc8761c7c34f78552f8a48df54877f32556918734b18c3beed398e6620c0fe1c850 SHA512 cf65855d5773a41931f58d41a10cee6c2d8d8c2cd1d3d2f793ac9185b67ba04610175e88ebd4b389e009960f29844697d61cbfd39ccda9bef1f0abf3e62d66e0
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
index 78d47ad9bf8b..de6fc339e268 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
index dca17192c961..b52a1a5da5aa 100644
--- a/dev-python/diff-cover/Manifest
+++ b/dev-python/diff-cover/Manifest
@@ -1,5 +1,3 @@
-DIST diff-cover-1.0.4.tar.gz 73907 BLAKE2B 81562c30533739f950e52703ce235b214f66932f806a47b1ab245b69bba8ef46d4333924ddf2ba4ca6b70a7df85ae071805a4fac7181711495f46540c4a20301 SHA512 aa5646c5d097e2b3ace5807bde007c9d8ebcf99578dee2aff1174aaafbdb9777c4794a8e9ddd4dc6edb5af7f1afc812fce4410db87d0bab4159f044489eabb5b
 DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
-EBUILD diff-cover-1.0.4.ebuild 1029 BLAKE2B ea4c2d28fdd8bbf15090da4904735692ee7b3390eccf28009dcf2590f7594cd4b48cf5cbc62745469e55281c799a95687c0ff5bfde083775b7624359b85e91ec SHA512 d9200b6fb1914105679ab7af2270ee6af0627ec17cd2e53cb54d63139a435199dc7b638c03a7fb0003acd9dfc8ab3827fdd51b786c57661125818165097c4bf2
 EBUILD diff-cover-2.3.0.ebuild 1315 BLAKE2B 7043633b79b17ef9934f5edaf8f1244fc194b1073a29a5de8176f11522c97294193c734334865653775b1838b3882487cf343517678fb0260b986c494cc413bf SHA512 89493f0165b5683856ba0a23fe109a8195afad718310f96912f23cf1015ceac9b74fe41f728e614e75575960bdbc76cc6378664e42e61b3706abd1590af6ea9c
 MISC metadata.xml 380 BLAKE2B b3fee2fecc0de95a5056955412d4f069a57a405a887966c1511c4c63f6c2c77778ace33d439fd37c6b5db62c247fa7fcd71c15f6cc8a97de46e72a841aaa9514 SHA512 80581412380ac1b87077d5e1c74596434ae398bc9b654c5492db7ce60270e9ad40c0e13b5c95a11cae57bef6b2a1dfa8888f8061a2ff221acdfc30c21e57242e
diff --git a/dev-python/diff-cover/diff-cover-1.0.4.ebuild b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
deleted file mode 100644
index b9312ed98bca..000000000000
--- a/dev-python/diff-cover/diff-cover-1.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically find diff lines that need test coverage"
-HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
-SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index a7a45ac9f545..c0ec7a2f0c50 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -3,7 +3,7 @@ AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be
 DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc
 DIST dill-0.3.0.tar.gz 151375 BLAKE2B 11f22f18c5491633a2a3136d6993c59a1078d478f2e45d40e5a71fd9929527f4db98fe261d406c2cceb0cbafa277f620a17068123c73d85a44dc2252be138845 SHA512 d3e36716ec264fab2532264e82dedf2a0923ed11f2517b3df6e5576159d5701f336125e7967a37f4c80c37f60abf584b9f7cd4225ed68f942dca7af500c091cf
 DIST dill-0.3.1.1.tar.gz 151986 BLAKE2B 71b364730805974117cb00965a2276aa240b6265f2a98ae8e70ca2f9d8bf7a4b801fac083f2395932fdc016de3f068fb46091f296910ce96725bc982e774a40a SHA512 e61610451972522316d7ed6bc8287e38521fcd2e6736b43200ae498f24596994caec92313be1da71cf1b536fbbe01505673fc8018bfcbaf7705147a294565ab9
-EBUILD dill-0.2.5.ebuild 520 BLAKE2B bd8401634a7166b9bf87a34c9e3d0a54a34ee1a2aa1cde92f115f54608b0af21bbf8d31c5549c0980d72c816d69ceaa95736eef40e9b94489ae713915ef19c28 SHA512 2463cb1ffdb59e5a578d4fdb9f6182e3becef25c96a81a54f02e07f22a12ba8c83fc1cd2e93c933101f36d1641dd816150fc1df9d14cdf7f139985c4c1a7485a
-EBUILD dill-0.3.0.ebuild 588 BLAKE2B 1eb579ecad9b49e671161c3b5eab61eb132a0e4443eaf97ac1612b3636b3b3af8c2765e3cd6f8cbd094ba819c782a63f0b85bbb66ba4a96afba5993a06697c96 SHA512 7fb71a3daa594f89b4a6c21b0d471d4b5d394bded33a2631db33165dfa9891dab4e59d215181b93609a91dae6fb7651400e1509df894fb2f6a262eaf6bd19f53
-EBUILD dill-0.3.1.1.ebuild 583 BLAKE2B 8d675b2b3fbebe868e7bab9a9be5da7c84ff6170baa4b90ff5c3df02a0fb3ed264f18eb1c610f5fdcdf0a509956880254338be51ba2e57386007551bb249a378 SHA512 52b9e74e5ca1fe1fa71aaaf910440d606e94912be7c066457590f26671a4c43577a527c330c47525c3e50dda035776f0540f0911b57904cc4eb34602035ac7d0
+EBUILD dill-0.2.5.ebuild 510 BLAKE2B 1a4d6f487446bc0e5059126a4d4abeb56cdde666e52d8f76d246820d06230b83af5d0313225eab742cde00d56a86b1c36e2a67751bcee3a7337f1dea8a791890 SHA512 3f3547f757ac33f51c5359a844165951b4a8aec5fbc611a7ef4d3adbfbcdf74e62b25ede521562803dbb7d4e02b45dd4846e38a5b76d365abe9ce8e4ccee7593
+EBUILD dill-0.3.0.ebuild 578 BLAKE2B 544b7b52c888767d619185f6eca4eec7abee2552813421be040625cde7e849fc714cdb82dddb0bc425726587f3c648f0553602235ab8be8ddd105adc6bd4a1a7 SHA512 b7045c5e36c587db88c401d2298b9edb61d8b4780d84afde7d9314f451f2bb9419d43a310da8f5335463014a1e2cbeead8de7adfb459084d8d9dc8e6c4c19c85
+EBUILD dill-0.3.1.1.ebuild 573 BLAKE2B 6b7e858404653602015a3c30a89e43ba58f499497eb187a421f523c21f8594d24fd49b52f95b50b406cf1b4dcfc5ea6dbac04479c17ed9a8b4d2f6726addab19 SHA512 c7bf8801efdeab7ef051c9c8bd76fe80c0f3c7625eb98a270f869c0cf8c7c907adb35f00ebab094c8fe1ca651f20a195833118806752e860b7760a9a40f536f5
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index fed37739e487..98b1dd978b66 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dill/dill-0.3.0.ebuild b/dev-python/dill/dill-0.3.0.ebuild
index c65d45eab49b..6f550ad04696 100644
--- a/dev-python/dill/dill-0.3.0.ebuild
+++ b/dev-python/dill/dill-0.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dill/dill-0.3.1.1.ebuild b/dev-python/dill/dill-0.3.1.1.ebuild
index ec2d5b67f695..b1e50f229a07 100644
--- a/dev-python/dill/dill-0.3.1.1.ebuild
+++ b/dev-python/dill/dill-0.3.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index fbe0d72d4f88..66352c361f19 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,5 +1,3 @@
-DIST discogs-client-2.0.2.tar.gz 25486 BLAKE2B f901628a74b2df091e40eb3e5f5ef8a7300fbb9e372d044580f3b13b524b477e427feaf4cd5287d9782efed82032b93ed9c26071de7ec49e308c7bfdc7aa5e78 SHA512 00634eb95018ccb2ece0adf4b7e3ea96674f0c8dd63d9bd151cdf9c871898fa24379f78065ebb677cc87eaffa31e91ba60051622a38c6bd774e010c20229b16e
 DIST discogs-client-2.2.1.tar.gz 24645 BLAKE2B 310b2a23a58f58c0d258599ad88a8e44202a38850af72ead293bd5ac21a92521ee53cfd6d8340d4c122145b4f3797f905a7f5273c6b0e5e23e8aff43fdf09c85 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5
-EBUILD discogs-client-2.0.2.ebuild 893 BLAKE2B 8ae0b24d694d641135b42402e0c1db38d7df4a1ee612fb84fcb8e38d96a9700b7c72bed6285f3beb0475821e9c7f1487981062159b1b60bda7daaa6604513c74 SHA512 e42dc16a6370028c9f6752099ae708315489c749842ace5ad954e497fddc78d95cc0befb5a957a67e17818181844c352b9b1d3828bc7abfd896048c4621428cf
-EBUILD discogs-client-2.2.1.ebuild 701 BLAKE2B 3c6c28647b460791590f0c3d617da10825059921a4ebdd4245b91f6fb9ac7d6803472ecd5b6bc0f1e90aa978a8dbf2044598c078ac130dcae2d35994c460c39d SHA512 ba9751f8ce85e8baa1812452c935a9cc4a2bf78e50adfb68420d0cc362a74aee1b8040c7f39fed8736180c63f81caf82a517ffe7582346781ba2b78b62ec4379
+EBUILD discogs-client-2.2.1.ebuild 695 BLAKE2B 126dbb98aeb42e55b3abe540ecf8a86143cbdd5fe7955231f84b5bf6735cb4f3ca5a27724dd3adc5683a57b06e561abc3d80dfa6357babe23aed0be79ecd5e15 SHA512 8cf575531692cd5691eaad15d622fb1143468a4ad89c52f01cbb6164cee7c65a2a89c38d39b51a7c117573e55a1d453807dda670631b6138a0b5e1621c07c9bf
 MISC metadata.xml 391 BLAKE2B 49def6f22633b0f670c92c9abead7bd18955527bf30c08443d3fa161ef1e8a9508d540bbdf4fbaa801d6fcad0a1b3b26071c25ad081ad3eb62fcceced57838f0 SHA512 37252a778b2f529b74e72a6f873bb1bb693c339619a7d9c236ad96a8693d9ec04e40299f4be8a03efe48b3f0ea052a676b5508871e3d03c82d2ba814ac325bd9
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
deleted file mode 100644
index dfb505c5d9d8..000000000000
--- a/dev-python/discogs-client/discogs-client-2.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# Not py3 capable due to oauth2 supports py2 pypy only
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/oauth2[${PYTHON_USEDEP}]"
-# It's either this or make a test use flag to add RDEPEND behind it. Both work
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${P/-/_}
-
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
index 96302e4e1c00..4e157ea0bd74 100644
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index e5982cd184f1..f0102db35f8d 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,3 @@
-DIST diskcache-2.8.3.tar.gz 438587 BLAKE2B 3b7b50fe6cabe8a4eb92b3dd72a2b99d6cedc8b7d055fcdf7b445f016957e6c7692571e9f83aafe36141b69a0e93f638b9e3e2f210bb56e6358260a5ff4130d3 SHA512 d96ac76dfb68cb817febd3f4ed8927a8409c02b13b4112a739528cade40f9a588c732dfc3148392dd12676380c3a2b006ee63b86f30ad70f5d205273003bf23d
 DIST diskcache-3.1.0.tar.gz 489821 BLAKE2B 56b54662f31172f4f746ce885d57a3e9f34af9d7318300fe6906aee1b3373919f6ee33922ab30b7979cc6e271f2f780894438b4114483a7c76f198fb7b2213c1 SHA512 30ea3e6c1ed6430c1a7e3bf022bd9233e89a2486308d1f48f6e2f0b50ccc1ee50dade7c55d98a5611ef384bd193cd28f7e65f5737bae00845b17c159177dd345
-EBUILD diskcache-2.8.3.ebuild 853 BLAKE2B 4bd41f836063d77a33c783e63034e43baba46646bcc437b00846cc268595c54c83ba773b2853157f40d83898c820f029fec1f325440727ec2575919a2e3aa762 SHA512 f44d20ab34352813edc20bf8b414fa7599d3c54c877cd2f969fa0e231184b117c0489e578713c6a2bca19aa86635dc2919f90a0ee529a329f787fef250c13bd9
-EBUILD diskcache-3.1.0.ebuild 877 BLAKE2B 77ebf2871569ecf96854b2998a106a6b006feb4d003463aa01ba861004116d7691c7556379414d7d2f28f2efa9770cea54563e82736ad5da4ad5de3a0c159e53 SHA512 b60c5329cb611cb47bc4df264b0a4dd7489c7b2b21690b56b9a8cbbee58be480c74ff221bd2e3fccf97d89e43f8a383d5f9562224874f4a612c26aa65e955203
+EBUILD diskcache-3.1.0.ebuild 867 BLAKE2B 126645358a7cba7d7f39a4023227d16e69195a31eba11a22a3bc99852174bdc76adb2880549195539fd86d3dad86ece3c70778360ea288cd2249fc93cc46646b SHA512 a3f4e361b4157dd01a424ab15440bf1d910ad17c246bff988bf1af7092e47d45d95c38f5cc4dae52de0526382daae6e2f5dca12c8b18723a80b2e715dd87e91d
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-2.8.3.ebuild b/dev-python/diskcache/diskcache-2.8.3.ebuild
deleted file mode 100644
index cec791888f3d..000000000000
--- a/dev-python/diskcache/diskcache-2.8.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests -v || die "failed with ${PYTHON}"
-}
diff --git a/dev-python/diskcache/diskcache-3.1.0.ebuild b/dev-python/diskcache/diskcache-3.1.0.ebuild
index 75f0ba257bfd..9e00a673ba04 100644
--- a/dev-python/diskcache/diskcache-3.1.0.ebuild
+++ b/dev-python/diskcache/diskcache-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
index ade7cba5b273..b07b830bee1a 100644
--- a/dev-python/dissononce/Manifest
+++ b/dev-python/dissononce/Manifest
@@ -1,4 +1,4 @@
 AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
 DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
-EBUILD dissononce-0.34.3.ebuild 943 BLAKE2B 20da615163a935280ee7f28dd3e3cd635a6e6bb4cceb3de253fa5b2ccdcd031fdec03dabdd1ce5cb8bd31944d6a08213e22e3964a0cfedc4ec893d3f4c3016e8 SHA512 a9ffe2865ed25f83cecb2e46818c2bae98276cbeb95bb15cc2ff4a5d49939c58be27904b2cfe8e26295aeb988c74d11b9757f9bcbb17c4c2caf94cafdcf53bcc
+EBUILD dissononce-0.34.3.ebuild 933 BLAKE2B ea9f487a3773a6cf1c3e6719cd39494495e3dc73f9a302ce6a027ba8ce840b503e982d0df0fb0b7b1fc3c42cff1119a92a38a02841987ff2a0a39a53c4b7826b SHA512 c60b99aaef20f603b4090174fee1fb67076769452231e49200cc46a61cd39c9cfb521e462c41bb35efa762479ed669d86ae3fe26d011bdef36dfd8c575365c36
 MISC metadata.xml 659 BLAKE2B 9e628e24c999a14575817d45ba61f5ff0e444c222c67c3204c1c53a7c928e926ebf9e4319c3f450d30686eeb01c1b94adec2008d65e3275df09964a9b281aa16 SHA512 2bba877c4161cb766f935cbfb5b7b421cebca89116e9bee83655ded6bdcb332c719314e0c2c1cae010409e071e511bb1335f5118993b647b1c25a99076f072bd
diff --git a/dev-python/dissononce/dissononce-0.34.3.ebuild b/dev-python/dissononce/dissononce-0.34.3.ebuild
index b57b081af898..ba5c872c5ff7 100644
--- a/dev-python/dissononce/dissononce-0.34.3.ebuild
+++ b/dev-python/dissononce/dissononce-0.34.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index ad07dde1f4b4..d0313e821e05 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,6 +1,6 @@
 AUX distlib-0.2.2-unbundle.patch 1284 BLAKE2B 994f1d3e035273bbeb0f8aec357a7ea62188d515ef7e951b773f8a87aeede8081a6e59928748961ed1e7b569212ab4521dafcf7d7f1fea5d9eec14ba7ebef678 SHA512 90ae9177e09a4ae23a5e1a90e5599602466ede4b9fc2b19024c00a187f7393fc2fb84795bf5bb699bdbe071a97514bf86e8da556c8cacb49db0985f2ed8fe18c
 DIST distlib-0.2.1.zip 542424 BLAKE2B 241b14519499b76beaa8994b30be8b78ea83f3073668174f4e2e02cc9609feb957b3b4fdb59e68943223e6fb8d0251a8bab990396c4e4297c683ab4eda8fbcc9 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77
 DIST distlib-0.2.4.zip 547411 BLAKE2B 763027059faccdcee682d5eddbdeb2c23cfefff178d992db811233b48d7a4d605626f8619d51dacc55ae5a016557e528b0bec0c625258e469f2fd98a9a659c6b SHA512 03f9f9474578226e1a40a85a490aead3ec0509ba444856a263d4f25b3c86b5f919a3e18ff715a3a329d80a3f20a540b8c57a6e3dff55703c9cce730e2d021084
-EBUILD distlib-0.2.1.ebuild 693 BLAKE2B 49cf056a18c327fd9bb1b3aa201ae636838b4fbd2d78d4b25bc459ab05ee1f8348690a6f06093f1dc57cb1db2bca47dced67a87218af90283e09a275cf82eb2d SHA512 598f3cf1ca9da41e1d4515a44fb5923baf54a87495295b4799581ae8b8a7ec3a5c42b45bb23403e766eb5edba7a2bd8f4474b6d34eca04e93691f3d0e4e700f0
+EBUILD distlib-0.2.1.ebuild 694 BLAKE2B 224a20fd0c13729528d01bdc52a7e3205a4f99811d6164485fef08f2e5104eac8fd0c9bc28a8eb735bc8a2cc8e33d258ba1acf689b6d644369c36757d647650c SHA512 cc4a356e2fe36fdd64fab19293a2f5d5f55c6cc436f990bf19bb2a67415a479fae87b076c4db92b8e7c5943bb647af6be758053f9d2aba71bec0dabe9d979f5a
 EBUILD distlib-0.2.4.ebuild 1224 BLAKE2B dd2bafccbb17485855ce00265846064ca92c0a3e62d45e64ae66306c8e6bbd8a37aed379b323f2506fcdbf20b77ae7547d7a31f33e13b59321642afdec74db5e SHA512 6c9e722a154ea2e7034887a4a5286c222d288680f627d10b4db153839c63cc0f02d835b5327d04974a2dc43f14bb439b49f2b8355f0040cd9025e41b7c3886b7
 MISC metadata.xml 426 BLAKE2B 58e513afff4bb2079ab3bf04944f3e0bfda90793443637b200eb3f52758f0ad15c8ef742d70724d368901382af2f6cf6fd4e8367d43f3afc43f9a7fa42bd1480 SHA512 08bab081b7287399834521ed7f3bad016a3c0be3b7b191875e23b4cb0577afc02ae9d553de80552212852ceb473a4ca424efecf226826eea80461a3fb028a36e
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index ee69e966ec25..19cb08865a45 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT="0"
 LICENSE="BSD"
-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=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index aa0d62597ab7..b4925ae1c07f 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.0.4.tar.gz 28772 BLAKE2B 1a337c0a5c125b89adbd3173d17390c5cce12c8549a3e7d90d88fd71f53d1b4c7bc3d1fc87f7bec33d7b4b1311539deaa9414b143daf40108b15dd78370450d8 SHA512 466f2e14b169998e3ff7420e12bf270ad9f934962ae92c2d24bdd747897ad66cb348194dd1376b8b53ed298ea02039943c80d9ccc6b8a01c2bd0c6d2be82c7f6
-EBUILD distro-1.0.4.ebuild 607 BLAKE2B 810cec81b6216ede2d65d0de6eb1bf7368e26f9ec0ab4b3bd1f2cd1bd3bdb70a74d9d4b5c4c96c2f51dfcc2358e48b240cefed7e4507b0d5952e4a44d5f8dd82 SHA512 ff5b0e123e0491e10ab1a1f13e73a182800256cdb29bf9a47f26d1057875dd048b9ed28368f239cbbde8908c40a77e7a1a6fa998dd559522c9c9de0f437be14f
+EBUILD distro-1.0.4.ebuild 614 BLAKE2B e9452cfc996c2ee06443ecffbb7b9036c77123255382eb90256b77933e321b2d81df73d9d760a7a402e6239ede035d0d1af97cc8ab89bf91a61d384fd68493b1 SHA512 a2a9a85cfd49ec8ebb80d783beca5cd191ba371317b5b33eca5ee7c8bacc622c6c352cda90343dc5085a857272474f7fed33d79eed4386801d935c2cae8b1fc3
 MISC metadata.xml 813 BLAKE2B 7ca7237a784e0d321609382bb6427a39584f9ca36047975fc76926628d5b4b5d54543762bcec7a43eacfa91ac056a96d38a0e71a6baed93b18a9849b2563f502 SHA512 2d9fe5a2567f86d987d950a78d68f09ac45b1a50ff02d1f1c2849c381de1a5a2f164fd6850f427650789a0274af974e23c9b8ba7ef3b37c81ad653b3ba85e0b5
diff --git a/dev-python/distro/distro-1.0.4.ebuild b/dev-python/distro/distro-1.0.4.ebuild
index c394b27e61ed..38749a35f0c8 100644
--- a/dev-python/distro/distro-1.0.4.ebuild
+++ b/dev-python/distro/distro-1.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 95e12875859b..17a49246dbfc 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.4.2.tar.gz 4268 BLAKE2B c9abfc50616baf8cff4f12c6ce2c3bc5914be231c67d23ef49c222f162109ae7ad730678c05d9596969d4dabc7d44a80711dc2fbc3e6bd74b99dd699ee554413 SHA512 d18fe4e0cd4073689759c302c22e0f128d4ed1103af99a1db4dbe645fdea601837131a3f8d215143dabda64903aaeeb4706bd2082810f904cc8e74b564c5f2e3
-EBUILD dj-database-url-0.4.2.ebuild 649 BLAKE2B 6a3da13e21a16eaa7fa3e127baae1c707321b39ce90070d160597c2f0da0c297848be757702e52ac8c94610f14ba43ef1cd01f4712d363aae9a344695d2c1abd SHA512 b37c3290603413b52b466e1bfa4033c7faaaaeb23acd9f66a922c646a0baeecf99be01172f85a64a96cd520cd63437138e18b775cdd0b9f7481238bd7672b476
+EBUILD dj-database-url-0.4.2.ebuild 639 BLAKE2B 6c92d395ad4b0af5ef65fad316125fbc2b36b7aef23edc25871b5eb93d61af3de18ac02c2f9d9fdb71855e3ac7734c5088011cf1d6ff80a1e9c89ad0cf04f7f3 SHA512 b33cd0de9e0148062caa25bacf0a63b85ebd22502d9fca01439a34bfa3be796d7b550437f112f8ccdb631c8a731322d80138a8423ae829c0eb7b555f8c1d3d01
 MISC metadata.xml 398 BLAKE2B 29d967c2376c10347e128d1e7cad28c9a8346b7ec4a1d616a121b676fd3d56b4c0a1b4bf890bfed47b3fb244d9fa0ae01bc28d8b4066fd9289c72a436db4f647 SHA512 c89283a38f9c6f8ac3cae38a7defbdfb1c5b9dc06f31ed8073fb12d879828976a57d4019a6bba5e7af74a19e9088ced1ca03e585d52c45cca67caac2839b64af
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
index 29dce45dca26..51e9570b34dd 100644
--- a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index 128a870617a7..07d45b2f3e55 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1,4 +1,4 @@
 AUX docs.patch 713 BLAKE2B dabe5ab114ea18911e9f7de38040348405116486bcb0cb0eeca8d2dcfd4becbdc99ce3a306338b03987064a53adec5fa7acc310f81de8e76d68582d91148d335 SHA512 af930dfca53b0353c7d0af3671a924174b5c2d6dbf3da299a77dfd603e2a510724024e2d6b1d51cb2ad6d7edff3f1bef0813b7f12af1d7628f022e3ee4667996
 DIST django-appconf-1.0.1.tar.gz 16743 BLAKE2B 0f40d2bac6ca596c83dd67b1109c0a298d845a8091565aceb57230132004f634e9227aeaf07766a3e690feae9833ec1395bc6f409f4412648d8e7df4c2533ba1 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d
-EBUILD django-appconf-1.0.1.ebuild 916 BLAKE2B 1480aa4a227e42b58a2c6d936cd4231630d3833fa1bb0f59e5cf5684bf1d237f228085724934d77ec051cacf95ddcf88394d112ba75e99109909b000e6fd4eb3 SHA512 85608df8b954e3bdd24d440a5bf10fcc91d80a285a185796ba90506301cf85f2ff4318ae7e2c418f686f45fdfb2f8eee05a1905962f20c65c2dc63ad9fd0af05
+EBUILD django-appconf-1.0.1.ebuild 910 BLAKE2B c9d0443bf4f5625f3ccf5b6b62c628281b692abecf3d127da1f8432021c2c48e670853f9c8763560d57f57789287a49f4c9bc380f08420a8f82a8e0718c41b23 SHA512 4ad8f2b2fbb31dc47bae6b0cbf45c7abad6676408205fe9924f62f483541efe5d11d57227b58e917e2d0e55e621fbe5371ae09f07bf458f61aa37864c095e619
 MISC metadata.xml 390 BLAKE2B 86804c4033e0cc6649e2d0734283205ec8390f6d2067b51945944c0bcc30744ce45d8ce9ec229e007901ad9e01ba874cdac2ac7c62d176cc10850c243bb694db SHA512 2fe634938c78aa61b5d8f2bbe6e5ef4144a5d15c3e7c91691048427fa604cfe7229b924a0196d5d95488ffaea568a4a4c218056ebd010a36ee2f6b339785c66f
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
index 65a8953807e6..03ff2037c41d 100644
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 06ae0ce53e49..cfa0beb8cf03 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,8 +1,5 @@
-AUX docs.patch 697 BLAKE2B 049d893d773ca447315ca5aebec808e6933dc39cc6ebb40b06291e5f80d1c7292fc7565e4ed66264eab29d36dc0b610cd6f2864d040c641d82bc921dbc8640c3 SHA512 e9f0607d6f770d451c53e851d6141cd0cdd63ee59e654eab0c3454b9f724f36086115760614470dd42e8f8afc63b018bd695cd596d2ac71530e4a5eaab379779
-DIST django-auth-ldap-1.2.2.tar.gz 131086 BLAKE2B 78f93eb24620907f5b5671972e2b80ec6e59cdc42a455c298bef4c3215616228735a0647b0646b683357bc16ea6d03488aa86626e2ad51211a382ee2d0482909 SHA512 676d1114faeb9a2956ed51c586afea7618c1bf62867d3525596599391f8327b8f22a075c4203311df88279c317ca37b9097b59e55a64330afee6eb1c5a9c9ac3
-DIST django-auth-ldap-1.2.7.tar.gz 131431 BLAKE2B 03fac590118d25ad0d9d8a3ac5dd8bb24f138f193bf27ae85d4e2776be79bb31ca7efb278fd05ca1d45976116ca7ec79ec3b510ca380dd8912ce47f1522ad348 SHA512 2ca29bdceb4b2540f7c90c9dfdfd7a02f91e72cd44ae062cebff84199dab737ee69ada56269189ec0dd70ee7916c3373acba50866280ad080c4c68dd69dffb09
 DIST django-auth-ldap-1.7.0.tar.gz 48897 BLAKE2B b4b196e4cd0882a48d2437326cda57394963fa44a64a3cf5a0ff668bb86243da3979e2746e096a458a5bf1d3c8be687f3d3fe456f5a6b0ada11ebd1f4787e323 SHA512 6478b2ef43e6f49acff3dd2e3a2a462ae02a3f1475d5615ba2f14bfd5efe2b232a3d2008902177d90822fea6b096a05814a5f028f4eec5ee09c5e5a62793e73d
-EBUILD django-auth-ldap-1.2.2.ebuild 1114 BLAKE2B 5a72f990c54db6b1cf3249c633f5a7aff2c10d07ffa025268a3eb98e2553acb3705bcb24b4a8daafe72d94974735e81bf48fb4ed8f51f28781e9e62376858667 SHA512 0eb83d088c1f1d4f8b1f2a6464d6210f066cce86a90751d545c484004f4737ddc48614a5f351d8f514879d336a4a6377d9f10f6d6b767a4eb40a38d8e26b68a8
-EBUILD django-auth-ldap-1.2.7.ebuild 1072 BLAKE2B 02b45c58db352358a09e3485709942a8b84440bfb06f7916a29f5157c1542c7165e1fcd3184f14a612789b6145ecf19b04dab160056664dd9d9afdbb6cfb40c2 SHA512 8420ffc74950507c5d6a17a68eead4a994f9789969e85c106ff730cc99ae7ffeec463f51eab5c4953e5497596a912a725fdcab1ae3fe8330ac35b2d624bb9114
-EBUILD django-auth-ldap-1.7.0.ebuild 815 BLAKE2B 7a714432e75e8d53a833064039be4334eb77d7c15a9075cf66ae35258ac69d32228296d021a783b4e8dabbe910b0f045745ae9ae32907c7319908649077916e5 SHA512 9597294aca51a9f1c2187c6f0e88735de38122e02724959559ddc15d53524481d88cbf24ef0cc2a1bb3c55017c2ad65d25d81ea7d77e3bf0e8014cb3c556af4a
+DIST django-auth-ldap-2.1.0.tar.gz 51027 BLAKE2B 1229d184746cf05f9c7ddb9e6674b2c529a0fc6d051f78ba01de6a80b0e5e408a8da10e35087efad60f1fef90be708e8a0c05b04c4408500329d9dfb567c0f8b SHA512 4c204eee856e33fae80a22a80bd0f3a21d1f2ee33b1ad56087832f89e91d7e1441579cf77541c1c35e8e0532d4da937b736fe3b4708d7c2d7bbccacbb0b24061
+EBUILD django-auth-ldap-1.7.0.ebuild 805 BLAKE2B 31db6a058fe57553674e8280000f73f98a6e7cb097a780d7ced7d51a718be5c9579c9200a36e1aafbf89c851c49669f36e2f6eae09ed3c37db495810bf4c117a SHA512 fa134060ed1eb3ac903fcfd819461a14d5061eb74c58a406daf5d3b4d22c58b231ef561f88664f4fbef811be5de3d1be3d42e49181927b87c6c7432a898525c4
+EBUILD django-auth-ldap-2.1.0.ebuild 815 BLAKE2B 910123666df462c14ff541c68a6acc5cdd7a14d591c49dfcdd0e1f49f10af2e17731c5740c74789893efb6ac884e5991514a5d61adfc40c829861a1231f0643c SHA512 8c84ad3dce69989e4241b1201409c99dca497ade0df83f98aefdadcf342e41c446b8682f40296cb0b9b500260df6ac6986cee7c8f44f09d9222f0e02bccbb528
 MISC metadata.xml 398 BLAKE2B 89e1948a1d118a27477e02fc01d630aaf7c9199cd913a08efc5510fec05996e1aef84fbac359d09ef73a5de083b1920747928c3626afe7aa9c1c9dfa720f16c1 SHA512 e3350f6ab3d2c07965eb2c6ba1d82a929bea8e9974d8a2cdc12acde88aab50f2c20105e90e847a23e5dea5f97a7ab6a7a0c9eb75e193eb90ea5453c53eb36d41
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
deleted file mode 100644
index e75848f809c8..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
-DEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-#S="${WORKDIR}"/psagers-${PN}-80379ce59e6b
-
-PATCHES=( "${FILESDIR}"/docs.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
index c87198ee39f6..9fa4f75ce881 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-2.1.0.ebuild
index db72fc552b7f..2dcefcb72c1b 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-2.1.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-# Although setup.py claims to support py3, python-ldap does not
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -12,30 +11,21 @@ HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psage
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]
+		>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
 DEPEND="app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/mockldap-0.2[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/docs.patch )
-
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
-python_test() {
-	PYTHONPATH=. "${PYTHON}" test/manage.py test || die
-}
-
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/django-auth-ldap/files/docs.patch b/dev-python/django-auth-ldap/files/docs.patch
deleted file mode 100644
index c4e918fac538..000000000000
--- a/dev-python/django-auth-ldap/files/docs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid unwanted d'loading for un-needed ojects.inv files
-diff -ur django-auth-ldap-1.1.4.orig/docs/source/conf.py django-auth-ldap-1.1.4/docs/source/conf.py
---- docs/source/conf.py	2013-03-10 06:01:09.000000000 +0800
-+++ docs/source/conf.py	2013-05-18 23:14:35.761187583 +0800
-@@ -29,13 +29,6 @@
-     'daldocs',
- ]
- 
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/', None),
--    'django': ('https://docs.djangoproject.com/en/dev/',
--               'https://docs.djangoproject.com/en/dev/_objects/'),
--    'pythonldap': ('http://python-ldap.org/doc/html/', None),
--}
--
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['../_templates']
- 
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index 5c9b8f29033d..4da7257e02f9 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,5 @@
 DIST django-cacheops-4.1.tar.gz 53766 BLAKE2B f74fa8b93700fa930f31e8db83b161c48eb520894d3e2072bf50ca4e18b20a8563438ac95ef5920a1371b3215a0d3b7c2a216a9d1f040cc51f4d468da438a966 SHA512 ea66f0744d9b0e3b03e92ee7083c17150c050a992e25159c50f766898d7ab9e2bcb0432db135abcc2dac0358aaaa7d2e86a8216ddf9afcdbb6c7400c3844ac02
-EBUILD django-cacheops-4.1.ebuild 606 BLAKE2B d07928e7e232983adf99c66eeb10f35dcbd9587dfff9cb3adb1324cc6aa0f97339e400050f4d2c3ce67bf7c5b5540f623ed8d27a1a33faf598bbc1df31412039 SHA512 2bdfb8cdfb35e739e5c254db92c1e52350bd4585260b5e4b6ea1704a068526337bb9f4c5373a418812146b19adc9e4c84f91582c41875dfa1db5d50b46cb3136
+DIST django-cacheops-4.2.tar.gz 50240 BLAKE2B 87ef35097f3c521ac21e614adf3b05d871b562d2a463921ba70ce3f7f4a4f7c1b6966e27077dd95016f10649cc1127fe1f7f65bd6353f86cc4395c59d20ea60e SHA512 8caa9b9ffed45bbc6039cb14ce311f714160aca2111408ae1505bbd78d0b8b4057e9414994bd0d0c1334392e83b4c27ca59e0ac1db01e3a56c409f2806bdaa27
+EBUILD django-cacheops-4.1.ebuild 596 BLAKE2B 528049d2ac291f7c54065d13be5883bcee68a9eb5cf029c6ec29c314a56a68583537cd08fd5d9c9290636890f2cadb84535a2636a65fc8c7e1ee9840550bf7be SHA512 1ae9a31a98cc6f6f94e85608390c08635b46a37a0ab2fe71d2222d70f2913c8c792a662764007d55e856be0d30d56b1a73005c79af5329948f971cf7ff1c4e36
+EBUILD django-cacheops-4.2.ebuild 606 BLAKE2B 0ddf1f450d4e823ffce04b5975c20790572aaa92e3ae1c21250f60dbffe703b830d7d7377478fdd137460512a7f15565a3502c7c7e029050771922aa2a935efb SHA512 ab3adfce784e67899b00dd4d18b2da2ab8a99bb36325aad03fcb8aa2ef8274a657cf7d68c3d19e8ee2356fc72d0c241c6c550c74a5fd7f0929c7447b50747a39
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/django-cacheops/django-cacheops-4.1.ebuild b/dev-python/django-cacheops/django-cacheops-4.1.ebuild
index af2b57419842..b3307f6ba059 100644
--- a/dev-python/django-cacheops/django-cacheops-4.1.ebuild
+++ b/dev-python/django-cacheops/django-cacheops-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
diff --git a/dev-python/django-cacheops/django-cacheops-4.2.ebuild b/dev-python/django-cacheops/django-cacheops-4.2.ebuild
new file mode 100644
index 000000000000..d2ceef319c8c
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-4.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="https://github.com/Suor/django-cacheops"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index b74511ca9299..adf615009995 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,7 @@
 DIST django-cors-headers-2.5.1.tar.gz 21976 BLAKE2B 554b6c6ed737d8bfe34f3c87f67cf48a5bb5b838c3054d908ceae5c8716a51a69e55b82e9dff8bdf186f23bb24ed32ab4e7f898b23f27a132330cae5323ccd86 SHA512 b321edfd69103e3389acdd3a552e9a36c8c5eb78be01230c5389716d2d2fc81c7cf64003b6ba3e6f46bed5f6d6b8b68b1dfa923a9e8f98c7261412e17f7854a8
 DIST django-cors-headers-3.0.2.tar.gz 24497 BLAKE2B 06cf666981542607a538550b2429cad7eb2ebe58bcb0eb3e0f4a6b59f17a91b3caff9123ab3c9b133814f8ee6cfa2ac7352f424eb8a676567fa1775fae708185 SHA512 fffe3be64ba095357dcd4e370a3aabbb848be5f886cd2beee8558d3f5f9aa849dacb2f40e0159013fa050eac42d04764e35893ff983a476b20783e3d8083e720
+DIST django-cors-headers-3.2.1.tar.gz 26261 BLAKE2B fcab223308223af20754275256e9c03f2dc99210b05d200fcfa0f0e4583c7f8a098ec66a3a40d771aa94221d9d21d2bb0c673f4722b72f598b95f31420fa7526 SHA512 9b48820fed88a468ea51db9ed7a8506afe96ebefcde3c1e2fc497a6580aa506669bec7bbdc87957e9d9e8b711445a7d1359a213a6a15dfcb7313d1437e252397
 EBUILD django-cors-headers-2.5.1.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
 EBUILD django-cors-headers-3.0.2.ebuild 522 BLAKE2B 088eed6a914b5e089672bf1155931826ed11826d7d2b3067a7211655a185e2ea2e5ec31f7c8c6c976a5461382ef2ecc605e776a8ccde614aa27b3a75be3e959c SHA512 09b08776fd0930dc39e01e9ab2bac4b6908efddde98ab5b8c0f3187a86b83b1ecd388cd436a55e74a58bfc7c4d68989ca2951dc52f37fbbccd85de37492801b8
+EBUILD django-cors-headers-3.2.1.ebuild 532 BLAKE2B 1c0500f998d293a52dce023131510f792b18b2688c8b94280d73d90ac9842e28cf557efd5bde6a1e560bd8037816d08a5a35e86d0b8d9681216e2b644bf0940b SHA512 02ebbf2b2639ae5f353557572986d2e77dc23b46878bf9b48bfccabd993d69628ddc55b4c7612fe0e2e2f6cea8a0f6ecafd97c21f1e885492d07f7ef1ff650e2
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild
new file mode 100644
index 000000000000..77307b63a59f
--- /dev/null
+++ b/dev-python/django-cors-headers/django-cors-headers-3.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
+HOMEPAGE="https://github.com/ottoyiu/django-cors-headers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index f40ecaa3c821..dcef6b86640c 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,7 +1,5 @@
-DIST django-debug-toolbar-1.11.tar.gz 321727 BLAKE2B 89eab65bc0306da9fd81affbffc312eb99d04f19c66d9e5c6016df323a987e1b3fe1d177d409d68548aede869ed6d3e71adb5f4f4e5cb85a9ab431eca5664033 SHA512 8085b02fc25571e7b3bff02ff2bda8bec81a6000c6ed9e2aea10ec45eb1a3e5adf2ee95fcfbb0a11660fd716ebf2e35a9bdefbaf767b4afc732368a197857e62
-DIST django-debug-toolbar-1.5.tar.gz 315928 BLAKE2B 8dde3c655baa6bd5f3b5d3ae0ba57b8c5746fc41bcfae9f506ad5c49ff64cdb51f0b9d67ee42695f884493cf21bd76fdcf943d88d97641b5d804d54c59163562 SHA512 9a421b80016bdaee8dd3ba2a9b7c3b788b54a4f464cdd5697e36536268e4d3d926bf77088a715e87f192dc8a20a100d8adac68c9c26a1191a5343e377240bf64
 DIST django-debug-toolbar-2.0.tar.gz 321249 BLAKE2B cd4f9e7d55deaf404369ba89eaffe0c730a058450c8368e39bfe3f5562019f5978ff33b93dc0463dc0fa6e6ba1047335d45997929dc3d2b576a78ff7cd5f75f0 SHA512 8440705a2e38f2c035a1dde4eb14ec829ead502cbbebcae46889e26877c0843389107bf14249afe9742638c4880b362fd699aed935e271bc1ade8f0a54bfea46
-EBUILD django-debug-toolbar-1.11.ebuild 1297 BLAKE2B 5aedb07036e862da7777f4ca3c7b517b6d2bcc86e410022dcf820a836fe9aa789c1c421435bb68cf156c6fd142cee0138d985cd4cfafcc73f2f7a0fd93a7fbce SHA512 0eae2860812de37dfd53874c046d61e9969530b77e5c71999f79630020467b7a9cd9284250d26994f192c996329c48a3ab0c5f1a114f2cfd5df9c5c1b3974e6c
-EBUILD django-debug-toolbar-1.5.ebuild 1304 BLAKE2B 42efdfeba090354dd1c38bbf97c53b89f33a4ad3739b552c3a4cffd745af91363d11813e5580ee197c808f0dc10c67d2ee592f9a6d9444b03ecd679eaa85fcf5 SHA512 90c1f39abf55da49a859e9aa14a8fede8ba89ba20e03844ec4a8490d7ccf3d3c6e68ea78fd25fa4b9fa36ac5886880c9cdafb6b555ad39a52ff6d7d560bee0f4
+DIST django-debug-toolbar-2.1.tar.gz 321132 BLAKE2B 4765a25bd7aa2578c65cd0918bf47de047e131deb896cdd7b80111e9628e4f7c39ad6dc84fc4114310fb1a8195fea263810b279e8b19b6e621879b8eb2961f82 SHA512 3cfd11b28ec6573977a0476388e8f4d63441c5b390fe974294bc059a83fc95a44c3c8df18a549403756f7929181750aec51d70b38cfe3bce1d40ba24e6b72e9d
 EBUILD django-debug-toolbar-2.0.ebuild 1297 BLAKE2B 5aedb07036e862da7777f4ca3c7b517b6d2bcc86e410022dcf820a836fe9aa789c1c421435bb68cf156c6fd142cee0138d985cd4cfafcc73f2f7a0fd93a7fbce SHA512 0eae2860812de37dfd53874c046d61e9969530b77e5c71999f79630020467b7a9cd9284250d26994f192c996329c48a3ab0c5f1a114f2cfd5df9c5c1b3974e6c
+EBUILD django-debug-toolbar-2.1.ebuild 1307 BLAKE2B de77e8a50b2118806dc6eea1b0736cff6bdadd37fa21e806e4885c651e2547176561c33295c06dfc84443ae63a44808ac6580b369f707cef620087297106859b SHA512 b01dc0e2a605148149cee3137b72d5567b8af6560a21c67fe6a2ff3b1268859f76c751d0fd082874e400a0dabd65bc277f7af63ee43a6cbbd6fbcb23f7782232
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
deleted file mode 100644
index e0cda67f0415..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# Prevent non essential d'loading by intersphinx
-	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-
-	# This prevents distutils from installing 'tests' package, rm magic no more needed
-	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-2.1.ebuild
index 4de469ee23f2..353fa1f7bd7a 100644
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-1.11.ebuild
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index fc624239b2eb..6b33f74b371b 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,5 @@
 DIST django-filter-2.1.0.tar.gz 142256 BLAKE2B 0763c3032cdd857be30050caa27af6bd938030c37cc52f30c98ab751c81dc8b2ce0c974ed19ae8c859347fbec2139b27a08657e99c83bc8e79b8883196050897 SHA512 e917ec0fb1cdb8f19e6a7e50989d2df3697baa0bb50eaa62f5916cc0fe000e1e3594672a312114ab761d49b9f83bf7f5c1f4a35f4014c113ac9387a9bf086e10
+DIST django-filter-2.2.0.tar.gz 142804 BLAKE2B f2385fe3afa78349395bd3334461ad2acc760a2007d4b69618993e176899c77e8585d90bb68578e561a16459cdf35a480adf0a0e6235d6500e5f2c2a7c602445 SHA512 16a4336d1558cabfe497dd9736a2f652c9f9d141a72c856cf13f3ca56db4da85b5926b05c772aef5fa43a75e085025244b8deaf7facbc5bfa68907bd99f4f95d
 EBUILD django-filter-2.1.0.ebuild 526 BLAKE2B 4e0985fc759b077956427b919d99ffea3b0b11b758ac932fd348c07bc7b22576d496e8dbdc74153205b665d160fe66801ba1115ba79a70c2ae2368dd3827c79f SHA512 3c9ddc959d9ec17fbf180868f69aa1f4d1f0d8e1e439ab9b5701d0093f43fe24d3e8a689733a744606b8b30ac6088cbb9b58fa75d992aeb8aacf4289f26260f0
+EBUILD django-filter-2.2.0.ebuild 532 BLAKE2B 57092f1f286da60aee1064ded293ebb581f741bed6bef94a78eb687d0b8e4161d5422f4d060cc28b2698db9664abcfb47ec2981899cc2d7d22fd1ee73a233b35 SHA512 21ffbd3d1c390b2fbb8304253d51fa3b39f664b782d86789063973102555ddfb5e4291e0743cb955d1a93e54c839d41065854b97317d9b5ee728204e9d2171c4
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-filter/django-filter-2.2.0.ebuild b/dev-python/django-filter/django-filter-2.2.0.ebuild
new file mode 100644
index 000000000000..bec056b673e0
--- /dev/null
+++ b/dev-python/django-filter/django-filter-2.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="https://github.com/carltongibson/django-filter"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index dccfe247f2a7..be56da0365f6 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.9.1.tar.gz 95615 BLAKE2B 980bd2165a66da0af8e5cb877e42cb9e7deaf7c2bfc09ff0125753127a07f4bd546ba98e10831878fb9c5fd254bb95d5e2be0c2d574d35f4eb06fa6d4f9db74b SHA512 54e0d36fe4893846491cc253d9010024b53eff4c6570e77cde33257844dba36406ad56f4dc13a586806abbc4e53d4864101002227d5c5819c72926b45100914d
-EBUILD django-mptt-0.9.1.ebuild 561 BLAKE2B 4019b54e38fda09487ee155d7749c9711bcbdd9df27313379dd5b07877cb98599f7b214972145b69a4b4016e476b2a80215f8cf5d6ce868bbc53e05bbc0baf32 SHA512 7dd7055b9a3260f9a99a3e7d74059f1b117c4651a681073673120eaf6ec902362c0746e59f4890e3c4ef4172e23014b3dd26877190d8554f0c4593495d98bb42
+EBUILD django-mptt-0.9.1.ebuild 571 BLAKE2B 02497a56e117f408ae6f6d1d5165170db113f99d452dc8fb47cf5c8b29f11e5da7e4dd78854dd7c3ca55c67e19067ef3ee50a8c02b07a5c8cd740db6831c3621 SHA512 dfc624a9c18060ba55fd3f2f26fdbda82c2b1a8b92982a3fb2de758deabe4720f9262c4edc44bac9f4f7f935e9c53c9dc1c9cfc3718192f0b860b6f4409a60da
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-mptt/django-mptt-0.9.1.ebuild b/dev-python/django-mptt/django-mptt-0.9.1.ebuild
index 05f63059c92b..5267efd2f584 100644
--- a/dev-python/django-mptt/django-mptt-0.9.1.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="utilities for modified preorder tree traversal and trees of model instances"
diff --git a/dev-python/django-nose/Manifest b/dev-python/django-nose/Manifest
index 40f9368b9467..3f6d24dba6a4 100644
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@@ -1,3 +1,3 @@
 DIST django-nose-1.4.4.tar.gz 44266 BLAKE2B 0c2785c98350b55df332eabb534ef3a614d961fffd8f44dd9e74c55a55e298b16c4963bfb389945fe76dc7ecb1e344104a8fe4afa35219ba748a8c7aadb97dc7 SHA512 b69af1e8539f7d792e6c9ef002cbeeee95bd144148d55850a49e2759784b68ce07e19587365beb06cc138136498c0e952f7b16067567a5a2eaa31e9f4d47b8da
-EBUILD django-nose-1.4.4.ebuild 744 BLAKE2B 189587d072af5b7d82ba3c310d07caec4a53778ffe68edd27bea5c55d3096e243fefb3d8c6f0c3cf0e584c31ca6cc311f4534e929c6708e518f7363920d78e4f SHA512 cfe92f9deef96d99830e9d0c17a07217ba100b9a6a6ff9adeabe0e809ae997b7a707bd5187f8c0af67853d92ec5e14921658a5a8991201830553881624b6615d
+EBUILD django-nose-1.4.4.ebuild 738 BLAKE2B 66ddc9d726a55fb1c8a2508eeabf5edbdffcbf345b0343d10f48f6ecfcec60017cf3110d17a9c3482a4975f6e0afb533a5787e9557d186005ea82265ee6f58c5 SHA512 3e7fe0cef2c528645b41ecf4dcee2d8309df609e40e6ff77d3c69a8d7bb2e0f96a333a8d58404c1315d6b5356fb1f9ef4bd5e7744ca5608c833d09da76527d5d
 MISC metadata.xml 385 BLAKE2B 776c504bb1b47f0bf19fa7e138b0ebdab5b8007e151e43d317d66f4cc9f3e5c273b710efd02edb57a923a37a1ce898a65b45d81232a4badb3b2da6ef7f77536b SHA512 39479b284469c8d29f60d39a8900ac5894c207706c4f141c565a52694b0fbf69b08ac77ca0dae44ec724e0548fee5a160a5d194033f06a53dea867787160a126
diff --git a/dev-python/django-nose/django-nose-1.4.4.ebuild b/dev-python/django-nose/django-nose-1.4.4.ebuild
index 63446e95b0b9..cac648de9f1f 100644
--- a/dev-python/django-nose/django-nose-1.4.4.ebuild
+++ b/dev-python/django-nose/django-nose-1.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 32597ea027f0..24b0da60a40c 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,5 @@
 DIST django-prometheus-1.0.15.tar.gz 13708 BLAKE2B 64d72224da9cb481108ad17ed1409d97108353a39894f824428743f3ee894292352de4d4beebf1984294e34cea7b6d0144c5066d0fe5cca7d9c682f9410355d3 SHA512 48794f6d07ebdd3487060e62e808a66a97630045433dd91a27f1095f79a72197124c44c5d178c89785b8d048e8e828f84804c789cb5c2f0a053cf18864cde6eb
-EBUILD django-prometheus-1.0.15.ebuild 478 BLAKE2B 5b17706f111c72c0417b2cf795f77a6ef34366fb349a2e668ebc921c25ae582884fd09d8e3f23713d1d67f087bda1576992288c6078ce1bef48477c9be6ac9c9 SHA512 8ea8adc6f8e1b2f950c7feb220c44493640fc5048b20c7ca52718fb54059ced42a383249963746b4d5222593a74d97e5841f1da383f5f3274d2eb7a5563b51b7
+DIST django-prometheus-1.1.0.tar.gz 18237 BLAKE2B 9b32e95750b57122a42d2e0b7f257407885a08db446e013933d2e81a525bf99f872f82c7f081f4c8c3c18f899c48ffa947ac8a89b751babaa8a8348f3f50b757 SHA512 9fa8c0175d1f8f714954f1c16715007e5c074568cc703d57e62f24686db1e16c40fc02244c4f9721995636723d90435bb3b2348282530d969b543bce39e65774
+EBUILD django-prometheus-1.0.15.ebuild 468 BLAKE2B db92e6d169ddbe99cb07d1ca014b8aa3b5e8c9c60abc3c6584a2176afa43cf73cae9732f4f21d73cbc70bb75b09eb6a8a8440a0becbf679d801790de44ede542 SHA512 3aa1c7b0bfaf09190c7af56337f44e77dd4ff605da3755c8fc6fad1736b859edb3fb6fde70467c707ddbf9aee7183ad75e4c1b4963742347904a5a9c7c389298
+EBUILD django-prometheus-1.1.0.ebuild 475 BLAKE2B 946e1559974b1f8059136c93413d40bc6f1bce2d00b64eb8217ae6331437130f1c77f8eb6977594c6a5db3e225f643d9612fa86a1b3bcd7e93eb3b50f2234e08 SHA512 1b1f86d553af8e87344fae0cf837a3b702609a0539588f47161a798f5d7d36abffaa5c09c1fc3b4b48629bc0987b3827b7ebacbdc55523d7214217c901b75494
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild b/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
index fe4f69261888..9475961ac431 100644
--- a/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
+++ b/dev-python/django-prometheus/django-prometheus-1.0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Library to export django metrics for prometheus"
diff --git a/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild b/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild
new file mode 100644
index 000000000000..7ad6293b28e2
--- /dev/null
+++ b/dev-python/django-prometheus/django-prometheus-1.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Library to export django metrics for prometheus"
+HOMEPAGE="https://github.com/korfuri/django-prometheus"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/prometheus_client-0.7[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 3ffe248cc915..c212b2f263ea 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -1,5 +1,7 @@
 DIST django-rq-1.3.1.tar.gz 37462 BLAKE2B 17c3eb4527315c7d562586b5d62ac1866d4e1de755a61f6d882007139494921efc689b3c649f0647ceb2b29d6b0914159c5247af33cc6c21ac6108beef7c40dd SHA512 7e8443889fb7f7e8059f81fc8e7cd319e5a8b54c0388130190a39cc167bcd2e85b761f7f3703a3cd37e5be245cbc788d98a121d048837dc77072c8713c332577
 DIST django-rq-2.1.0.tar.gz 38237 BLAKE2B d99a25655ab0f2ceb08f433b86e84f54f76bc6a93482655f117dced1f8242fb527acb8cfc598fadd282f932f9b7f02b780ef925dcbc8ee7778594a95d73e8ad2 SHA512 4bc59ed32176a121debcbc259386bd406ae141ad859b52ea779e7ee8c8b1d2634a1afc31b666e55bc8a70c841ce7aac81ba0e7f4207e925587cbf3817d9da666
+DIST django-rq-2.2.0.tar.gz 39758 BLAKE2B 3f6b3b990539eb2f8379e054b64202c142372563ba1ffd155d14c700b58b1c0b2aea6af1818ef377e26a27e3a4bf9519d1234fe61605ae1bfdebf7065f1cdad0 SHA512 cfa987b1cb08e09552a27d0997a8fcefcc60247115243a47ce30c561b5cbdacb45d702c8e5994a22ec6e812e66378d9a298dacdeb48e85163ae26798e47b98f6
 EBUILD django-rq-1.3.1.ebuild 536 BLAKE2B a2a8ccdab041255c32a5f4d80cc9995c66b4ccaba6e9190c30dec396d3b2ca676f88979da668ffa8b446f80203ba9be56ef1e4e4178411182d6ea3158da093ad SHA512 00db47fa7a946eb892ac85979f2660077687227b7a679fc33ea6845e8b759d5b936adabf3c47af729d815f2db07359762399a0243f1590df423626cd620d9188
 EBUILD django-rq-2.1.0.ebuild 535 BLAKE2B 14ff7dabf3f073db79935ad0d28145e17ab87359c1148ef2183b0ca71822ff883d72eaef2523669046d5943a7b128221771b7d3d1fa212a0eb65743324ce38aa SHA512 3356508a3e65e49a94ddeeddac2b4d0c57b4a4685e47d569eadb47e1f0faae8cd3b97884542c9e32170ca6780c4c7c8b34c404b0e24aff1025ad4ba71de49458
+EBUILD django-rq-2.2.0.ebuild 543 BLAKE2B bb51d65aedd950f2000425d1299157e0de69552dda88d189b7a00f0bbd711ecea878519b4899328f6c1ebca01472910b7b384812ed7c390cda20b838e578188b SHA512 0e5677d33d4e1495d87bd763f5af83f2ad84da0abf81cd6026586798e417cd21689c4a09be638ba87a5ba2e27c7d275dcb6563c8395eac90a5ab6b48710fb1ec
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-rq/django-rq-2.2.0.ebuild b/dev-python/django-rq/django-rq-2.2.0.ebuild
new file mode 100644
index 000000000000..73efbd048895
--- /dev/null
+++ b/dev-python/django-rq/django-rq-2.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
+HOMEPAGE="https://github.com/rq/django-rq"
+SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/django-2.0[${PYTHON_USEDEP}]
+	>=dev-python/rq-1.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/django-setuptest/Manifest b/dev-python/django-setuptest/Manifest
index 407c83da5854..fccb766bed1e 100644
--- a/dev-python/django-setuptest/Manifest
+++ b/dev-python/django-setuptest/Manifest
@@ -1,3 +1,3 @@
 DIST django-setuptest-0.2.1.tar.gz 7131 BLAKE2B 5afd3106c9f02da2b8d63a21e90c68db97a38f67ca36feafa6e798f9f3106f81cedc94a3155d777f78f43e549fb5656245518d5a812fb30513c59cb24d8da98b SHA512 de0ba14ca451974ffa10b2fe822e6a7a927f2009dd1cc345abd6d4b192a5d9dbd1c9034463cbfbc8b5b66ab35d694282513a33dc55e8c1b0385fa32619c3f31d
-EBUILD django-setuptest-0.2.1.ebuild 636 BLAKE2B ebbe897a3e69efee7c5020bd3b5971a95af7484375446c0a84b8e02e9a7d4bfe0f06a1e9133cc3a679b5432d2ebeaf1d5ffbe3e5016c9c63c7b6bf3b39967666 SHA512 c0336ce1dae66904deb887546dc1e86fc08947a8c6037897c4f242b09ab166db647364da5436b8afe3e548fd6a6d93570412a656a7e4972b214af654c94caced
+EBUILD django-setuptest-0.2.1.ebuild 630 BLAKE2B 1314558487b536a4efb5f318efb6f9014cb196000a8a889f9032fbb77c8dbb6014801e474fbb3db0014ecf6b4d39afa1cf383bc5e2d9fc0b03988703dc87dec7 SHA512 0d32a52873eb51c7c7f507c1504f9b052b40a89d353b448d5a1028828b99eaedca80c75727917c525669fc0057df69b49300d11e00f7a4c4c602fffc277c1a1a
 MISC metadata.xml 340 BLAKE2B 77a7f56243e6f2266bb49641cfff0dd28418e4b9c9d9f89dd1e20bfdb9e3ada356288f2ff2d18b925a42701f4d0f77d7773eef117b1ef88e59d4b13341c698af SHA512 8c5b08f7e63678f303781866e98bc65821f09f296810a1b3ee891adf7c3a6cbca4202a85b0f28490cb79f17e7e452cd977a874187d9f18bc6ce341d5819a1fde
diff --git a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
index a65802b12fd2..7505f891152e 100644
--- a/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
+++ b/dev-python/django-setuptest/django-setuptest-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-sortedm2m/Manifest b/dev-python/django-sortedm2m/Manifest
index 9f68cd72f9bf..4324d0769ead 100644
--- a/dev-python/django-sortedm2m/Manifest
+++ b/dev-python/django-sortedm2m/Manifest
@@ -1,5 +1,3 @@
-DIST django-sortedm2m-1.3.0.tar.gz 35519 BLAKE2B 2905722c6ea2b571ac4c6b43e140d58f33a8578355bf7a5459b670434c338b23cadff073732858692574b3d2e3022e608204c849acba6e858b9d061f72423a03 SHA512 e829ad54fcc2ef6475864d6085ee011e5146da1821095d8e9abddacf45f71890c8bdf86b028086170b6a3d5c9cdb576fb6029aa7be379eba6b87460c2d93ee3d
 DIST django-sortedm2m-1.3.2.tar.gz 36246 BLAKE2B c794373d3555010778727146717778130b311d3c1869f0539b07980de2222d69c1ad4dd508cf35da32f4f55af0ea6cbc0d322de40454548dc59f156ae7856f4f SHA512 3695cc0a565a6e1d47e3573dce1f8c860f78c8d11d248634a8ffd6534c621e7575b2333b7a83e6c521e6e737d7ffc67ce1bbcc8504542751d3cfb254b3d98584
-EBUILD django-sortedm2m-1.3.0.ebuild 473 BLAKE2B 25d76802f54eed500a98e4b8372f9a8ee9b6df66361870cdb27d1912804643040b6aa1abc8eea1bc4003170708e570fe5965b3368073ecd3878de5edb305a883 SHA512 29a8338024d89d420c4dc6528ab90dbac19a254eef6f63808d2886c82e4950135b7d0e938ffb8a75700ee32d7a0eb0411c2ddc8b4af6fa69406d3e6a85c7cf48
-EBUILD django-sortedm2m-1.3.2.ebuild 497 BLAKE2B d29a47bb4fd473e0fcae61570fc8e4afa4fd49fce6e6db3df4c0f5c67e708c06c9dcc1372569f259e90a5c205a5ce65b30713e4db7a1bd7a93b1dca20a864e21 SHA512 afb82f4268ade1dc83879e15a46d21dcd9389776edc8193f541f8f260e930315460bb6fde96028e7295a1a22bce29d30398764f021b5c7a195395d84f83e37de
+EBUILD django-sortedm2m-1.3.2.ebuild 491 BLAKE2B 82ed71f8e6c8bf6d186fd236fab341a5b01949452b5bc3a1547654b78604c106f26a9f0a58df31ddd3dae3c6e4cc5e8d4ee6571c5cb0264fdf5b9572cdd03dcb SHA512 715d284a1879796d34c17a7dc6fa1b5671c49d247123ea79284fd028e597eb12429036da06d2be3bf1157d0b14b46b014e6827b5106cc91223279a64ee1da088
 MISC metadata.xml 251 BLAKE2B a609a079d9180c47a57767595611550b8e2696e147db89d7967bf6eeb3ef34a0ef66e0370d454f2b66f34f94f9c5a004df5251dd09b55672c785792ba194c8ac SHA512 74645854453d611ec6269fbd3c70d5f1ad44a8ac0aa5d9c9aefa6b4305dcc5d9f4efa73a3c937bb48d2cdfd61e29d6de9d78a24fe4f8df754dcbc379f091ff2b
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
deleted file mode 100644
index d5b45810e09c..000000000000
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.org/project/django-sortedm2m/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
index 2284965894c3..8fc47a841d63 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 5f3f095a572b..6b57f9637286 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,7 +1,5 @@
-DIST django-tables2-1.1.2.tar.gz 966053 BLAKE2B 0eb997ff660cf80c7f935945439c8a48b70d4a48531930582fce508e5618d5341350613ae5208fec469b07869a808937cea7e92d838d44900086f862a43bb02f SHA512 b82d9a4fdd27e37056effc68b361dbb708d558fbc5aa0f90a09850a20f0bca34ac7965000e72368e1a792fc6a893f83c64910dfb6569b6016ef1e5b20be0e5f5
-DIST django-tables2-2.0.3.tar.gz 8411743 BLAKE2B ee5f1a358076363227b080425a07cc0a037412e151400dda7fddab085586d97910f0cde03efc340f10afb1199ea3c55a63d34105ff47fa32e72689053bc4b10d SHA512 a1cee5b604fc8ddeae84b65026502fcc738506796f94e6f85d594c2ddb54451c12dfbfbe5c8e91a01ba5150a7c0a41ed71ce95f56dfb7fdefa13fb0cecbc237f
 DIST django-tables2-2.0.6.tar.gz 71283 BLAKE2B d72259d65930aac6856bdd32c1827ad6f659ca19303dcd10abbaef2ff5b49179aba301fd5b0159bd134b3cdec217980780ed39f96a2ba1876e306773d79e3f9b SHA512 d6e872226caf123bb0c560ca2f455e29972d9e0634b4538ab751baef999368ff64f1b5095397838fd1c2146a7e5528555e5c01c8d9ff9b2324a3d24da7557161
-EBUILD django-tables2-1.1.2.ebuild 564 BLAKE2B 353959c80c51e6468898e3584a1b4a31ff86c926121825097e47149966801180fc56bf5a4e5e6c465a2923bd6f6e14685b3e2721d1db36692cdc6a285c7e5c6d SHA512 706876140801cf7d1d6cca01ccae6d93e5e6bbfc243f4a91c40b49af8796ba72387d0fde0855ed51855737d970dc5ce1415709ff0a14a326c81bb68fabde0b76
-EBUILD django-tables2-2.0.3.ebuild 556 BLAKE2B 8811711f00c1feef8c448e1ed001ac4d57a2b667ac9ea8c2dbb0fc5b0fbb76809a4f2859e10eac97e4e033392fa000acc28dd133e1b3f3dd31b13b95cc39d6c4 SHA512 be67a7d7187fb157d79910dc61409f3dbcde2f414e12a193d974f869e8ede690a40145f2346a91baa6bf0eb3b566934058c0ffe5a0a0b5415ea76fba848570c8
-EBUILD django-tables2-2.0.6.ebuild 556 BLAKE2B 8811711f00c1feef8c448e1ed001ac4d57a2b667ac9ea8c2dbb0fc5b0fbb76809a4f2859e10eac97e4e033392fa000acc28dd133e1b3f3dd31b13b95cc39d6c4 SHA512 be67a7d7187fb157d79910dc61409f3dbcde2f414e12a193d974f869e8ede690a40145f2346a91baa6bf0eb3b566934058c0ffe5a0a0b5415ea76fba848570c8
+DIST django-tables2-2.2.1.tar.gz 71769 BLAKE2B 4f507b43907e2c0fd112f493d40681f13039e8a959c3ad4b3ea794dd08a3db24150263e880e79316aaafe59be7c4842504a496ee2e834eea68468c2a3ad0a297 SHA512 f5760f53d76af22033543757dd1b89876f9e40abcccc606bac1019fb10338c83884298a3f9feb280cfc03b209dfc551d07182ff0950c3cba9fafedd8371ecbce
+EBUILD django-tables2-2.0.6.ebuild 546 BLAKE2B 7f38765debfcbf8420e13df7e85fa42992cba71c82a5a7b2ac7d6edb3d5d05fed4ca1c4866271c5c260743e136f410bc7312d83b78b44f2497b3133f2176588d SHA512 6a382fd92c1e67423923ac1af71ac5cd2b202d3bc3e0a330a945720d295b7bb2282ef6c12595a9ac0f297b3f8c1121a53ad8539361986c82bc5266581d0c46fc
+EBUILD django-tables2-2.2.1.ebuild 556 BLAKE2B 481c14ed53d43b19d4b41a9b8b6f9a6de2b725a19062c0236edea65c3427a078328d84c1d321897ee341bf3e1e8b889dd0ee8806fcb5b15023c1ffa5fc6b87ec SHA512 06baaf88f00c6e33c565ce92df09762c2edc9a2907ff66b825c72e65e588a212edb3551d83378d8ee97de523d9e1a14fec17f2e9ccf8b83f9c3592ffa1964698
 MISC metadata.xml 396 BLAKE2B a6ed23b38481b6f9e777434e23eda14f005bb5a63bc1a9eda2a56b9fc6126b3837e0d499e2f6a92623cbdbeb12e909f53ac5a5438e5e8cf8537b6c0387c67b64 SHA512 1a44a48bf619579066e29ec19bf060321dc7b20ddc15798b2a8744b33a882c06d33b17bbf46191d75168fde5785029f3289f0f78dee96b7e2bbc81475eaecff6
diff --git a/dev-python/django-tables2/django-tables2-1.1.2.ebuild b/dev-python/django-tables2/django-tables2-1.1.2.ebuild
deleted file mode 100644
index a9093a2837b6..000000000000
--- a/dev-python/django-tables2/django-tables2-1.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Table/data-grid framework for Django"
-HOMEPAGE="https://pypi.org/project/django-tables2/ https://github.com/bradleyayers/django-tables2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-tables2/django-tables2-2.0.6.ebuild b/dev-python/django-tables2/django-tables2-2.0.6.ebuild
index 08d02db35e82..ea05e3deaea9 100644
--- a/dev-python/django-tables2/django-tables2-2.0.6.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tables2/django-tables2-2.0.3.ebuild b/dev-python/django-tables2/django-tables2-2.2.1.ebuild
index 08d02db35e82..19ee3f4b79e7 100644
--- a/dev-python/django-tables2/django-tables2-2.0.3.ebuild
+++ b/dev-python/django-tables2/django-tables2-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-tagging/Manifest b/dev-python/django-tagging/Manifest
index 6c2635fb06c2..1d971a1437ed 100644
--- a/dev-python/django-tagging/Manifest
+++ b/dev-python/django-tagging/Manifest
@@ -1,5 +1,3 @@
-DIST django-tagging-0.4.1.tar.gz 44260 BLAKE2B 44d39d44892fa86ebc4ea185fb53696be772738a60a29d121d883ed3f123914a4621701c2a1efc4b0e309cd02ad0f7d28fb468eeff15c1b147724e8f9dc36e9b SHA512 6f6899084fd5067ec2e49649bba4aad225ed738f39f999b7ea5156d38fa28c272d4a1f688d4de712db15fe8f2c2ecfd4532eb6e9c0c1de6dd530c09d7d767a26
 DIST django-tagging-0.4.6.tar.gz 45228 BLAKE2B 77ed033ad61d227f8fea9e794b888da5d3a81474330d56bbbbcb1ce457ecac27d9615decadaece3c8b8fd2864c53342b795e8a76528c42609b928624609ccabe SHA512 75abf4b57df52393c8eb1ea265344c90c48b4225151076ce874b2e43657dd6cf4fffa1149acc2e118d58e3701d18103a362f658ce5114d7f207a33e7f4903b38
-EBUILD django-tagging-0.4.1.ebuild 532 BLAKE2B 4260672fd79f2d865699c396f777925d11115bd76160274e1ede89cc771517898e457e7dca2372649f8ca71618c6675e6a592645be4eb325b8ec19c462847b9b SHA512 07002fa9d0040dc2175b9c64ed41c924a2ccdee5c64a30bb98055b5e7e78fa9fb482e8b2cd030111a90449561ad7b8ff4eb5472b5ceda4bd4156010ad02ac7cb
-EBUILD django-tagging-0.4.6.ebuild 780 BLAKE2B fed34664b577480e012d80e150bb5495387a283cc8e74855cd55ccff6bbc1f13595dc8aaca3756aad437c2e7c4fdf359e388ac1ffca55b7655a769a8664d2146 SHA512 fbee35fb43370a62210b760b02edafd2718a318b4275b0e6ea3b4a9fea5ed57908d6b20202fec0d060ae3f3184b5455d2425bd03dd19e25234284ee285d5dbc2
+EBUILD django-tagging-0.4.6.ebuild 774 BLAKE2B 2c0a7e82efec472dd4fa378bfddb13de19218ec3331cec38eb99a1983310e1a242ac7292c73e752535c609994220d08a5a473cac62ee13f45640aefd7dc0acff SHA512 34ce640c34719504d054d13fac114b31f067ea3969cbe6d5ea43aca13ee4a7ca0cfe6ac879640d094b6719fb2c8217a522b9a2b4162df93ba85d2c478987bb47
 MISC metadata.xml 394 BLAKE2B a5d5559d1e4c9a55fff337a585dfb731c84e470d6fed8ba651b59287090e99c1c2848c83faaa4aa720a37a1839f3ea18e4473ed8b0fbcf110fb214cae15dfe3b SHA512 b5bf9305f635c589639da4742fedb6dd1d001db05eb2849087af20466e5af151b1db55eecb5a3ac510f19c84cb64fd22a3e84e957d19e59f1729ad8cf9ecc8e6
diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
deleted file mode 100644
index 936277e845c7..000000000000
--- a/dev-python/django-tagging/django-tagging-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic tagging application for Django"
-HOMEPAGE="https://pypi.org/project/django-tagging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-python/django-1.0[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	use doc && dodoc docs/overview.txt
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-tagging/django-tagging-0.4.6.ebuild b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
index e78959913893..b74d6f857aec 100644
--- a/dev-python/django-tagging/django-tagging-0.4.6.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.4.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 1496d1dea31a..833ccc70a5d0 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,5 +1,7 @@
 DIST django-taggit-0.24.0.tar.gz 44534 BLAKE2B 7a7c756cebc57bc870407d85b81c527ca7cfa5933050e02e5ea5ad18e2879732ea8993c725a4a8b1ded95bcefae3a8f4afa7c38d323bde347be7fb8a5d36c229 SHA512 669fd69c8c66dc4561fa87e94c7277d3de9aeb14136e8911b542dd3e6af84751781f5985c63deba5defedfa80e6650cafd608e206932ff4dfdfc80f796035a8c
 DIST django-taggit-1.1.0.tar.gz 41780 BLAKE2B 9f9460bc2f8fe3e42ca3c9f206e23f48c3761b486db026a4818e0a3934064bbe467a477b81cca0d8f133233db17558de2dc40779748a190408af090f8ce942d3 SHA512 974c1ef77e28b764707aceb9c5030c531ac57ea25ee112e46bf6c100f9ccfb186fe8681042425de25850b04b8925d844af9d35d4221f86e4426529037a47d36e
+DIST django-taggit-1.2.0.tar.gz 42938 BLAKE2B 0de8e942c28ce1b268742150061c78221aa957c2574d3df617e72f71104287e73f14fa66ade1e8642459cb1f0400e8d0f995ccd1fe7182bd8f980bb5b3595448 SHA512 7e074ba5ce2399ae0a85da0726b8a945b1da5c22afa9f6fe47b1ad6d65257b54de3b9596091872a48a8a12f53393bdea97aee5f32e42cb0658ae39475a003c78
 EBUILD django-taggit-0.24.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
 EBUILD django-taggit-1.1.0.ebuild 477 BLAKE2B dbd388a2d2fe452def9dcce0d6be74ad47ad5f53c74d482f102336c449fdfa43ec2df1d255f86bef1b6f3c4646d547adac8eec04aceb2a6b08d3e2e8584f577e SHA512 462a1b8a218a5e916b23d6a6a706705edef82779e7ed9c5d59ae28051c9643d506bfbea4225c086be7b8905f834e744c51efab520f81e9f20f22b0fcd7d6bac8
+EBUILD django-taggit-1.2.0.ebuild 483 BLAKE2B bc8308a17c4497dc81d6a56e2c4b5d62e1f734b9208fcba3c53943fa9d67418de26e50b68f8c02e1b02785010ccbc8d4e5267c5fa9f3d0649a7606a3b6d64a93 SHA512 b8768a539ce5a27f2605b36487cd560021a4c6c581e2121af5d776a75f6a741ad4d18ea52e1ef76693cce0df0e68515f6d6cc2d6860963b976d82f6fdeec5ee1
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit/django-taggit-1.2.0.ebuild b/dev-python/django-taggit/django-taggit-1.2.0.ebuild
new file mode 100644
index 000000000000..26a38263ae77
--- /dev/null
+++ b/dev-python/django-taggit/django-taggit-1.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="simple tagging for django"
+HOMEPAGE="https://github.com/jazzband/django-taggit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index a1c388ead615..77d8eb1098de 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,5 @@
 DIST django-timezone-field-3.0.tar.gz 6217 BLAKE2B 4f4214ecd142284f7da89711535834c8d4d931a2532ff54181e6b072d7e636bcfaa1fe0cab5421d047fdd6d6ab472246054dd8bec8bb0c987df6e336aa269e96 SHA512 624e5b1e6b75ec40252ea7137608d9f62a5fbba1a136068c0c4c5e6192afa9756456cfbcba5ae3b00980f8e0ab44e507226815b25196bb58a39789a75036789b
+DIST django-timezone-field-4.0.tar.gz 6866 BLAKE2B 1904dbdc6454109ab00df5008d36a9db9e8dc68215d1824c980ef82711871747d7b51a263d591968494511a33bc4325930dd7d87ba4b62d9386c78c5508d7680 SHA512 d928cc22d45f027b9d5776272cd8bc03b3d7e403d4ade293973e25a7ef96ab1ff6ccaa5bfce2900f579b52f5e8cd6c581054e944440d05b774457faf4ca9c9b1
 EBUILD django-timezone-field-3.0.ebuild 552 BLAKE2B a70cf209033ce296253d42fb9b36c667af8aa7bfc410722b1dcad0c2e5e18d4989ec8b73db163337f1d714cf28df0eafe5135bc4d85b04772c00a0500e55a830 SHA512 7598c4c1cc43f0c168e6b321b0aa22119c7457ed48f883656480cedbb372eba5ad3d9477efad5062866bc557c9215ac81a5be909e7acf8c4085ccde5683ea002
+EBUILD django-timezone-field-4.0.ebuild 562 BLAKE2B fac8df261207cec6e033a6149f170525c2f4f827dfa5d52383a4ecf34a3a4bd9f14219ef003a73980697809ffde64efe85e5e703ca1885dee7ab7d95ff262162 SHA512 c8f22230b47e0b9481a6e86949a12730a0920bf0fd3475eda164ba695676e317a476f830034a509d4952f30cac8fe1f3d312c4cbcb34212037d8b7b5a720c0aa
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.0.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.0.ebuild
new file mode 100644
index 000000000000..907886a12e6e
--- /dev/null
+++ b/dev-python/django-timezone-field/django-timezone-field-4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="A Django app providing database and form fields for pytz timezone objects"
+HOMEPAGE="https://github.com/mfogel/django-timezone-field"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index cee83f961d06..2039b0a52825 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,10 +6,10 @@ DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f
 DIST Django-2.1.9.tar.gz 8608747 BLAKE2B d5ef1aacc30067dfe5369655eb23ea67788f22edcf8ba070944c0fb4fdf2fc3628a364d480a3d47bae0339255fb66a3bc27f11eb5f07280812ab5f57b4367c64 SHA512 1f6ad122012d898da52ce44465700d2492ef9002d5c327b25e3edfe2116b8a1143feab79751a581029664311452d52d96fe116d8817edb0ef7d7dbddfc0a5ec7
 DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
 DIST Django-2.2.2.tar.gz 8841523 BLAKE2B fc498c19caed7fc8766b015df3049ce325886ebcebf02a1f6618c13ea9d12dea56ad65b860f3b0dee0b6532d97e754bb8cca2c3f0a375c630c28d52a2fd62a2e SHA512 87e0a7b2d0e6d6149c746a7cd5547351ba002c6eaedac160e72544b429d41b133da5c36256a07155b7b4743969e9ff4c3ac890c9925db428117f68a67104df0f
-EBUILD django-1.11.20.ebuild 3226 BLAKE2B f606d94857cdf144c0f72e9e57584886f65e1b5c73a95a6e3867d44c07f109e629e98c1cea97a2c9ed490a5d72f6ed6b338526f26d6cfdb1ac6d5261708d0e73 SHA512 cd34f9b2f49783b968a890c87cd25ef29f7348463202ac4542f69c32ea720000306934e5861a4e0071fb3ca67f3a8fcd9e21ca5dd892ac25f7ffc842e3b33f70
-EBUILD django-1.11.21.ebuild 3228 BLAKE2B c0015da0478c4e4f79bce86240980649910918eb58061e023986364b8dc53cef7ba3ba77d94b30e7eadcd2f838228209052785e64feafdba1117a94872f4084e SHA512 2620d74437f255e0c11d72433ef3e4261bdfeee03cbac2bfd8e9c0d242e7b4bbe7b2a5208f0df1ec3eae01fc93918d993cff1734b7eef7ff2a6cbb41766c931f
-EBUILD django-2.1.8.ebuild 2489 BLAKE2B e831aebfa9693b11fea35aeacf2b5c5ede5b6ab7b4067f8d5d2ac2df10b2728f6e7d8d18eb71795942fe3152255966c1663114f2a756291d57de7d759b707efc SHA512 2be5f1b07ce2906a84ffbed21b10c76f408d63915f2637a260ecc7c841cce538276f31d9650027d12ad12dafc6336f531d4fdbde7b3bd2d44990cc3994d07465
-EBUILD django-2.1.9.ebuild 2491 BLAKE2B 294651ff06feec0a1d7b9708f3d33b1f592f9935173170fcce5e10ae9cda229df7382d562d58869c18636d60f4c40ab0efdd26fad2f0dcbc1040b02ab37245f7 SHA512 105312a796106b2744d375abac29f63cc078b837b6be3ede1b3605481a12d56d681d60e968f4d93ec2ea6381e664fe5fe4a69f79385dac9f0bdc54570f6429e6
-EBUILD django-2.2.1.ebuild 2580 BLAKE2B 4868266230b1e9df2f83034990bb2378b27d2bb155d85240c092ea200f4576134ea6bb2153e8703f98bc3a444ac440e02aaa314140bff4d30db60fb08969c864 SHA512 819b4a26ad6fc385a9617ba8fc4d620134bf0f8595a83df7a105628064ec3dd2ccf1bbdec97d2cd8b43cf323e9516c3f1cda61f3e2a12cd701dcbbc8f25d60a8
-EBUILD django-2.2.2.ebuild 2582 BLAKE2B 3ab794bf23f9c9b684ea7eea26115b38ad306d01ddc095746bfc712f63a81bf36cf9c6eef7c944c49b106f1a2128ba5ec33e2ba4f28eb2e4d3fb724850e1a5b2 SHA512 732ac5bce38dba3f5812a3a10d0fceeb746928ba50cc3fdd66aa2660da17adb021d9062c776652ccec206ad744635984a7ee63812d6e806fe3379e64e0f35873
+EBUILD django-1.11.20.ebuild 3220 BLAKE2B 245ec265ff89402e4c6a04d2ffbf7c0937dc258ac1520a5dfee34ba89a982d3f2e3f0297eaabc2ca24a60947c1e2efaed838306f8e835087d2b79a6f08fa379c SHA512 8edfb775b25a9769f7d43f4b537ab869fd299be17b3363eeb8e563e5eaf7c24cba704f433e61e1d3e3626931108372872f290f481fc15e338166611d6531decc
+EBUILD django-1.11.21.ebuild 3222 BLAKE2B 3e60f81758b5dba54815bdfa8cb9aa2ef87b18d91fdf632aa0ba79b2418a9510b1ae67fa9264b00e24165ca16c8fa592afa723757af2876ad7a471b1929359f0 SHA512 d2dba15a7b1e1af72ecae4753d6f4ba53684476040c9e7eb1284720b20a15911673c4cf59574d39b31df2eddf61bc5be286e609643f5f03e44516b1adab5501e
+EBUILD django-2.1.8.ebuild 2483 BLAKE2B 4db85abc48a0833a8466d44c7944100c07235da3c697e904aaae06eb41411afbcf7a5332b269e2b6c68d536c168601eff9786a87b4fcd29d31295aeb707bcbef SHA512 91301986936e157fc7d3bc52607c87537e672da74e575127d49af4b85de2630f0f1dc953b896ccd24ad40515fc29c6efddf4442ff92c9724e5b28c6ce716d0e0
+EBUILD django-2.1.9.ebuild 2485 BLAKE2B 47ce5d579f39b36b1dc93d123589cbec960f07d44e5e1b4d8544bd2206e5c6cbbb6bcc6f61aac1eb317495d4dded37d6c8966f3e1a1acb8ddbf8b788d8da36ac SHA512 53d5bb31fd48062be797223cd0d99912fa6e72732cc603a1ad9c91d1f627729b537f65f2ca85b11c9747ed517e0389c5216dddd1a2977f94e4c2658474600e28
+EBUILD django-2.2.1.ebuild 2574 BLAKE2B b55c8e7ccb6df365f593d4b376e7aead798f39ad6649c2a0ede356ad4d77184b11db3e77fdb41353cb4d7bcc7e99e2e13ec1692cf842545d9167f67f54dc606d SHA512 e1cf1c46a9b14395dd375f1e2fbd8e7870447d97939fcd7fd0d340655bd386e6fdae95899129d7bf3bce1ce8ac3324e186f16f6998801aeef15e3d54face9ea0
+EBUILD django-2.2.2.ebuild 2576 BLAKE2B 3778a76e5d14d31e0f71bcb3598e8f49924629dcf18b93e376937681bb49183933d542e16ff636a355943bcb248e5a6362b3ed5bfdcadc2ca765d4baf78d4939 SHA512 199d91750f6e97e6fd52ebc219345ff7cfa67f314d746147cf0e766f1792ba6b496f8728e7472554638f08d1f23cd87b157ce04fca69446247d300bbaf19be74
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-1.11.20.ebuild b/dev-python/django/django-1.11.20.ebuild
index 2c66da522949..63eb7b863c6b 100644
--- a/dev-python/django/django-1.11.20.ebuild
+++ b/dev-python/django/django-1.11.20.ebuild
@@ -25,7 +25,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-1.11.21.ebuild b/dev-python/django/django-1.11.21.ebuild
index e9d4601c3c1d..a09c08fe93a4 100644
--- a/dev-python/django/django-1.11.21.ebuild
+++ b/dev-python/django/django-1.11.21.ebuild
@@ -25,7 +25,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.1.8.ebuild b/dev-python/django/django-2.1.8.ebuild
index bcefe68c8dce..ad94ca7e5681 100644
--- a/dev-python/django/django-2.1.8.ebuild
+++ b/dev-python/django/django-2.1.8.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.1.9.ebuild b/dev-python/django/django-2.1.9.ebuild
index 70bc05ed29e8..17df98e2f238 100644
--- a/dev-python/django/django-2.1.9.ebuild
+++ b/dev-python/django/django-2.1.9.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.2.1.ebuild b/dev-python/django/django-2.2.1.ebuild
index 6d91c5c7b1ab..a6202a73ae12 100644
--- a/dev-python/django/django-2.2.1.ebuild
+++ b/dev-python/django/django-2.2.1.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.2.2.ebuild b/dev-python/django/django-2.2.2.ebuild
index 5bf0811789c3..754fb915ddd5 100644
--- a/dev-python/django/django-2.2.2.ebuild
+++ b/dev-python/django/django-2.2.2.ebuild
@@ -21,7 +21,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index a696a3ddb63d..e3c645db996a 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,5 +1,7 @@
+DIST djangorestframework-3.10.3.tar.gz 789009 BLAKE2B 93150e20d4c5f6190add87c0fe8e954a2baad55933234c4e1d128c345bd057afaa2a4caa603bb99de800d1ddf146fc7bef0f1bf09b90d44f5073df9805502cce SHA512 bd1a8c9dd639d34f88911cee4d02252e608c26cfec5f1c96ae3250f359c6c962612bf56718cd3d74d680b3733bcc86664b94c9241cbf184984a30827c34ba4d8
 DIST djangorestframework-3.9.2.tar.gz 785546 BLAKE2B b00e502a483894bfcebb9075a2534a68d0c48093b60482dfd2fd3b5653731ba5d535259451fcdd2f25f16832ec9e5a6b5e13b5e43095f770b88a0f251525a69d SHA512 cf3b23de7b27bca082df571a2cfcb1c593bebd36830b60238a2efa794ded762b22444a00885acac7d97db393943063a9f7a81e9dd32628afa7f1308008520a76
 DIST djangorestframework-3.9.4.tar.gz 779306 BLAKE2B 9ae955cf0145ad8b80b65d8b6d8f0b947e0e11ecb1b52939a1fd4d209d48d84a4d756d979596180c63f6caf25ff796503b0b3cc8237ec1bbf2d1787fae5a2863 SHA512 bfa269b1ca95c1d35d97f3fcdcf821778f2c2ba14ce79288b776ecff369922603ba9a2292a59ca8ad263eb3eef675420a2bb2e609e11e53e503a78bd365b2913
+EBUILD djangorestframework-3.10.3.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
 EBUILD djangorestframework-3.9.2.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
 EBUILD djangorestframework-3.9.4.ebuild 469 BLAKE2B 54cc48d1cc2a4cd5ea21b950d1bf3900934e7ff24c57167a3dccbb5b3a40ae045fe72ed60bf3fd3795495e313f4decb96352ca96b064278a95b03bc8b15433d9 SHA512 3f21c9748ec6b1c6bf8db5bd8306d9fbf864106d5097927aa5eed351058e7864890f2ec2c6a9cd32b97a298165e68850c1f9820f7480d25fbd409bb57c79132c
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/djangorestframework/djangorestframework-3.10.3.ebuild b/dev-python/djangorestframework/djangorestframework-3.10.3.ebuild
new file mode 100644
index 000000000000..45883f2ed256
--- /dev/null
+++ b/dev-python/djangorestframework/djangorestframework-3.10.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Web APIs with django made easy"
+HOMEPAGE="https://www.django-rest-framework.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 63e4a8cdde03..9bc11678817f 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,5 @@
 DIST dns-lexicon-3.1.6.tar.gz 121560 BLAKE2B 08d02b962194914f48fd4b9f3b87f9a9b9b998ac419961b7a61e6dc273d1d8938207b791c58ae671775a6e2da78bf880e567cb5c33e62a457d849598760353bc SHA512 e4078756ad1029f5df5907cf6d2ef2eecb70cf421ff8ab74fa6b176b0b5d9e1fbf94ce0b62e497988f432228038e9fa02a1f5fe69d582e39efa9391ce47f4941
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
-EBUILD dns-lexicon-3.1.6.ebuild 689 BLAKE2B 98e00566f6eb63d760d0a792a4662e693765ac966cf7fd17cac16e54044efe5cd65aa6135746fdce2aaeca02fbc0cd9a13f53b0954e8a1648b4fd3fb7ec7e9ec SHA512 18d45571928e084f4dd663b959c6a2f14effcc83ba5f0cda9dec97105d22717f84d518d5c0e89719cb4538dc52355b942e53f50cc30ed8b7f00bb427e7ab301f
-EBUILD dns-lexicon-3.3.4.ebuild 689 BLAKE2B 98e00566f6eb63d760d0a792a4662e693765ac966cf7fd17cac16e54044efe5cd65aa6135746fdce2aaeca02fbc0cd9a13f53b0954e8a1648b4fd3fb7ec7e9ec SHA512 18d45571928e084f4dd663b959c6a2f14effcc83ba5f0cda9dec97105d22717f84d518d5c0e89719cb4538dc52355b942e53f50cc30ed8b7f00bb427e7ab301f
+EBUILD dns-lexicon-3.1.6.ebuild 685 BLAKE2B 7e9814f259e3ca9f5c754285881286021d5beccfaa16bf1d910cf27e2647309777d110a5dcbf45952f6de82a9cc8524ceca37332a266d9d631ea5f1ffd4c373b SHA512 06899d1c9acba7f121ce9df264ec1d5a16d2de47038100304b907df1d002866d0676f58bcc0f609f3699e0c0420e4610394342959d5b464aff22eeb6c52d2fa6
+EBUILD dns-lexicon-3.3.4.ebuild 685 BLAKE2B 7e9814f259e3ca9f5c754285881286021d5beccfaa16bf1d910cf27e2647309777d110a5dcbf45952f6de82a9cc8524ceca37332a266d9d631ea5f1ffd4c373b SHA512 06899d1c9acba7f121ce9df264ec1d5a16d2de47038100304b907df1d002866d0676f58bcc0f609f3699e0c0420e4610394342959d5b464aff22eeb6c52d2fa6
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
index 4ecb9e815a47..8dff3625f52c 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
index 4ecb9e815a47..8dff3625f52c 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 60eb919a4ae8..6e48ed28b2b3 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,6 +1,6 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-EBUILD dnspython-1.15.0-r1.ebuild 1043 BLAKE2B 98148ca63d2700dd3fc7ecd91a7d3ae70d158ffc297ec15318c16574b9a865084764746e9e3d8de0a705da65980f3de97e18fe4df33b460b945f79916f57729c SHA512 7149439bf07f1bc1f8e7fb5f0056ff5417b68604d43a05f28669c1509bc374a0415b0fff5806d9cb9e2201fbb6c327d7fa63fc03135ef3430d7b2344a0039227
+EBUILD dnspython-1.15.0-r1.ebuild 1044 BLAKE2B 95f3e626a32a3106913f8c8ec84235e3520ac17289454b69e742f598e5e7d9c13f4b65cc746b30d7c810853312df7e31ecd18efae404a4796a679472c3f5ca96 SHA512 dbfa3c78dd2183a93f64ddd3ba5e0035452c302b492b748a0da0c898a617864ebde479adff35aabf5f7083b38de8638a22f9063159e9710a3588717d1fd32242
 EBUILD dnspython-1.16.0-r1.ebuild 1127 BLAKE2B c85c96b947676d3860ebed78d86e60fac257e397ed74db5869ff7be94733336b3696e1e6ec5bcbf38e335d2a53c3a3daa8aa675e0cdca42d14415f8d346d42c4 SHA512 de1d87496c193811a9ee5f632f0133304006ca6f307486aeac28bce3bf6382cfaf7c25ede8c30ea2a992a6c72f2e81615d57beb4518c531692c7d88742f34773
-EBUILD dnspython-1.16.0.ebuild 1112 BLAKE2B bed3cb7120311cb822a2f3d88d715d46983f30863cb61a1801743e6e7eabff9de73366d1aabc42799f6c89b3261cf6274927ea999a8dc56358341cbdf379e9a9 SHA512 87fd614db6ecfc0d655b9d609a58eb8b27190864b0637b413cbbe93e63e066ef35438d4befc0228ac3f1a4b941b878286428d60cae7d3b5ac2a93cc4d471941f
+EBUILD dnspython-1.16.0.ebuild 1113 BLAKE2B fcd7b4a8ce1737e9a3fcbf366e51460d5094b18db0447c57e4c138a036572d5c991eeb782887ed04c157c6b1f9d431e0ffef01650d51289223be05e76e036f19 SHA512 6081183c776c2db38035bfe36c58d62c059425dd482775020fb4ecbc301fbb083db5ad921f242eb0194ec218c910027113d4d22a08e7924fd95b23eaafacea32
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index 80036a43eb8f..951394e1211e 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
index dca21798904f..49f1888507f1 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index f3ba11eabe20..3222e8b929fa 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,3 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
-EBUILD doc8-0.6.0.ebuild 872 BLAKE2B 4d1990dfea695d2cb892b56c4fa70faf9306fbf5cfa8b343d3c8c603913eb78ebce5623fc815d342d4df9cf88ebc283158626d294faed97d6dc9dc03c7d4f08c SHA512 dc0738af9ef4f81d4db50985cfacfbffe4ca61311e001efdaa236fd1a26bd836be26b728d02c239de398c7b2182c5ae5827283d5fa06eba7b2b001d09457de1a
+EBUILD doc8-0.6.0.ebuild 862 BLAKE2B 8fddf8410d2c4cc49cc70b4367127ff64fda97d075c1d1ac731547be70e44b1d406d16a7cf6250b1bc7f41da68160a7ee8646bbbf5714605355005294713eb4b SHA512 655204826ba94b2dd70488259fbab3c258f4c9643ef306348e8288b9e106f6fc2c51e4e17dc787ac8443e215f5255f1a76f11b802c01230d0d2804d8f4d93343
 MISC metadata.xml 321 BLAKE2B 91708fe1c777fab5db78b96478a40afe8e209db0a4eabe6e6f76bba6efa7c81add8a4e9c5b91cb126d491826b9e3fc325c3e0adcf5fe6c00360cbd60295220bb SHA512 ada3a7f942be7daceb700085466dfb812b457c8d1af21047cf359786e8d9d6f122b84481bfd5c05f3d07f02ced2e1b91b9edf079bc0c0655097e3884862ebfcb
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
index aae2bece4d71..53aa08ff87b5 100644
--- a/dev-python/doc8/doc8-0.6.0.ebuild
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3f1af3037d60..d3c234e8b742 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -3,9 +3,9 @@ DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
 DIST docker-py-3.7.3.tar.gz 221311 BLAKE2B 6bdfc5cd53fccec6e060d08ebde845d373f961a8a418e3bfbeac79e736f64aa07807a4f2074d243765d10c0e4cc87c672d039cdefe4223ec1b33b56cf4ea31a9 SHA512 d3217361617f12e841bfa443c7ab4b44ca5f7ead8b40834919aad9043220efa7611a8bd18cbec6adc4d98f2551bfb169535e1eec904b90425648093c0d6a1722
 DIST docker-py-4.1.0.tar.gz 229336 BLAKE2B 8a2e0333e0e90399c0c4267c5b5205f3639077384e882e920a613e2d30d7ee915bdd549ec89a4c0e34646edbc6dea450ce63e45cf9cbc1efe0e26ff6ea5961db SHA512 25e236bd5b429846ed45f26a303af02bb679c526f45f188d8df74d79fcab116b41e52e3a85642babff94127ae977dab6cc93e53bb78aab7be038190e161d25be
-EBUILD docker-py-2.7.0.ebuild 1535 BLAKE2B f6364e406ff7a26770c677a85fcf0ae2942554a92c2d830291b97b8d2061ed9ac242493187829ca2059bfcc0d3f2019737d08369f2f8c910401109d09d48c903 SHA512 c3d82a4faaa5b06a25bd04ddfd006112ebaf64ff6c5ac259ba7edbf12ba55ccf07bba9b36583c6c58b6e730512dfbd138b5ca1885d9fa1cc1d51db026dfc1a85
-EBUILD docker-py-3.6.0.ebuild 1455 BLAKE2B d639fdd7f4cf6c6e77dae996f0c39ed9e2f4ee8ead92796f8837c49b8a42c98b3c6d1d7aebab1defe7a707e7a1efe1599bd18cc1b63f169073e242d63d441594 SHA512 30383a38fdf48446b1549882f157105f5849e0b759485a6ecc576d84c12887cc7777178db7866dc9c8c93a5fd63784f1fde683c5e2c604742207204d535121fd
-EBUILD docker-py-3.7.1.ebuild 1456 BLAKE2B 0b826607a2281a8dfba84a11074ce948682cd37c30ad1858316ab03a6ae1a6095441c6530475d8ab643d0676b188f6af7b14b8c54b3192f6c60c310c14dbc1bb SHA512 064bb8b20be646b2b9ae4fcb013728daf921148e209df253cb59f5664c5f3590b51f78fbd29a0500a38e40a9d41d8a3f2d1daf083238b6fb6ee0ebe6b7ae2c41
-EBUILD docker-py-3.7.3.ebuild 1457 BLAKE2B 29b28fee9ff4fe0cf8f1f2370234ba10e13684922800483a29380dcb60797fc63488da07fa1d499d67c9aea1c0f9c910dfea247a89f355081144d81c6b4ebe00 SHA512 3dc50445965e4561cd063137352a80c4c818e7ff86a50645524a4dd19efb1917267eea797e0274a748cf7634fb10907c4ffdd3c34d5f5df6f8b160020bcd8174
-EBUILD docker-py-4.1.0.ebuild 1363 BLAKE2B 5739c6e68dbc7cd2ecf2fb91a2524478fe5e0104e1a0975f631fb48b644ac12e52366349fec4b5d4c192e51e72968de24ae82c480bf7d5f7f83d824f129d3874 SHA512 793a1e22a2159d0e64fc8e77837e1ac96b17e926a2fe12c9f7143d64ac676dfde7ba50a2761d8c5d650ac739fa88b91e4a635ab83e10bba1113776bd988c7faf
+EBUILD docker-py-2.7.0.ebuild 1529 BLAKE2B e2c4f8d5db8db774f02dada0bf12da1c54a2971f69915f7005080aff63dfd44a3902bf5e9e612e1e475aaf9657f925dfc186cd3b76c5fef635e3c49656f171e6 SHA512 0db637af52f78e3d996cd7d011b974824d5bb29d1bf96f0732487841335d1ed200b6e0050d50f0ebd2dd20f5af4f9bcb674c676ed710e781aa779302f5fe950d
+EBUILD docker-py-3.6.0.ebuild 1451 BLAKE2B 5fe2e7e0dc3133da39ac76cb326e10f1b5be49f7892fcb73220ebba02b0729717a00bff3fe9fb88a5818fc1e93b1fb5bcdd7c66a2a1e1d872e08c82ca4b6d8b9 SHA512 2d22695f5e70f9b9e61c9005991db9ce2ba820daf37844dea839bedf3be29580a44d91e64935a04ec28e9f3228d4f950f6a843ba3dcb3c75d6a72439a1d4983d
+EBUILD docker-py-3.7.1.ebuild 1452 BLAKE2B fa21dfbf846b63ba8a43550f10ccce57ed4a7eecf65a92ce553a8c5e04d5e1315232544b1400f8fe88edfb6834c03c21586e28b3fcca9a33d142e1a4020e083d SHA512 030cc3a8bd48ab86a2569bbe44c2cf3bc4b6988176e194a79dc9e7cc5972ac5e88501b71a8a5e9049dc5bfc0eee1d1936c4cabe8941cb2dc7dd47747429aa236
+EBUILD docker-py-3.7.3.ebuild 1453 BLAKE2B 331e97fddec844a42bfb8e2dfe77e42560c2ecb9500f53a5e2d7e4ae1e61882f891c100b9a178d88f4812e3661c2a0d50da8fe482b51c58308e5b9d17c3457cd SHA512 07d9138798045be28bb4233c0c64067a983494d65f17d3c47def3626e8cedd162c365eccac62fe65fc6eadeaff62c3bee63d4dc18564caa2ecceb490660c7aa6
+EBUILD docker-py-4.1.0.ebuild 1357 BLAKE2B 3cd61059961d1acba71cb3b4a5302212fb2c10c220e13ae949aee44b2625f470952981fe42e3b48def1ad84b9348f6f4a0ef139470c2ed668cda51c7088cc13d SHA512 76790a1fac37d9879717d0ba51b93b54df1d19452510ad9e8d61e6d67b29bc8cc90a3ea89fb07562f654e9e8e3824ff280b3bd3e4325fcbfa1136d495a13d433
 MISC metadata.xml 319 BLAKE2B 94c736dc4cced0c42b48683b887ca3bca96bee3a8bb847c0af93764abeb55a14d1f8f77eedad59f68612550dda67b4b6c227c61abd0c7155932f22f463194de7 SHA512 0e33a17e754e136b13dce5ad5fe93b159951c834e1140a176c25fc747aaf4eb4de18112c62a7bc7eab3fcf3f580583a335b88e6ab35c52c582f627d0b81c35e6
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
index 991185bd4100..4a2d63720f08 100644
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
index 427d7656a17c..c212413c5cf5 100644
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index 26e4ebc62477..6f39697f4480 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-3.7.3.ebuild b/dev-python/docker-py/docker-py-3.7.3.ebuild
index 1e78f676fd4c..b55a175d350d 100644
--- a/dev-python/docker-py/docker-py-3.7.3.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-py/docker-py-4.1.0.ebuild b/dev-python/docker-py/docker-py-4.1.0.ebuild
index ae65b322d32a..995cf5ff9dab 100644
--- a/dev-python/docker-py/docker-py-4.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-4.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/docker-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
index 5f610ac4570e..77b7ec680741 100644
--- a/dev-python/docker-pycreds/Manifest
+++ b/dev-python/docker-pycreds/Manifest
@@ -2,8 +2,8 @@ DIST docker-pycreds-0.2.1.tar.gz 7555 BLAKE2B e9934a357cb59d995971f0d3b247e6d84e
 DIST docker-pycreds-0.2.3.tar.gz 8220 BLAKE2B db645de930becc3ad6ecb2d6476d36d1845fbaa55b7c6d2d6590e45036713b6e215b189e6ea961c31c0898e8f231943e05abe96a63c15ac43bebf0f7787b954b SHA512 d4199a48a0bda29ac6126ca9a196c0722667a744998b5f81b360066d48f1bd1f9e6e423df2b53e37117316f3dada6fa47e956c6d2c7d90f851d97a434dcb595f
 DIST docker-pycreds-0.3.0.tar.gz 8544 BLAKE2B 88a950d7fa027b221ffd999283cb6ee4b0f23115167f27f163085372abccc4d9d5dfeb03ab5d99449d607dc69212bfeb870130d0f91843cca6b9b338d0f4f9ad SHA512 5fa81b375c3ddb6527f416afb11688cb703f75dbd3b1a9efba0cf85e8b3deb903670c94933777b855d48d607596192c72e4d5be96f91ac8e8334e634abf8d2fa
 DIST docker-pycreds-0.4.0.tar.gz 8754 BLAKE2B 22aba2a2a7c92c4e0fa7fec5df1a17fabd9320440922f542a4e8dabf90ec71b9b8ff744a7ef1d46e7d720862624c721f5d2e4057edb48a85e329665c477b6406 SHA512 ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a
-EBUILD docker-pycreds-0.2.1.ebuild 508 BLAKE2B f9086a14f9a6bf85c29618dad5e0f290d1af7b2fdd7eac2c84cfccac54f8ca62592deaa34bf0c4143e009ba5721f96079c9faf5d61ac258f1ca4642adc01dc9b SHA512 120ffcbdd7a37a160f238614548480c06e6f4dce27f7c843f56d41bed0ea60e0cd84388fb7bff74884e50e5a9cbe6cdd40db8b6320b33340f3a9fa31b3741abe
-EBUILD docker-pycreds-0.2.3.ebuild 510 BLAKE2B 00bf01a20f601800eafe4e7f6b5e7bb43beeb9f6ce5a3bb29b559baf883e93d7cd5d985c8fb4e72d5c93219573929ac40e48a200f8a3e1c6740fe1e66171ee07 SHA512 7ecdf33b2a126c0ee8a8712da90eedd3ea3aca222b60f4ef30acb5340d8ca6e6926032266b6fd52785dfc42e8c1af95f30d8154d68f82d564714ccec68a37675
-EBUILD docker-pycreds-0.3.0.ebuild 512 BLAKE2B 67b2ac388702410e31cbe7489731dd24a341690d10fff5fa59ac732aef8152dd0563d4094423cd17a825960cb844013ff49b84987e53a4feb4151763f831d8df SHA512 3275d9bbeabb163dfd379af97e8731e3d911ecff609b0ba6c9d7ec87adfc7cf49efff39fe9ef0b5736440b194a29014670553ad86a65b4a020c864ebf6d5a685
-EBUILD docker-pycreds-0.4.0.ebuild 513 BLAKE2B 59f59dac6a9311b9113c99a0cf6519ca7de9ad77752b849f16ce912bbe523ef0745757e653403d8cdb25814f500dee9bf30b20a3123a7c8cd80cee48067469c0 SHA512 37d794883ddfaddfa13f624b8d58140e2b19a9207491b6b7e73400077558acc628adda4eb0886766222acb2d55136d223b960abfaf10b409dd864c3cfeb8346b
+EBUILD docker-pycreds-0.2.1.ebuild 502 BLAKE2B 736e0082cd8bb6dcd5e795e896aa2eb27f30293bd7c11316e88699e3b42cc223a7a17651e056351dde910225dffd6fcb3751ec356b39bc6d48a75ecf8af1d83b SHA512 7acfacc74de0f7ec90d14c257e512caa87b1e344c314a770ed33202bf60128c43b69926ca1d314dd8e35c6811e163ab24ec4efb79e386c474e26858c9c525889
+EBUILD docker-pycreds-0.2.3.ebuild 504 BLAKE2B 7a8a303bc009f8ce29fbe7745504f020d95dc67d92ca0ece2e857c991fce1fe2ec7ae20323c5b3cdbe69602b931e8a4b7660ea13353b719facaede53bb18b357 SHA512 9d836d84a99db765f5a986983d0b16f14a69b7d65259444c47b0e76155ad6f24d0cfc6a838088b31ab286e6a1374d7f1b6a3c3b6ac4675159956a00b32e4630b
+EBUILD docker-pycreds-0.3.0.ebuild 508 BLAKE2B fe75f3ae702735da1e6535401292a8d22b015efc3cf9bc6ad21ff6785f97d9bb4c7a868c528002da4dc4724078bebade05c7548a4bb4fd42398075b692b1767a SHA512 a5bda8b688d62510ed06e7595c50794910e59c67062c509fdf841da84d70094bbde5fad49213c13deb5a9e8e74e262c84060fc311df3b3501213922e936b3201
+EBUILD docker-pycreds-0.4.0.ebuild 509 BLAKE2B 4a130255017e903300a4a08bcb8a124180d1f6e0ada9e1321a36e7cc47bc384d80845e89ea11b534707dc1b0a8ec0721e9f7bc79e18d3aae34ea3fdf5817dd80 SHA512 80e2906db14b2c6d206c4a42b2ca2acefbdecc9a2a2cbbd6a52c62afc759e82131c8fda2444bc12860747cadbd5a935a81ef9896fe6cd69e3b7aa9d6806a65d7
 MISC metadata.xml 355 BLAKE2B 2bef9deaf5ab89b1e703b43844c6ee639cbc427727587b118688ca5005a9156042eaf455891f3d27fe007793aeed75e8626a66e1b3a42ddc0ccd2f21747797dd SHA512 a980d256f1c5a3a76a486cc97bc9394b02dd5042e001a03b1aa4834b040fa9abe3626549d09f693aade8c269d818c4da056990b88a8f2f43fa0211a8c5cf4dab
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
index f783e6fca03c..8bc846bdf57c 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
index 1f09c4979e6c..81859dc547cb 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
index 4d9f76624b34..7cbc64a4f5da 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
index 441d8e5b124b..9470683dd7de 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the docker credentials store API"
diff --git a/dev-python/dockerpty/Manifest b/dev-python/dockerpty/Manifest
index 72411a7a3e8f..457e9400cbc1 100644
--- a/dev-python/dockerpty/Manifest
+++ b/dev-python/dockerpty/Manifest
@@ -1,3 +1,3 @@
 DIST dockerpty-0.4.1.tar.gz 19608 BLAKE2B 1c7229bdd18100bb75a8ec80f0b8a636137efce40affb2bbadf27eef5ee13322ab92f9a3f77db0ef79c35366daf700550eb9a358534f7a1f1c2b92ec2cd4d5d0 SHA512 1f27a1d1cf9bfa21a77f2c0695334ec09a81ed5b70190b16fb23ec0e2ab4cb84af334b5e9275265eff2d8014aac5f96890276bed5775bb805c3f30260c99da70
-EBUILD dockerpty-0.4.1.ebuild 801 BLAKE2B 3e39e8927d57d8ad346649d5dcbab9b460f76ec5e546c52dab342b51e1e6a26a49650485646879209e28d48a1e447ece3dfb081403174f381b8955bc6c6eefd7 SHA512 988fc25c1eb4431c4064b9deb28a6ad9ca5e482cf54ea69cb31d3aaf0514663bf4bb4b36fc6d3062312edd711896ba52fb236ad9af495f3f399372d36d872fb6
+EBUILD dockerpty-0.4.1.ebuild 795 BLAKE2B 0a69cc0a8b267f1f9f2ddfbd08affb1a4e93fea52b1abd236293460b321201a02bd202069d8940274cfc247bd2cd2fd2945472d2422ccba2c32fe70550eca2d9 SHA512 2a6fa2ce96581b8b4ab7688109361504b999175ad64baf0f16da5b4d3a86be732d32a7f314d7dcec6a2e8566a465391d231f07ba33834ce25f1ac7c2b6de47e7
 MISC metadata.xml 246 BLAKE2B a3790516e837d7d62a7efa31295004ba64b36026f45d696d87b5fb83e0b08815b887209bd5ba4f0be5a8b1371797d4abdbd125f4f018b32dd95613b36c53ffbb SHA512 c9e4e7717be1b4f5571d287b57d59c6de4bee0f4bb0a21a55cbbc886f711d57e52e74761bcf7f1102e1efa4b0e56f508e5f15eeb69cb38866692bc232032f936
diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
index a18b282795b5..ed9f5eba34ed 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index ea9634cf28ad..d9ee1aee8f05 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 655 BLAKE2B fff958f94e91fcd7f64b1e6ce570c0d1ebc9fdbe2cf1875e0e632f5f5803e3353317135966f4c26f2ae5b2f093ef27f5df8c40d6b8a9ebd6aa2068ae4e3059e6 SHA512 ef644a589cb4bd70ba6d57c28d9feb685566f5f6516cf9ca7a1b2d260a5537411311bcb88a0afbd26708e69f4de1d8b594431cd2660ca212b7048bbe819ce3ac
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 645 BLAKE2B c58f2142cf0ea402e2c377b06d709c5f9733cd52c03c56fc767344b23ef4b90b41d92c5dce03c6d76186212dc07687fb6666dd60e9fb038e0562e8ea72469629 SHA512 a3b68678b1b16966e8a1b6f29a87aecc92bdfbc6f65fa2b5769d7999f4ba0a20d6a94c07007cf04dab25cadb8f03cb8372c3ccd6af325c8797fd84a70169511c
 MISC metadata.xml 396 BLAKE2B 9d6ed08e6f963cb03406050e1ec934e9fd0484633e7989b52d5277e6668ebdc919d60f8b0898b0ccec076e9839ed07c6cf5273e14a289049f815cb119e4c13d9 SHA512 da8a39b0f46893a69b4e53ef6b62845f70b1ebdb0ff1c339f52b61b69c6a6e730ecc26d3f99db16a259c73ff454685faf546babc7afc9e804170a0e738cd7d1d
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index e71f6d0f8304..e34a2cba0fbb 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 013cd72921be..61d9708cad18 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,4 +1,4 @@
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
-EBUILD docutils-glep-1.2.ebuild 797 BLAKE2B a7df8fe31f6af4c637d3021de1d15370f3e6700e3afd92f3ad66cc5f938488d19cbede09e0954761c0c6da5e1da41d6d8fb745dc311c8d38e73843b4f087f468 SHA512 c20963626fb5b31df4670f0dc4093c75de35119259092ed82ce7b76759661f8a2ca61f074d2f0b32cd13d0378b0b41db669099cf2d79336ed1ff758bc32f050f
+EBUILD docutils-glep-1.2.ebuild 798 BLAKE2B 29435d1644562ac9305b37e342cb1a23047f6c6468d9a301a1c252a6a30c1384e1fbcb64c16512e50bfb4244c49de9faa31214f5db498133ce71ec85a5946a59 SHA512 cb29b2da3317d2505abb99a01b4161b5adcc311d5fe682220d088bd8e17e137adb2c8e3929dd4c9a71da9a6a6fb663508fe00ccdd8c720339709682b549bce6a
 EBUILD docutils-glep-9999.ebuild 555 BLAKE2B 55680c36b9d22e6b61b36db0a4bdf2df89715791c775abd0a05f9b5f924765cd7e6a349606c8f16a1e7208c7cddd66458bbc82e0db4203c65d44b0ad1d51d80d SHA512 df2932d8f62b9256429b300daa6b3f352b1a44b3ae5a9c54c677fc92edd7f6370d8d8b4ce729cffddb146970f8d35392c8e8dd43165d0e6592d1891d42ee1a8c
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index 7bceafc9a455..ea6002b16be1 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -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 ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 7ecadba4abfe..58e62ee8ba04 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -3,8 +3,8 @@ DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
 DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
-EBUILD docutils-0.12.ebuild 1776 BLAKE2B 76bfd4892acb92dbd36504c855ea59601fc0abc0d9769fa1983dfe0d754baa02c2ce941deac0f9c7746b92acaaf8bf085b58457a096782d31a169e8443b2b92f SHA512 1739b6e407dc1851fe1b497a857cc4be9cde8a8a17191b829657dad3cb70fffd1b532976f84d4c9a0c87cd98c3cfa2f2ca236e231e7511af9bc20948db278277
-EBUILD docutils-0.13.1.ebuild 1790 BLAKE2B 131c60a3591fd290845f0c910cb9b8901a04a29c9da9cdefff5e0cd13a9d07bfab9e0b77e61e133710838b05122f1f01501e23fcf0b640a0408149d2ba4414be SHA512 342804a63d45e71bc96c013f7ed8ee0b6c9de12a54ce6ed2420cbd5c58a7888d83ba42212b07613ca9435c32426631d568dede611c5ccf014c92082d5df8b595
-EBUILD docutils-0.14.ebuild 1804 BLAKE2B 2712134182d30af2b61cc60f4d78a80bf6ef2dff65a6ae41842eb82489f38b5ef23b05c0c87c065d954f383e134a7fac7fe2481710951493eaf9a14a6328acb7 SHA512 796ba3648aadbb78a1a1ea74881a0fd933f57c623d6c11330aa68df468ba2f1a15d0d4e28b7a06344c637254e6fd5595c98957da06ddfaead5d5a52332a0950f
+EBUILD docutils-0.12.ebuild 1777 BLAKE2B d0cdc81c9020e0bd7164f16c1250ed3c4a852eec8526e336ad54531e2431ae5a7c342b8acdc129d07459c47668a716664fdb6c5b5a5936393d586b40c8965b89 SHA512 a1962a445f9244a0bac9b42a6e13e1a635f8f8282b6030d3c53cf00fb6b6d321dfffcd18e21ad59ccebb3e328fdfbd9186e97190a041cd99d3ac225e079a73d2
+EBUILD docutils-0.13.1.ebuild 1791 BLAKE2B a07e5aa30d91f59d70c09ef88ac6442167e92ef730b654511d282943370b0ba3ba41aee3e8b735c3767809e0d97e115acf755a51cb024d4f3fdc080ee4bf4acc SHA512 e6acb66f9ff3014b9c0710fb331d0f6332a0aed891cd70ebe8b22133ecb2a329d224e329152dc181e3df01be4d0da1f11dacfb67fb2cb6f8ac41c152d3882ef2
+EBUILD docutils-0.14.ebuild 1805 BLAKE2B 0870455aede93d6dee4b01653bd513e1b0c59f3a3ac9c0bed88d32f580b4e25d1b8ed8a34ba28a175e69488508dcf08b34ab0e9a9c92bd05ee7f10566311cef7 SHA512 5fe7c14e4983eb4fd1cf4cbec9bca3404e7a385cb8c10f4b71105c537d9baa413a7294c231bfaea80e33b1e6780d17540f28cb541c5d363cbee695ce9aece340
 EBUILD docutils-0.15.2.ebuild 1977 BLAKE2B f4e1bcb781297d27bb9ccddde008a8e80608398d7dcbdc65ec550352a6e0f69f483e197936d9f90e181873b1d4f3103c90116888996701f4f999d69bf4364d33 SHA512 d7d52542c22b91e44dc87e0830dc90a0482d1697d1caf1d9ba2ea2a111c81b2fa06aaa7873a72eb25aa3307a53e6816e43432ef17774945784fbd0658a2248ac
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index fc68b951c304..4c631d864f99 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -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-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-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 ace0765c5cd9..16747da6af7e 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -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-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-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 59140ae284f3..496c0a56b7c8 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -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 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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/doit-py/Manifest b/dev-python/doit-py/Manifest
index b5a21eab54f2..6c30e379264e 100644
--- a/dev-python/doit-py/Manifest
+++ b/dev-python/doit-py/Manifest
@@ -1,4 +1,4 @@
 DIST doit-py-0.4.0.tar.gz 16534 BLAKE2B 390a7ac17efc1938176ff6aad8fd404b8a0155e82dd2f346cd416d0357cc888e1b3e84dd9ddb19260bc9ee463e013ae544032199967a6ace7d63840a178e0933 SHA512 72aa850928c99bf43eefd827334b361243da3b26283fa358ed3f7fba72d1916b1cbe50e581d3d62ed3b4f0efb9b5d1e7f59c3dc913b2ee27e6503bf4e47def33
-EBUILD doit-py-0.4.0-r1.ebuild 940 BLAKE2B d29549a097ea9d3da347845f69e7a0f16c3ba326aa854a02c0e493e8751df44067dbf3dc6c6ad0b34bf4eca35db0ccb0db7ca4c3bc6fa01abe9033bb2fc0e17f SHA512 489f7bb2834bcf04be39b6695de4a468f8b2bfb45ce481dc4e22420700ef34cbfcd6a9dd4e3c0fd7446a4e628eba4e2ab95f31ef7b31d4db28ce31ed6f3936fd
-EBUILD doit-py-0.4.0.ebuild 1054 BLAKE2B 9cb229c574cb508ddc59dfc9f2f492116b8c3d5754a48cb607fd77694386fbcb780609ed9fd7ad0baae6f0e617a62a29ceab2b7866f8aa68b8406e9d431f30bf SHA512 a78d98143feb4ff4782eb139d0735868ac93229b0378bf8f283406e2b860ff4529f724285325b36f108e065f6113c70ead0025c3f39fb5b8fe315f87b1e06410
+EBUILD doit-py-0.4.0-r1.ebuild 934 BLAKE2B 67818864a0262fe20ca8e92b2d7f93b8b8d332ab9d2e602072af331dfdf0e4c5a27be76ce347b5f747b77809da6a3d7c893d21ec6a846d16e1a538dc4ec2e80e SHA512 5f28d94ca26d8f57ac8126ca1366ecd7c421c8db589ff84f444e423531af527b9eaa5f982818a69a51838558104db4b7882085b8320c0194ce6419b0c5802221
+EBUILD doit-py-0.4.0.ebuild 1048 BLAKE2B d799628ee0e057609e3403e2e9ded0be0a9ce31b018237772596c44733c355aa7488558ca36f437119f5655d68906a431cda2a0ed93dbe53c36aa3214a1b5c39 SHA512 2eafce1602e7f375a9cf6fd27797e9d3ab5c2b95fb3c0e978295be80d82b08573cb0133e399467f447adee2e48bfae34bf9e8bf5287260ec472468615df5e1ee
 MISC metadata.xml 237 BLAKE2B a4b0f86fd4f5d56e2c8cb4ed5cf0671ad2faa61567572fe1173d07d34fc8fd08790f53306e88c3f5135a5b099e10991358c8af0930c2207708c5a11f71e82c6a SHA512 f87674e3eea3a9ea242100ba88aabe10df84aada9aa7e6e2b4b89f0103b20dc5b4d52fa43bbbb0fd2c5356bc0e544e1955a8fa0cbfd06503b51752d571bfae1c
diff --git a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild b/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
index 9fe25b87fc93..a59f473199b6 100644
--- a/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/doit-py/doit-py-0.4.0.ebuild b/dev-python/doit-py/doit-py-0.4.0.ebuild
index 4aa92b6718e4..692ebc3ca008 100644
--- a/dev-python/doit-py/doit-py-0.4.0.ebuild
+++ b/dev-python/doit-py/doit-py-0.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 687398f1c1b7..a7d6fd0afc9a 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,5 +1,5 @@
 DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
 DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
-EBUILD doit-0.29.0.ebuild 1950 BLAKE2B 11b8fdb08c8e092251fae2d8de516efcbd5bb8a78f6992e201deece848bbd3adaddb2ce97e69926e4487844576e298b84e156fb14203bd58794e1705ba4eaaa2 SHA512 85d5a9e5fe49dd8c266a161636037bfacf1195cd9e7ce775b2edcdad8daa1481c3eb5ab3bc419ec8ef5231a25c1a797937dc4cce1d7d5655e73714af5609ed77
-EBUILD doit-0.32.0.ebuild 1901 BLAKE2B 171089ce82492afd2a81d9d95b050887eb928d94810e19e608ed4eedea5d3c2e2b61dfde843d06275f6790201d29190e0547e32837b84cbfa35529c7cbab300c SHA512 96ecc9016ff76b797b9c18c5421d25bedc0d1603b651a394e37f5c86534cecdfbe595156a78b8cd9d04bbcafe07fab47f39074cd3bd76d29f72af062d73d61d6
+EBUILD doit-0.29.0.ebuild 1861 BLAKE2B a1756f901009f5e277bcd5099fa63888b160b90d30e41425e3cae126c60af62f7ebaedb5378c2b4461c7f5a7e1057e8697d4c47e374f607fbf938da512f52453 SHA512 a0a45c33271e4dce0a7cfca52c80a2d4371fd384288249c3abfcd130d9b98256c01f1c2456be1923f592d3a10550eaaba8e578c05a5170cbe695bbbc3fc9a5fb
+EBUILD doit-0.32.0.ebuild 1846 BLAKE2B b0f30a44db4d6337bd878076c2d20c7923afa690a5f5a5af4be9f3b0c86fa77c3c9e80cfae17e5d963e372239420bd5d8ab67c91fca7163499d2db995e71635e SHA512 351036ff1b7f2a1689308e23a5506c145b98b23a0dbd13c195d19dbc571dde816e2c0e83869e981a9033a1cd2c7191c650131449ba46823b3a2a4c1150de15d7
 MISC metadata.xml 295 BLAKE2B 3613e0bcfa3a5b2d21fa4eeaf8eb44475f01a98462879581f558f1c7c9cf9ea9a8b39bcfbf0ded02f964d7d4060726c1bc4dc622ea19cf75b35afd1e1560a408 SHA512 67b65f9a4adc57efe3c9846e3088737b28b74d80025bf2647aac3becf7cf542f0dee0f32e4a5d05299c768a8eb65729373fbe4af2c72ab073df1f43040b0c393
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
index f8c1f29e2285..c4bf8bd37a49 100644
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eutils distutils-r1
 
 RESTRICT="test" # can't work as it imports nonexistant modules from coverage
@@ -20,7 +20,6 @@ RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 DEPEND="test? ( ${RDEPEND}
diff --git a/dev-python/doit/doit-0.32.0.ebuild b/dev-python/doit/doit-0.32.0.ebuild
index 66a6cbdfb34a..347f0c06dfe8 100644
--- a/dev-python/doit/doit-0.32.0.ebuild
+++ b/dev-python/doit/doit-0.32.0.ebuild
@@ -16,11 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
 	dev-python/pyinotify[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 pypy)
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 "
 DEPEND="test? ( ${RDEPEND}
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 016e0cbdedf7..4366a04a27c5 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,7 +1,7 @@
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
 DIST dominate-2.3.5.tar.gz 27875 BLAKE2B 72bac3554888427a3ed46f8e6a681ff8f48d37043fecc3ff984e65190bfd09bd28ab887168d7e56e0ce2fe8f7c986a4f9d4f47d2041524f53960a5ca3751826a SHA512 a48fff16fc3430201d757a5947c08397f821acdc07a2bd13bb77d65b0d71919726cf4f4792d591cf84ca05912223f439e9cb63e9d18b9a743b217e21ec97d3c2
 DIST dominate-2.4.0.tar.gz 32810 BLAKE2B 07dcaa1c4c748951e6f1e7e650cc25df7b59a2933370df6f6da67c22edb05cfff35f0daa9137ec7a68061722006a3de2233dd4802ad4c9e587cda4284e4094bd SHA512 a14f5dead31364543839c54a6ea4e16d796c9c99277a8fe2cb29edfb2f8259f45befcb33923fe6932cc7da25d9c09cc54d1ea1bd12cc11c52fe6ba52f4f9ef8f
-EBUILD dominate-2.3.1.ebuild 623 BLAKE2B 6f2e5912163559a7ff197cd3f487bde94f99ea1d4c64f9e3f38a4656d968cfed31a95ceb60910b6809410de6b48c226e1b81e779724313e6e37e0f4b8f125778 SHA512 d7b78a9c07cd285b074dbc3b49fd85abc5053c7563b61d6de4d6b32056c1391d1922811099e3e017f79869fa774a41f1e14e057cfb395d2162b18ee42b707f6d
-EBUILD dominate-2.3.5.ebuild 625 BLAKE2B fabe2ff042fa08e4336e03bd953ba62b9f2092205a6d7b40b20ea45b4b64c4eee076d6ff1715c697be9bfd26fefca16cdc61e291cdb1dec398bd1fe1e24c4788 SHA512 e362ca62aaca31d5bc3bbe54fa27ed629d716d6c572fd315a149b391e19db0038dd3bd0a621bb5ca328cc4a67523849ece5e2faf9030580552fb25c79d55ae35
-EBUILD dominate-2.4.0.ebuild 626 BLAKE2B 96fdc9c21e479e9a1ddf14d84582e5aa183853b3e5429f37163d96bf8dfcdaaa73aad2673bed5f5b6e9a5fd2af85224cde58f04da3a93a5a54a0377d83ebeeac SHA512 c2ad7598f986cd49609ab92ccd7b6987f56d98e5e1d9cbf21dc8eb9501270338f04a04da115ffa74a222df39c80ac88cb7f1776bd5f4499bcdc0c071acd19fb6
+EBUILD dominate-2.3.1.ebuild 617 BLAKE2B 7f811036a20b55db44a7f8c667497e7ccb9ff09fb46af7560ed3be77ad501f898279a484a0a8dfb39cab8c335f137b9283dac367c63847b5dea2c7e28db0ff53 SHA512 13e0e88e514f09c7baee97d2129092a3fc96ca068c6275dfc2455bbed9b091cb5e65fac15985cb4e01fcf2310ebc5d2bec556c888b7865d28f2fba078ee7b1e2
+EBUILD dominate-2.3.5.ebuild 619 BLAKE2B 867c9dad573790e7ff318f5e9c98366a2e7cf6b5bf0339fc96b89417f033e6cfa0405dddefbb64279a06df9201822ddc82f510f700527d4a105e9ceccd85b17e SHA512 8525372ef768c5f3dcb910ce3d053e295022cad9fcf5d6c9d582df68fba9d56ca0ed98c4f2a5594bdfb4e37e37497a076537152bc825848d72aed308b3910a6b
+EBUILD dominate-2.4.0.ebuild 620 BLAKE2B 225fdb49c6c98f5c3db19ebfd4b9f330aab7ddd2a7b085c301a626869e0f5b77155bc9bc5ce8e54bb9d8c4db3bbb7ad226ca4b06d38924bf1b0fc68563afd4d3 SHA512 18fcb25105ea2394e90128f32df6b37bcb6fed515a3f1b20269d3dff30cd6b1bb0daf989d6cdf0014fde1eb2735559cd835616c2d439366f56f74408a80ec672
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.1.ebuild b/dev-python/dominate/dominate-2.3.1.ebuild
index 0998754faea3..a9f58c5b748d 100644
--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dominate/dominate-2.3.5.ebuild b/dev-python/dominate/dominate-2.3.5.ebuild
index 71ad46f28981..392f42b82f1f 100644
--- a/dev-python/dominate/dominate-2.3.5.ebuild
+++ b/dev-python/dominate/dominate-2.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dominate/dominate-2.4.0.ebuild b/dev-python/dominate/dominate-2.4.0.ebuild
index 8ec031683b42..adb4c2b30b00 100644
--- a/dev-python/dominate/dominate-2.4.0.ebuild
+++ b/dev-python/dominate/dominate-2.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/doublex-expects/Manifest b/dev-python/doublex-expects/Manifest
index 7086a950c94e..81e1f8253664 100644
--- a/dev-python/doublex-expects/Manifest
+++ b/dev-python/doublex-expects/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-expects-0.7.0_rc2.tar.gz 6151 BLAKE2B 34d385467fec24a5210dcad53ef768d23eb5117b14679b89bcef721bf90ea380da50c62233afe92abaaf3bd015dc1bb021adedaf98c463400af3ec4e462b7aaf SHA512 94e499f01fbdc73f3f97bbfb64f299d43e3b767f8eb00eecb7c05e062cedd8fa84569cc97ef48aeca24df5ff94b1bfbb330a786500641c857039c2e7d287e952
-EBUILD doublex-expects-0.7.0_rc2.ebuild 773 BLAKE2B 07f932e90638a9b6453480aab4aa02a2b17232f44ff53fe059df1709413490a6c70a2c87c832605c81bac127a43d7ee9c524c29dabac9de1e7d8ca8c843ea9cf SHA512 3707c393ef230b3f7efc0bbd8b3c7811913c474444c3b100e4e6c65d82beacc3f0f554694b506eb42853bb69c0227a88357a8af8773cf9d764d04693ada98d3c
+EBUILD doublex-expects-0.7.0_rc2.ebuild 767 BLAKE2B 42c52d6a0f01ef9ee3de703de7cc5d8af5e6b0944b5502e3b50819c0db0f39d75054adbea32b9a0ec31ca715f568e138a342a0aff97a7f55a7ed2cea32296534 SHA512 d1666d0c78be3fe54fb1325d7ddf49dcaaee619c10694d768dd05cef3107003c320fad72ff9d455f90d6aef66223aaae3006d9e48364eaaa345194c7fb5b2d94
 MISC metadata.xml 263 BLAKE2B b2f81a90ecd9e66c5495a4c8cf4bb7d0e2dbce41a5e5fbc172f1d2ab65569bf15223789dbc356ae93774af872c3267b756eddaec82014c64f242c92455e8f3aa SHA512 0281999c203e87325a1f2688efd19a57088305289308fdf2401b775a3ffe375ceefb200dd4896417a7e1a5f436e5681143326c74635acc504af8e25d3b876c1c
diff --git a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
index 70b71e02c170..3cc77029af60 100644
--- a/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
+++ b/dev-python/doublex-expects/doublex-expects-0.7.0_rc2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/doublex/Manifest b/dev-python/doublex/Manifest
index 9cd01678630b..51eaaca86c7c 100644
--- a/dev-python/doublex/Manifest
+++ b/dev-python/doublex/Manifest
@@ -1,3 +1,3 @@
 DIST doublex-1.8.1.tar.gz 69685 BLAKE2B 38f80ac0cf68dc2401eaa8051542c91d382e9ba22ed229b3c12a192f0b180b33a5660e54f647b2273401500a3292619d918dde9b0f685807217bca40e1aafbfc SHA512 30d2b572862370da8402cc2cfa5481d3278f0fefd2d5b2f5be126a793c8e165df0e2ae6089ba321e71d994f14024b882933c1523f7a0b9e341bf75644b49e073
-EBUILD doublex-1.8.1.ebuild 988 BLAKE2B 1b73a6107a7333ad3bfda7fea89f6cbc4e519b3231317ea6500d1098733cdb099854d35c5c13c063b951ccb88a1330bb09d41f415f42c1cee0dd8f9918781df8 SHA512 9f22e055c16a046ae50bf21d5101c1b65462217b4a55b241b06f4ed2a9b2ee0eacc6400d8d6ecae0a1b93cf9295354c0a72d3b30b0544406789eaaae02826c04
+EBUILD doublex-1.8.1.ebuild 982 BLAKE2B f7270a58c8cf29d118e201a2f178f59be5ebbeb6b27d0d44ee97c80d21d83f0f761b96a59c0befc3a08acb6dca228489c5b81773b95e951616eafaefcb315d59 SHA512 954df68d0126787d5c4bb0be429423fe212e2176a4fcdaef64cc2da4c4e69295c507ef5148e406afb1a62ca96105aa58b4bb635a849c78c07cda2c7f13c9fc25
 MISC metadata.xml 303 BLAKE2B 45ebb26950f3f4fc9bc3d6d99418f544523b778c3952e91e6bfb5f37bdfc13b73d25e24bcaf199d61a69cad733fe370cd19ad0c934b3d478097c52ede1316784 SHA512 efe73a700fe748323eeb26f9203b3aab0e189c8ceb56efba5ba97a91793a5deb0ad973dad345e240fc9c15803b929fd84f26524055de1f2290f40042f318d2c9
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
index 9b3a5d5ce3a6..b52abebc97c2 100644
--- a/dev-python/doublex/doublex-1.8.1.ebuild
+++ b/dev-python/doublex/doublex-1.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 181bde59758d..6e599aff425d 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,5 +1,7 @@
 DIST drf-yasg-1.14.0.tar.gz 1270930 BLAKE2B 11c075fecf1e0742765ebcab27ffda719867e4d49f5e6f337d2d048dea26e3fd1585f42a2bc58808395ff3ef2e1c5aae912d5ab547f91be5b3f0bc3a0ebae98e SHA512 283307cecfc0c8fe97a8742780184bd73b547f9cd4e28bafd35cb1447519f65a432f112627fc7f5e9560185014d0477a9bf507c1cb9afcbdc3f58a21a7dd351f
 DIST drf-yasg-1.16.0.tar.gz 1288698 BLAKE2B cc27c5da43a20a21af8b775b891ae4f528bbe6db570f4af0008d3ca0d7ae404a20e9781985c567e880d584f219fa819709e7fcb0bcf851f5ab2ecf9d5122186f SHA512 f13abe5647df15c241abe3569eb2f12865cca77777018898240da7b2d7a583c362b4fd1f8a6bf57de0efb27a19a2e8e894edf74d83d82b4d69b80ed56c4836d4
+DIST drf-yasg-1.17.0.tar.gz 1299955 BLAKE2B a2fe34a7cc37fdaed471ce4d7d8e9f0df2f5945ead412d4a2e7ef42f8867c346f66ca95dce4f65e64854b3b4265ee99f3c97c19412084c359bb47896b1925944 SHA512 90cc3ebe0208be721b34b1f33c23caa4aa4055bd41a694dc562e9819a14a8f92494b2ab26d3993378fd56ce0542fba294405b719c899f11f30478d0cc064560d
 EBUILD drf-yasg-1.14.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
 EBUILD drf-yasg-1.16.0.ebuild 957 BLAKE2B 06d20c391a3fe65a2dd5d2bf4c3cd307f87c55cad20be6a6a8385a0c18f59d9731e56b166c018f075c2fe9c2d766a7a4d8ddb01beda5e33b8a9b2283f360beb2 SHA512 b2bfea296c5a9ccfd78967c64e85f5df7600e25756b3f3a9ab0dbba61ed1d088f86dcc587e8dacac87cbe6ffc0fe163cf6a1ee4202b163db485ac2f4a4ae5888
+EBUILD drf-yasg-1.17.0.ebuild 965 BLAKE2B 26884e8856df2fa4b7cca61cf42803ad3dc22e8a6c84df3bef8934cea4f8a29c411b9c5b373068e142a0b2535bacef838e5b7e4b867b6270fbea6a91cf667730 SHA512 455bef90aeda0414b20577236975013a26d3e94fd8614ede9c11033a558780f7359128beba3f74d5e9b97bc376ae7289fa379f97dbfbe52e10742e49a73cdc29
 MISC metadata.xml 363 BLAKE2B 7adee65506aa3e63d7eedb2ced7a91f3ebb34fd2654da96656b31242cb4017da34e9986246be218841eb0046beb590fe3381dbd49bbdd79eb4e965b27223f109 SHA512 1cb8c63d5549c77ec884f5d668e8270ab7f73097ab25d1fc19fea3150b3ed56d7fbfb899d5418c3343cbeed6bed219edb892d3a4b630e900ef00db19103b3f3c
diff --git a/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild
new file mode 100644
index 000000000000..db8d6123062f
--- /dev/null
+++ b/dev-python/drf-yasg/drf-yasg-1.17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
+HOMEPAGE="https://github.com/axnsan12/drf-yasg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+validation"
+
+RDEPEND=">=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
+	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.8[${PYTHON_USEDEP}]
+	>=dev-python/django-1.11.7[${PYTHON_USEDEP}]
+	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
index 914cfa5869ed..3884f94335b9 100644
--- a/dev-python/duecredit/Manifest
+++ b/dev-python/duecredit/Manifest
@@ -1,5 +1,5 @@
 DIST duecredit-0.6.4.tar.gz 65763 BLAKE2B 590e5736a2a65153078a515fcba64dc3a34aa058311276a4144a40788140be563bf689956067a60179dcecd4b58b371c811dc9b50a0c7e21f6cf5d3193f2d17e SHA512 4a11c743be40c1ef14e73d06ba4434964f9a62f6c19c8aa18b337b1f37526e770e020e672bcef5fc920a64c2a0f2a0eccec6917ec172078c4d3ea24ec0e1683d
 DIST duecredit-0.7.0.tar.gz 66131 BLAKE2B 3f32c1a4e62d4650d6914f4e124907170a50d63900fbb009b870b3f9c9eace27b76500e655cb74caea0ce22cfadd62f81a84a438c1cb82092502661f1d4e0c03 SHA512 a32ead3e0710323d5ab3283a3b2d1cb03e03bf925f78fdb3b5182079851127b8b674492bd402667e57ec113d1ec05f9c3490642f8d0fba6a8f3ddfd706a052c1
-EBUILD duecredit-0.6.4-r1.ebuild 547 BLAKE2B 013c41a8428b5a609fe162cbcc716f9c3b25668cdd489a7ac941120da0b10515ff1e05f2f55db0182033bb3937eec712393fcafb9520516a12812ffeb9cf36be SHA512 d754a5a24d3b7b1598fc4f357b492fe11a43086bd229000619c2f6cf4114ba10d5376efbc3dcc762bd93d7c71fd4952c4facdee73f4bae18a058a7462f61d4ab
-EBUILD duecredit-0.7.0.ebuild 547 BLAKE2B 013c41a8428b5a609fe162cbcc716f9c3b25668cdd489a7ac941120da0b10515ff1e05f2f55db0182033bb3937eec712393fcafb9520516a12812ffeb9cf36be SHA512 d754a5a24d3b7b1598fc4f357b492fe11a43086bd229000619c2f6cf4114ba10d5376efbc3dcc762bd93d7c71fd4952c4facdee73f4bae18a058a7462f61d4ab
+EBUILD duecredit-0.6.4-r1.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
+EBUILD duecredit-0.7.0.ebuild 537 BLAKE2B 01bb53735f1c8685d7783930ed654e1eb6422c3f5160fee99a37b0361178e64f263a2fbe1cbec59bb9f46010068a8e7dad0fdbe86f908c65ca1dbf61b5c49665 SHA512 a53dc1a960579476201a6ba3463b5b5eb42378e8341f4de84b37a0e8d349f2fd76e95ca9e2d62517ddf1e2ec444c44676018f12d1df12b5138d013dbab4e210d
 MISC metadata.xml 433 BLAKE2B a1c9500ec6e84b027e6d0f2ec09d5a3b1a51818858401099e047a68b37fae0be7ba2d0b91b0ebe6509d992aa4617cd1a61b5b07a72e0935286e669853a7ed578 SHA512 7138c51966df35d8cf946b13e66b45eeea22e9d89aa899b14523bdd1b6871b3d78e1d2c8d76c989fa27adf0d1b8b5245c7b5ff3c735ad5b0d8466deb12ee26ec
diff --git a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
index 3dc5dd555627..7e4a4de6e9d5 100644
--- a/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
+++ b/dev-python/duecredit/duecredit-0.6.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
diff --git a/dev-python/duecredit/duecredit-0.7.0.ebuild b/dev-python/duecredit/duecredit-0.7.0.ebuild
index 3dc5dd555627..7e4a4de6e9d5 100644
--- a/dev-python/duecredit/duecredit-0.7.0.ebuild
+++ b/dev-python/duecredit/duecredit-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Publications (and donations) tracer"
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 54e5051ebb6e..f3b11761ca6d 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,10 +1,12 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
+DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.19.4.tar.gz 349813 BLAKE2B a14dc2dccdb68df639a6a4bbf3aa8314fe831f7086573d7cd194f7426eb0021b2faa1663edf318b37031be90121e64a1186c381bfb2cd32a3824abac2a3aa52b SHA512 42aa7d35a491f2d98a8afae6e0afc68089f9d37dbd706961359f1d624a47c627dceb73bb614b608d29dd28faf87406f2e81b1ddcec607aeb0fabc9744b733232
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
 EBUILD dulwich-0.18.5.ebuild 1342 BLAKE2B bcab56fb120feb09b05a984ec23aa441d4cb7099732e653a920ee1529b68c202691835fcdf1dd5ceec9a0b3309d9a0dfedd1a9e528cea1d525e23b9a87bc11a6 SHA512 ed328e30dd8a181492afdfe2431d75a7f86efe6f54a2665543acbda2348d13daa9e48f9f6f0e2c3cad8c247196006be6a382eb7c0dd8099ff983e89bae9f3069
 EBUILD dulwich-0.18.6.ebuild 1342 BLAKE2B ee4cad0a87e120b18a1ca088328082335b8f9d62f9d3789cd4e80cc15c94e898c081d539d27adca905131a4536d06905cdd275e10ccbfb2b08bd9cd3cea31da0 SHA512 a970792ad3485b9e0e4c85758df6cd272c3379e10a8e38dadb5450387aacb60af6ee78e3c8ccfd3f04685ed9227a2df84f418475aee96398cb9e6e2f4e0db5bf
+EBUILD dulwich-0.19.15.ebuild 1659 BLAKE2B c72f9a2e17d4a5bbc9d90dbd29ad1bf49571d9458105436edce07b8e129a74943547d3332c288e6df19cc3770b6d5fa25fbbc6d5ae0eccc14466912fa8be4aa6 SHA512 fb9735cd206378ba380eb4bcecaf2d6370b2396e5607ab3e801b29ca1aff4681101433a8ff547cc404f0bc7ffbb7598872afee9c09195c110d436ad04a882144
 EBUILD dulwich-0.19.4.ebuild 1650 BLAKE2B 4c5c70a4dd825dce918cb3a306b019dc963bc8602b8d9ce22c0f4a00eb9ba4c13c306c23577f7f9e712f0c50d61e96ca7f9847118c1469b3b3f78085468c9bb8 SHA512 667f9b60d02aefb2ccd9fae390f2cb9af5fccd094fa378493d4bc9fa20de00f2a0ab689d65dcb001611bedcb94b98ae98c042da951c20c528c557bcb11e5a978
 EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15.ebuild b/dev-python/dulwich/dulwich-0.19.15.ebuild
new file mode 100644
index 000000000000..98efcfd48ea0
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.19.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# One test sometimes fails
+# https://github.com/jelmer/dulwich/issues/541
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
index 6adb619b614a..11442569135a 100644
--- a/dev-python/dynd-python/Manifest
+++ b/dev-python/dynd-python/Manifest
@@ -1,4 +1,3 @@
 DIST dynd-python-0.7.2.tar.gz 184981 BLAKE2B 826a46c7c920533dbd64f310ce6136e37f5d3f7e2bb1190977c72e9c7b65aa9957547b02ca92f5aadc1db268ca4ceda9459036e9fe24a57e090f4312645d348b SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba
-EBUILD dynd-python-0.7.2-r1.ebuild 1561 BLAKE2B 5dd010bbcf489758db2829a6b8797111f3876b2bbd1dfd3a8f7925ff9d249d05b8f01e721cf525a778c1139e90c1020f95822018e1189b85c1489bdfdc1fc140 SHA512 65c28ea1e930b4389e9f37de825af0b1b96a44ebf79b9e14eb85fae3405622e8cea2ac6972246c6e2456b77203eb0dadecf3bad97c1fe9ae44d3c7595ffe74b9
-EBUILD dynd-python-0.7.2-r2.ebuild 1552 BLAKE2B f972e9d4ba27bc6a257fa9a0c35e6a9e0afc18d2d35b1e60733a2020b99707ec9ae83ba25282b1e59a20cd813f4d468a5f4aa863080118e564668edfbb742a5b SHA512 8410943435e5566ed8cfcfd52472b70fae84d8a8c5a4d7b12289f551c8d410c68dc98ecea8289314e6cacb3839bf7ad84f821284b44eb8b6f2f37b4b42f5bdfd
+EBUILD dynd-python-0.7.2-r2.ebuild 1550 BLAKE2B 274325ade3778ef1107bba3320248b9358a71eff03493ce134211fb2dc869b33242bc25396fc88de37e9c57db43926fb3927271895df5419d78e6c823706f2da SHA512 ff672fece6a1cc4ae469f46bdc7f9b66a0461317dc90e1e5bdd3d79a9aff8661aeaa3de59fb97f8934d09ab033f21468447bcf7ba4969a4464627e20ac967bf5
 MISC metadata.xml 529 BLAKE2B bc365c7019af30defbcddf4eb0c590666199d43acba144d4b42f21fecea7c572d6122b60bd0b767437ec4b1887e7d3bc50c50b83f88deb99e627cb67030ec95f SHA512 8500904a91a51d552ef6f0fe17486b8d935bc4f50860120376ed40a31c002bda8ca66b5c3c8b8c244dccf659cbf8574f1e031e62a0a0b870af133062055a25b9
diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
deleted file mode 100644
index 019d4022e491..000000000000
--- a/dev-python/dynd-python/dynd-python-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-# change each new dynd version, to avoid git in tree dependency
-DYND_PYTHON_GIT_SHA1=8cdef57e71c784d7fe1f3f97a2ce2ce5727a89f1
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="http://libdynd.org/"
-SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/libdynd-${PV}
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	# remove the version mangling from git stuff it requires a git clone
-	# rather force set it a configure time
-	sed -e "/--dirty/s/ver =.*/ver = 'v${PV}'/" \
-		-e '/--always/d' \
-		-i setup.py || die
-	sed -e "s/get_git.*/set(DYND_PYTHON_GIT_SHA1 ${DYND_PYTHON_GIT_SHA1})/" \
-		-e "s/git_describe.*/set(DYND_PYTHON_VERSION_STRING v${PV})/" \
-		-e 's|-g -fomit-frame-pointer||' \
-		-e 's|-Werror||g' \
-		-i CMakeLists.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	PYTHONPATH=${BUILD_DIR}/lib nosetests -v || die
-}
diff --git a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild b/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
index 190b19a824e4..7fe6afddb277 100644
--- a/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
+++ b/dev-python/dynd-python/dynd-python-0.7.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index ce9f7e2e2c01..67dce5db63fc 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -4,7 +4,7 @@ DIST ecdsa-0.13.tar.gz 55579 BLAKE2B b8fab652527f945820b87931477d431bbfa605ec123
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
 EBUILD ecdsa-0.13.2.ebuild 609 BLAKE2B be6b57d79ee0848635311aa32c39efe22af7494eba2a10f8cbf60aef190add07e1414238deaa2258847e1cf667ee845fe1a296d751a9ffe1922b7f1b59ec5b1e SHA512 5b5327df7fd715c7fbbc1e0a3dbabeacfba9ed59277454312f7fafd61d54513f9acd1af2d0711e088edcd3b3c0df89f145267a59101098cce24bc62daa3cf7a9
 EBUILD ecdsa-0.13.3.ebuild 609 BLAKE2B 02e155bbf17c08b5e306cbad75cdd01b8d10a3454ed9e41e8b9efd3f6d72e17e293dc8ed32a68e8dc6b26b8baee653f4c1c6a251578841dfe8cfbf4c8e97e26d SHA512 922f64395e2faa66c1afaabc695d0f7d40702fe9f9ac5f158a76050369ea7e44b216c743e9ebf0ea6e846b21b49f85e946c4d298b89ae47d83a5528e7dfb69f3
-EBUILD ecdsa-0.13.ebuild 600 BLAKE2B 45fea4880fff892bcf65574aa5f614ea52a0b5649b79300ca25899144796f9433501dfbaeff96e0c45eb306fef9f316117314ccb341ea78609c3a5dbfce1b45d SHA512 564f12da12e9f54a68ddcb5a7dd23f226287eb73cec0d9b9db1aaa148cc19f9658bb681df49921d53c68b15b46c434de6b5c126817ad43eef017ef870b3c4dd6
+EBUILD ecdsa-0.13.ebuild 601 BLAKE2B bee8cc9f10c0733855193e1514e9e2d62565db05e77e485c55bd1b87bff62b4f40031bf66a0abd3df13c75d60a66fa6af79ac996a3232e684114d68d313a7516 SHA512 5789b42fe179f3cc74da8568f7c4f1b6d75591c2eb46dbfd9aeb2a4f9a1ede3dbc37c73927d3b740062ae74c00db7147b5ffdab64335b70d11017acf6627d657
 EBUILD ecdsa-0.14.1-r1.ebuild 908 BLAKE2B 6fe4e0c18cc0528bae3d6963aeddbafb2725d1d2de899467298bc01d7e6febd493fd34a3280f3b93a0928a23c495d95d04635ca09bacb4df2610da8df22c28fb SHA512 97e7b8b787d78a7581e6310f4f54c137304488a2acc3692d1302dbed2e3bb1a2e284d8cefb6c759dfa309417fd726180d1ccd7d9d67102bb150cc7ae9466304a
-EBUILD ecdsa-0.14.1.ebuild 600 BLAKE2B e9251658ed3b1732e4d6453255caf7ae00579c6b072a77741650bd5a5dc0992b91ca4072127d0ab0bd56d974cafcd1e68b890f18283b81e335dabf5faa45fc05 SHA512 e915204a452942258381e149a56d16d291e7e65daf0d450f3b00e0499fd9010a8170d1ed4d769489835b3b1265c35f43cc8e1a4d731245d492dee1a3b47813d3
+EBUILD ecdsa-0.14.1.ebuild 601 BLAKE2B 56c0e309d09888e778062c7755001ffa9fae136cf7c8eca487b8e4c35ee4fedca6742aa53c5afd21dddf6747a4752eeb7771f3fd705d6aaac50e2ebf2c5c974c SHA512 ca8455eff4bc0a25432e2e2e63b361e5bc1b83ca1bf15f80a5c1bc856de17af333040f28c9d28ec018910ef0e4fd350bdd5f492d96d267dac78e81a107d43bc3
 MISC metadata.xml 519 BLAKE2B bc72643a47665561e24df33ae2964b153c329c7b5348baa2f1eed5d5c1b4942e8b7b32664fcc5431bb5d91f1be4ba31460c7d6c8bb68a73514aafd4fa09f850c SHA512 20703e64bbc5db257c79594875a9982eed25d5d66971c9d2cefec7e5e663b6bff31ebe6768496a3b6ddd80604624cfbb8cbfd0a0086010cd53b18415faaaa62a
diff --git a/dev-python/ecdsa/ecdsa-0.13.ebuild b/dev-python/ecdsa/ecdsa-0.13.ebuild
index 79266959c4f2..32fbbba6cc3a 100644
--- a/dev-python/ecdsa/ecdsa-0.13.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.13.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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ecdsa/ecdsa-0.14.1.ebuild b/dev-python/ecdsa/ecdsa-0.14.1.ebuild
index a3723e397811..84697bd1c98b 100644
--- a/dev-python/ecdsa/ecdsa-0.14.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.14.1.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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/editorconfig-core-py/Manifest b/dev-python/editorconfig-core-py/Manifest
index b2d8a7b32d56..3e23a2f2988f 100644
--- a/dev-python/editorconfig-core-py/Manifest
+++ b/dev-python/editorconfig-core-py/Manifest
@@ -1,5 +1,5 @@
 AUX editorconfig-core-py-0.12.0-no-cli.patch 503 BLAKE2B 98c71ac5fba08ee58d83dba92c37ce4a1d232d96b5f0648102da5b749f382af93b45a59b73d7a81c322937dfc94566f45b6203bea3b286ed49e81b69fa590667 SHA512 3c8802b4df1799c5456e30cf2f62d8c7d5b939a935bd511e2b1dc4ee681131ea7da114038e67efc1938b2c4c110c11dd4cbee0b77024d311e9b50585c364b591
 DIST editorconfig-core-py-0.12.0.tar.gz 24801 BLAKE2B 10901b1595965139dbc3aa3227f335c2128b2ea83204ed88b0e799021f7c215fd13c3e2246cb9197ecb7c918aca2d6e9269d94298aa0665432ab091630a29dd6 SHA512 29c5f58bd7293052e4b1fbfbadcf4a148eb939558494d599bafd46151a4fb5af9cd07dcef477db9a709a0ea63dec0dd7e9d4071779f8ca6e3bd137268cc22f72
 DIST editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz 7900 BLAKE2B 9ebdb5e522948bc9e86ea84435ccaa11585a8a12f4cd6fe54c64d78917281c913568351767d8077623b1196d84206d1c2d0126a0510f70df484c1b55d829028b SHA512 ae5424b4926d6cb127cb3da473400ced4f7ccf224f7baa8bc5bde0317cc045bb7b99738a56efe5fd0e5a0fbe39b997b9fb1739d24713e7f83b58e987c5e56a32
-EBUILD editorconfig-core-py-0.12.0.ebuild 1373 BLAKE2B 72319ca8bdc789e70b6a21667850f9c20cabccf256ed930efc8daea5ee04a0c2587a040af004696328231e64033b0ae40bdfcead8b8241246ce73febec4de505 SHA512 b3cb110d35470c69e0092bbd5934b584586d9e37e01cacde57c03ead791d76fee625f17f8608ccfc9c66f731ba41c4a166b7e01196ed8e203cd1efd7202af577
+EBUILD editorconfig-core-py-0.12.0.ebuild 1363 BLAKE2B 89ffc4327a3e3517c0bf6bb02186985b3e1f6ab6598f557d7168143b7fa89dee0feba2249db86ad550c28e2b11b27582c6297a2794a9b3af25cbcdd7ca3d9381 SHA512 e0564cf1153f58059c6ec3148fec620544d4f8bb74d5e19837f7b4c463c965a246a1442933ec42fa4cc98bc48ec960d067f141560e7039e6593474c634e5622f
 MISC metadata.xml 679 BLAKE2B e9d5e33c647f61258a1d8a691f98716030cf425e1b4279a6b05a0151dfc7ec4298ae2070f60316a983618eb9628b5e3c8e1149783cd7768547f8624cec504a87 SHA512 ebac6fb7f09e22832a5436aba0b445775800d377a794c0a5b32302f2d3baf0c6c09d70685bcd12f21e084b290915a43d729cd94b8e92246259446aa17548710b
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
index 98a568d05ada..97128a013059 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 TESTVER="abb579e00f2deeede91cb485e53512efab9c6474"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Clone of EditorConfig core written in Python"
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index 733082dde5e8..ec3a4e72cdb3 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 1488 BLAKE2B 54dfc4f21f545704f296e3b692b04048642c2c2c57f8f492f246d00f9e701650099d1f17abef3c6dbcd3ed77bef757754e84fa7509e0b39317f9cd1d86dc000e SHA512 1825a98fad4cc248d4b82c7e9de2c99f7bcd283e0af2535ae374cffa6a12a365cbaacad078878104e206da5b1fd920dd6372ebc1d4f328fca1754dfca0a22e27
+EBUILD egenix-mx-base-3.2.5.ebuild 1489 BLAKE2B b2667ba657e88fa0de4024e3f58771a7158c30ae4ea5a7668edb4d896db015ea511df5e4f582e9a3026582381cccc5eabf79808f9db32d49ac0d7f41fb46f5f8 SHA512 4c4ab722df7a4dd2bbc3dc4e3a876ff956c3712f4a43c326f38bf5699df44dc35b43268afb7bbffb5aa39ac80de2dde1d438f2db1c6a1f7230e973e655762780
 EBUILD egenix-mx-base-3.2.8.ebuild 1592 BLAKE2B 11e78d0f9766bc4ae701780ff8538f823c607ffd3ec23112d4ed65b93cfc6d625448fe74c0396d90ca8d8cef7a8b473619870d92cff4003bf45c62e54db97b0d SHA512 0856f5b62f4bfae5fdcc7e410f7d65cbb0b584d065bea3235a47d826ce7579d517dfafb0f78cdcdeca4fa01091e294f9e0354563545ecfe08b9b2684f0f1f7c1
 EBUILD egenix-mx-base-3.2.9.ebuild 1594 BLAKE2B e96e4a7ec6727220ffd583b014784509544f892bc5b3f6c318c28d66bac46164e275817c64302a2945a5b262de7bfd517f6104566f6fe8842c709c1c7ea537c2 SHA512 d8217829ba5c423e8e79b172ed9d57b616d472bbd520df5ad0dd3f46f159948a841c26e7f15b9f74e90831f69926c698506bd96cf74d2ac2d4e45cbf98f966f7
 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 3ef83c9149a3..4dab72428952 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
@@ -12,7 +12,7 @@ SRC_URI="https://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 ~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 ~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/egg-python/Manifest b/dev-python/egg-python/Manifest
index 32dd9736d12b..c0ca803359e8 100644
--- a/dev-python/egg-python/Manifest
+++ b/dev-python/egg-python/Manifest
@@ -1,4 +1,4 @@
 AUX egg-python-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD egg-python-2.25.3-r1.ebuild 1014 BLAKE2B a1af026518decbb0c4d89e1be788ff5a870609ad505da6d4ee84ddf02c7a9453640be2cc11d203ed91f3fef277679e7ad4115273e2e794bf0fa3f8761a40beae SHA512 33f3588890cbcc15d504f1473a99d43e65619ff4591f5f3e9f8b4d9efda2fc3926d5c51b1f42450addab2a495b3e824bf5bae3c9f8b6ddba9b07bcdd076d6687
+EBUILD egg-python-2.25.3-r1.ebuild 1015 BLAKE2B bdd68a745e96163df60c3779c909c09e193d2410a0eabdd64164ca74c96975424bf5cadfbf896438b9e42249e2a0beefb3c81630dc7d1726504d79f55c1381ec SHA512 a97458e84f17b525bb784bce5d5939109d7676bc10d6f0063cf734c75315fae971f6c749b376c209b7bb55876e910203fb7d065a45bc478102ba18ea86efc188
 MISC metadata.xml 364 BLAKE2B 3e552b7268e94c998b77887abc52fc4e40d3d00a58631b8369c63d47d0b0d5a7248738d7149fbba2023752efb6407280afc49b3876fafc686086110d4a106e4f SHA512 6047332255074115daadcfdfe865fc811c09463a5f4e9f85ae36c52f705b413ac51d4281c18d09652115551603f8c5b1e28bb41cb8db3174d6cb4d9a0c368adf
diff --git a/dev-python/egg-python/egg-python-2.25.3-r1.ebuild b/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
index dbdfe39407f1..b439bdeafdf8 100644
--- a/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
+++ b/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
@@ -14,7 +14,7 @@ inherit autotools eutils gnome-python-common-r1
 DESCRIPTION="EggTrayIcon bindings for Python"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/libbonobo-python-2.22.1[${PYTHON_USEDEP}]
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 0fde0965bab6..ec8f155cde1b 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -6,9 +6,9 @@ DIST elasticsearch-py-6.4.0.tar.gz 97217 BLAKE2B 376768fab9bd7b4efd98f8cc24d4bad
 DIST elasticsearch-py-7.0.5.tar.gz 110079 BLAKE2B 89f5f7434fae0c4d20c1780c0979a419278fcaa23f75d5241d48c695905e566742fac5651387f0b1cb665ab6e9cb299406ee7f0157facc8c4cf2c1f1a4a3e5d7 SHA512 c4224cee6f7739ad932036f2afc6ed20ead16829d42f40b79e08d6714b4a247f019175739fb5a93bcea5bba391bd9f54cadcd31d42ff9411da414d08c140049b
 DIST elasticsearch-py-7.1.0.tar.gz 110917 BLAKE2B 774db2356b8f75e2b4d739d2c51db22db63326ec6a51c9ee29481d86848b7bb28aaff6e2a43377e7fb2584677417a39d107704391edba350982025859032e54f SHA512 af6dc6f200190e57d37d5c771da6cf9b3cbeee8f4bbffbe0b9466fe88496b9c45d44ef40c2d5379e4fa9cc54ce61c46b35a578e3ae99b82afeacd132bf2c6ad6
 DIST elasticsearch-py-7.5.1.tar.gz 116602 BLAKE2B b9ae9cc7496e911d102118a6e2684e8942dfc0f4e92d3cd9cf6429c7c7a48521ed5b61174ddc4fbcf8001c30e74fe11649e5ef13e90ca32307290ae0bb8d0f6c SHA512 9a82715031fbe60e5d795ca31cd7ba3fa653b3100e8d1b53e0088c55ad3ed7f4c4309a07327d41d1ca1abe2fdbb9f4b6e97d6ab39ae5dcde46b7c2b1642a92b2
-EBUILD elasticsearch-py-6.3.1-r1.ebuild 2592 BLAKE2B c46d606a61e72ee5418a471a41692a7934a0f10797f2c1a2bbc9fd05b702d23e69698f79a406f58731b97d99748a55d45e8f265e30cd89a1ec2061d7d573ef5f SHA512 a1e5df32436dcbde99303531969ebf2caf4a3640c81eab9707b4e42b3505dbf63ccc37ecddfd3c3ff983979647c771f408ffdd54c205bb59a37699b459703e52
-EBUILD elasticsearch-py-6.4.0.ebuild 2604 BLAKE2B 944a12e2f85742853908cd679e20a472646ffe01619942c376879b6ec43ed0d19534dff2a315c1c5c57a5bdff3386d2329a1c47974fcba659b30abffa26394c7 SHA512 cb3145f486596cbc1e599651421194a340cceceecbaf7b33bb1ff45a9854ce1522f17646f72b9558fc5f6d49db7c098e93603bf0530c30d915d9951f34a0aba7
-EBUILD elasticsearch-py-7.0.5.ebuild 2701 BLAKE2B b6fb0b2249d8c010d52d30fba4445dabc7322f1376b5f5d394bdd6a91aa691a5789c8986b235a2e4368297ab9058cdcad75aa9f7571db6a459a1082d6872f704 SHA512 0c0e5cd922d2c062c22c6a106837e308c0d32d302f14c5128080f11a4ecdc5847b5bfaa12a4a5d9629091b6f5dd7e2f30f1f9bcb4a890bd96e74b322b24ee927
+EBUILD elasticsearch-py-6.3.1-r1.ebuild 2582 BLAKE2B 56e94cb78b7ce683177ed012d2aa18dada9c145bb44a7918f5fdd00531290209d8779dfd0b97852bd2e5766922368a61b3450309d243ef14cdded01f014e25a0 SHA512 fd373947661fe5eb1391d80ec3324ad1092a57ad9fb3cf4745459a900c5772004f07edea9d0309ecd9447156c44100569752f6c442da53f67316f698d827b394
+EBUILD elasticsearch-py-6.4.0.ebuild 2594 BLAKE2B 55110bf4bb43b706d57d6475027ea8de091792efeddc76ea03475d482c7b51363dfe506978c21b448493f8545fe260d2e1eaf353957144b008952caa5ba3d45e SHA512 3c41a89e43765234d07450dc1f00eeddaf0d38b59c5f408f71336c13ced2445d777f4a17b50f45911b352b54ce44b0b3bdc29d21b03e84d6c4bc32244462e3fb
+EBUILD elasticsearch-py-7.0.5.ebuild 2691 BLAKE2B a8b3239c5a077c3d87e7a6204ed23e08e23031c3643527c8467b0ef46145fed053cbb52c8788407d21025016ff6b8598d9b436da32c76f821959470eff09d5af SHA512 c90ceeb14366038993c4edeedefae49cac43028d421d9785b9eb8c20ad68a0efa4ebfd6711a725530a59dcc3d541f9c99f9dbe89255a9d21eb884b83960a2e5d
 EBUILD elasticsearch-py-7.1.0.ebuild 2718 BLAKE2B 63dc7c0fc5922e5bf0c40c7e9091c50305d22b92a18e495cd2c835ec70ed8c196430a25de999e0e3db52ede926e8cf9cbf01fd074e28f1a3db4109d6c87aefd5 SHA512 7556ef33ebe7fabc7d31db018dc8e5c0f01d27a71f6e0f7e50d7b913075bf530591b602ff77e7c09fc137631a0328ed739f3e8e96828a82333287958ca3a6351
 EBUILD elasticsearch-py-7.5.1.ebuild 2718 BLAKE2B 14306f7a0f84989c4cad1c511032e0dd40647fa6170d516ba6a15b4d66dc16a6aef17b14d5603fc1216b8df5432ac27261016b974dd38e439a611ae5f6d400e6 SHA512 2b726c8e3fb031286937001c554d4f850acf9d471bdb613f7f163df50d0ae7765387147253dfeeb400903536998ac8092ce0874bd6b62ac23186c612ba2f2e05
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
index ffa0d68037f4..6ad7d0907f0d 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 ES_VERSION="6.4.0"
 
 inherit distutils-r1
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
index 635ff2c7760d..e080218c68ad 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 ES_VERSION="6.4.0"
 
 inherit distutils-r1
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
index 78f5b4415940..46c6f8620a38 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 ES_VERSION="7.0.1"
 
 inherit distutils-r1
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index b40d8c3e6b4b..1aab9ca58b53 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,3 +1,5 @@
 DIST elementpath-1.3.1.tar.gz 100631 BLAKE2B fb3238006afb5100ad03314bddb16e77ea2fc7a91acf95e479ad67308456f761c53c64920266aa251a3f1b9bb6c6bebe39faa6413dd840a19ca1e9b3293f5253 SHA512 3beea19fe431514630f3957d2005d5883fb496a7192a47ea593d4b0df7a0050a19756275af7f85c7807c929482ddaacaba76ec0f3a715b6779d4aec125ee5550
-EBUILD elementpath-1.3.1.ebuild 889 BLAKE2B a2d1326cd7723cca0a7d05b0c4b5b6663cd5271133f17233659ddebb2d86a0146d7bbd1fa07ee4ab2b2745c07702aa13826b511020fe9a9d419b31b365e34a7a SHA512 b57e0f3aa625a43c3a42dd760744b1b34e5b4b20f340b870729a75cde235661d18ac2c6a0d9df93bbee115999eae05efb0d11bc68a916ad9e60cc4543dd8711e
+DIST elementpath-1.4.1.tar.gz 106008 BLAKE2B 9613949e65d61425d8ca04a2af95e162b603202f521cd96a3e40da4834149890f5767841bc9c7eac45d27902fdd79bac933013aed27767a840f48e889bfe174a SHA512 b83ec52549c6221b4d4d0912100df700f7a36e1eadb5491cc61106fc98ce36370217dae133c6ff0b11d1522b5ad5b9765aa135b0ac7310a9c922148e3d92acfd
+EBUILD elementpath-1.3.1.ebuild 879 BLAKE2B bf537c0862027768825a05d58edec7607ec3ea1626fa75308e5ef91edd40b28e22645b6390d4614f50b930cad833cc71be37ccb6a08acc8fa4e9143b1c3dbbc8 SHA512 70d68b99032b87ecac19c982144f53e3bce73a54f0e6edae3e31e0c1e8fdd6ab3a2756964eb4ff9bbe9f0a0c74fe1ab2888c8a81ae97198e62d5ebbcb4c08402
+EBUILD elementpath-1.4.1.ebuild 887 BLAKE2B e37b499ec23e874f091d83c948c6a7bd52d5a14afe59dad4e948a30f959d8229f12d716368bf08842209595505d916b5da65916c8ec6bf78025d8ff3bd8ec7f3 SHA512 92d53a2488895e7c604cf2ec40969266c8d35f40a7030670f9e5a0b38ba330128178ebdb678d0f7a2e22a51a1c4917fbbf483658a5aa4283efbf730deec98bb9
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.3.1.ebuild b/dev-python/elementpath/elementpath-1.3.1.ebuild
index 5e43008a1b0f..a87888e16eea 100644
--- a/dev-python/elementpath/elementpath-1.3.1.ebuild
+++ b/dev-python/elementpath/elementpath-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
diff --git a/dev-python/elementpath/elementpath-1.4.1.ebuild b/dev-python/elementpath/elementpath-1.4.1.ebuild
new file mode 100644
index 000000000000..5ab8daaf3003
--- /dev/null
+++ b/dev-python/elementpath/elementpath-1.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# this test fails depending on system locale + requires some random
+	# locales being installed
+#	sed -e 's:test_compare_strings_function:_&:' \
+#		-i tests/test_xpath2_parser.py || die
+}
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
index 55394501a70f..52fdeabd3b2b 100644
--- a/dev-python/elementtree/Manifest
+++ b/dev-python/elementtree/Manifest
@@ -1,3 +1,3 @@
 DIST elementtree-1.2.6-20050316.tar.gz 41752 BLAKE2B 41bb745d5a5f0eb0b3da96b3c6eccf97c23b45d2c886e0a6160fdc72c4f299419b2e7f1e36a6ef85d329d2b44e58ad74e105fd385fd3318d77bb6db89a72f508 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf
-EBUILD elementtree-1.2.6-r3.ebuild 958 BLAKE2B 2468d6071c0736b3d6ca22c273f14e245e15242f75b5fe42d3255768464eeaf7e9cec450d87e6fbdd2b9dffdfe73661a0770258d321490e1844e0893bc716cdc SHA512 808ab3236c8597a01fca2690bab1668c3e3fcc4d95fdae191af4637d38b5e451eb8570d5a8679ed164f52e2edcb6e39249bd9bb4a1123fd6f50cfa34e34dfe66
+EBUILD elementtree-1.2.6-r3.ebuild 959 BLAKE2B 1fe1ffa479718dafe687973cec9d64ac247201aff222631e45ab6e07b9fe47d03f6cf754616af58fe6711f24e5e17f9c6329819a763685b2b0418e3410841b1e SHA512 a852f8bc3f34910264fed13c790e04872c4e29306f5e0e6d58470d1bd35ef0594582d110abe2d0563ce059e3431bac4963cc02d93b149734cc1e260bd8d5aa2b
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index eea00a8d8c14..406ddc93a24a 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="ElementTree"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 2724a68c90ed..c3c487d573bb 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -3,6 +3,6 @@ AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f585
 DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
 EBUILD entrypoints-0.2.3.ebuild 1357 BLAKE2B 11258860058a99be69c2416ab04959b0ea2a8d45427eb2d499bf1f746c0d381ea8426f33e1cd96093d401c9ff2b0a85ec9465c1d6cfbe80666761a3a3664d519 SHA512 bbeeca80307a6e13fccf9310581713bd9cec9e1652ea3056778234663f38d72911b5c54321c52d7ce8855f198c5142b3f1d559bb949c598336463c99aaad7622
-EBUILD entrypoints-0.3-r1.ebuild 955 BLAKE2B 7b6afc9b86f318ac85da19b36730fa989485bd8c4f24e073db7dd7a80036fecd64839aca7895579680b7e6a8caf6817a736e95d622959897e057a959e299d8e9 SHA512 bd439f36cb0c68eae57bf16e2407370bbe53a3f29c3d81022e779b4be73a78754939fcb8d66bd5aaced65ddd284ed9c15abc6cb609c521dc25c99ee50e8d54a2
+EBUILD entrypoints-0.3-r1.ebuild 951 BLAKE2B bac82ab1415336e7c3ffc793595cb10001b0d5bd0097d5f4eb6cef00eeb0d022f9dce26f41acae9b5fb316c3fe1735937a104a80429ce67d30648206760f43ce SHA512 2cd1db15ff22bd03b87698dffa32efb324d03c73068fd4809defae4133bbb4fcaccc8665437aef0bc28283781a9c65ef8ce68c1d8bd38954d52458f4c7cacc62
 EBUILD entrypoints-0.3.ebuild 1224 BLAKE2B 489a8b96463ff0ca2893c7c3b37b98f28f237326107fa20aa27b630fc66776c719c65473160c9b64899af22dc28f794dd474e50cf46b39cdc154c54874688571 SHA512 40dc544c73a96e5ec8499afea3dae5dc0b7dd21c80765189442110e9a50c57bfe24b93b03bf8857f87c5d131b1ec5dc012078a09c0da8e57b5a44009feb7df3e
 MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index 9c0ac636b370..e2a018ec0ba1 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index 5a9bc21dbc21..4757bca9f578 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6-r1.ebuild 791 BLAKE2B a082364327071fcd1bd841c3d1dfac1a7ee12afe6bb01eb5d6966742171fae1f4197ff6294c7393bd3c2f0b62b39183386537fea4db4623ede4c4258f6e126be SHA512 077605fb328f24393142bd5494ca17c30e585bdd14ce380f09ffa7eadb681a4dd66f647b62106e02c7728d065dc564ac1a20453640b17ec0c11fc09fee0dc61a
+EBUILD enum34-1.1.6-r1.ebuild 792 BLAKE2B 85c69e8e5bdaf56d8320725573fa772bf1210ac9d85bcf1849abf469c0259a41a302094004ee97cc46638c4072b43873df39facb6efb4ad3e61702d7b3e70c1b SHA512 e119ea429f00538975fb9aa721d7cf77345730648f32fe18435f44b45930114b1ff5321da336cbebce15a4c9e432667e1bcd82211b54957881e254b28cf20c29
 MISC metadata.xml 319 BLAKE2B 37b3564999c86bcff651225939b50aaba7aa54775af2bd02f23296204b49dcf8bc0434e48e05d820cda9c127983606ab1ecbec35a16dd7deebc9e32e3ed18422 SHA512 bca4e776e7253b8b88225336218101fe4ca88d41d0e597af7f0ca1129ee4916ee5a05dddc6ca1649b7cc3f62db654c9281b2616e807d6c178260296eebdc245e
diff --git a/dev-python/enum34/enum34-1.1.6-r1.ebuild b/dev-python/enum34/enum34-1.1.6-r1.ebuild
index 07f3883988ad..dc3c674835a4 100644
--- a/dev-python/enum34/enum34-1.1.6-r1.ebuild
+++ b/dev-python/enum34/enum34-1.1.6-r1.ebuild
@@ -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 ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 3b37e38967c0..35c60251152d 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,5 +1,5 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-EBUILD enzyme-0.4.1-r2.ebuild 1005 BLAKE2B 24f97a8a6fbb442f518cc589db11a4838084ed26ba058ea3a80eda5902907d32b63c76bd8f04fba7ef88a59d7f3d8b771263c886f1b6e6af718821dc7cb8da3e SHA512 ce06d7cf8d94727d72ec11bc503ed9465526717df0d47b6a78c916992191daf5861a30f95b633106b274732c04c94b86c891903ca0543af64965312c6b2d0510
-EBUILD enzyme-9999.ebuild 1066 BLAKE2B 25095f86f48f8af0b2740a28f45565986521c7bd05e551424a5c77a3c1e5790be367d78abd928a173228ac5b46fb753a924b0392a0aade0d4fa029570554f916 SHA512 4e0b52f04289a7389e8dcbd5cfabfca27c649a87cd6da0a5bd995c8ae1a94cd6a4a537d97631d7c152f6b6171820aff1257f1600c9901b0eecdc152a3e8ad215
+EBUILD enzyme-0.4.1-r2.ebuild 999 BLAKE2B 4daba903f2ef3a3a04cc22df45b03700c5fae8feb830e3afbe643c934780fd770b6d8c9afde1a53c34257926c71365f8ba5317df95b86fe0eb173122b796bc6d SHA512 9ac0597ad2a410a6bb2d3859ba12c0c2c0751a3792dd1a45818eb866ee033f8b68b9e610dcf81e2cf01cdb54d390805682a870935be7a64bf714627ed21a8baf
+EBUILD enzyme-9999.ebuild 1060 BLAKE2B 64224d263bee5b11f54f3b2cc564df25706925765e6080dbdfda8d84899f992c5fab1b5c0a60a0951e699ebae013b9eecb02d7196af00c72b2e757b181d959ae SHA512 939da49f05f42f5f3ce2529547bef0b4fd394c26bc768f65e5ada301572247b11148b8963b947d8f2db8b4f53e48dae9dc6eb98ae818b9baf8397c5887ed3544
 MISC metadata.xml 342 BLAKE2B 1f5c47ca80b45dbb9476f33a22c12596c9b5c319bd278a6ae9e6910105a12aa3d6f15d4336c3fed77bfdb1501338a2514503158d3280e7163fb2b321c0e915c6 SHA512 4ed4ebc1027d54008738661d92361d44e317533fff94a03fc1c5d3e0c33f2cede8715947cf772593df0ab56d642aeb895a772250a31a946b49bad6ff07fa52e1
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index 566e281ae1f0..91d4fbaefa55 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 64797eab63f6..303680658ee3 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 833e3da18cef..65254ce2a57f 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 1103 BLAKE2B e042405e952c4b378fca95771e60298b6b5bd2ea1d6192d6cf3c253d9933bb5ccb99d58995d95b1f3c4302190aa4fe6ae1c53c2659cd2a5160c23e595f9e72a1 SHA512 fdc3c61e4401f0bdcdbb6c1c9dacc006b3d6cac83c923cc083d4878aa33885e38a4b5fadb1ebb06266f4aee8b7d1c7f75b2b059e417789c247d884ef6ba1a484
+EBUILD epydoc-3.0.1-r2.ebuild 1104 BLAKE2B d8bf7cbc704d6a68af93b4a22b3a034db0771ad2d746b3bd9af12ee20966cd48dac4d04844fc4d29c4756cf5d30563e7392e8c61c81d90d54f51e884da722c7f SHA512 9ed72ccc23040e65aef557e76006363a670360d6a2c0494b6ffe573f9eaa38d6cc726bc6cd89473a6a00e56e7e745fc91fb19141d96370c9c79a12ed467320ce
 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 8a671c530b42..653c2d11ee0f 100644
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
@@ -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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc latex tk"
 
 DEPEND=""
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index 9646a40feb89..fb088d0605f4 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,3 +1,3 @@
 DIST eradicate-0.2.1.tar.gz 4357 BLAKE2B 8dd1854cd5a93940365048c1adcd8d05ac25cb511a14a278c083be018770088ad5bb888195ad474776026eef6c41405b515d5661244998286e8b9c29c01ea883 SHA512 726db51e1d5ecc89a256e2c28835c20e60f4f42cef55193ec8cd3323c06f00e7c1bc270517baebcd69a145bc189f392c96d60b4582f48aef10ece05582942167
-EBUILD eradicate-0.2.1.ebuild 392 BLAKE2B 78bfe17f8691cf1980273bf3acc7d949664e919044e80d9c08d41d7518dcb42c8ea683e45474a2b0ba5b83f3c6ff5f13fbacfe2f1b1d1ea3fcb92eaef2bc2370 SHA512 c9a0d636f95cb6a8116121fe89ea9ed2bfed0327a40faa5ecd4089cd8edd5e42bb45ed7f6cbe1a91fa1845840cd314c0b6b9be39ce15491024df18641fd8fb0b
+EBUILD eradicate-0.2.1.ebuild 382 BLAKE2B 88a923bded129024e54da80e0ac8806a8f3867b62d845c881e8594b2362167ef8d7079dd9e1c81235c21460312d2961c683ead3383a3f22022d7f88ef07eb873 SHA512 50de3052b9cfdf88624f94c4b0b2598a35d64ad111aebdee2b33ff114db51dda5a5593936740362146da548b9ba0bb89a81702289b6ab68cf7586f5fcab3063f
 MISC metadata.xml 371 BLAKE2B 924c04cdb095b17bac52491203ea5545d8aa7450aa910e247a6cc48f6180646a7149b161e4dbeb10b2489bdd39ee056383079a7892c12c8a524219d750b0003f SHA512 edb9d679a9edbbde36b66a12764c0e625b33087c7ad5b89c719c364f08f359862eb8f091c69061ab54d38ff2b83d53f660c6a3e0db03bf6408978e145b75eed2
diff --git a/dev-python/eradicate/eradicate-0.2.1.ebuild b/dev-python/eradicate/eradicate-0.2.1.ebuild
index 2671a4917c0d..8a3d4a5273a7 100644
--- a/dev-python/eradicate/eradicate-0.2.1.ebuild
+++ b/dev-python/eradicate/eradicate-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
index 9ccfca7ec5bb..f9a8ed6092fb 100644
--- a/dev-python/errorhandler/Manifest
+++ b/dev-python/errorhandler/Manifest
@@ -1,8 +1,4 @@
-AUX docs.patch 358 BLAKE2B 14a004cd902c0c0acdf0d8e2bd595729beed4a395c249e8b204d97acdc7ddbb11e2653265b11c9229775f37857a227a89517abd7b91d7dfd8935d3d9bda1f836 SHA512 fad104f167d633644ec8f21d8888e8bfe5ab7eaa8c82b30ae2d209d64746ac4912ece042ea942bc7578c51423d1472820a58eafedfd34b644899362b94d84469
-AUX errorhandler-1.1.1-test.patch 386 BLAKE2B 13699a957b74822e9e1cb6ddce1b42fad2dd9c6b92cd82e44d27520b514d6e3def9fe487a95dfe91340dd8db02748a8430dccb433134c32c7bb6715c8364c3d7 SHA512 c6ce048411e70f8f2cb5bdbba5ee2799b09dc036f5620f03b87c0185bd12759cce03d7dc9379602546693daa05d3fb9b15c4aed8e18c265bee73272bb4a16f52
 AUX errorhandler-2.0.1-no-intersphinx.patch 342 BLAKE2B b2165e4dcc5acb49c7f456c9eb2fc918e9c764cc3c83a920cbde99ece65827cb3f44d3943783d484de75bed6214f3878d22848a6ed52b51a4577e2e9352c1ec0 SHA512 dacd25028b2afdafe7507e466914b37cade57f8678849946052b60fda817bd6065232dc83673f9377b0abf0015716547ddc3a03177eba081f1f01a63741559a6
-DIST errorhandler-1.1.1.tar.gz 8321 BLAKE2B f2b0cc9dcf9bf86c1b89356f66fca2d64d49acb919ae6bfc18b1dcb013cb67a358f2f81d47cd1c3bca601c85fc3bb5f870e1cc2452d25b187309a844efed15b3 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2
 DIST errorhandler-2.0.1.tar.gz 8534 BLAKE2B 2a1db016acef81b5e625800614b2b5084cb6e8175d623e42726a728018871d200709ec66db16847ae0cf604551925a18fd2207c861388844f324a6eaae4bbe90 SHA512 b2fe44f400551e2af8aa589aefce042ee761893678b211a0e3ec7eb4527803001ac930d0941425f6e1487d36493d0c8f439e0bf672536ec27f041309fd69420e
-EBUILD errorhandler-1.1.1-r2.ebuild 1121 BLAKE2B 7bdecc6f330cd89f73020be9f3262c67b2fe061ddb7a5dee518b68e0f17b6ca652a6e23720a5c88cbe9340601fbcf6f083c91e902bd61fbf54bc553d187850b1 SHA512 5f94e6f7eb420eb950cca75640226849b23abb2ce5189f96cd4f6e7be1aab6a4e1063eae00af15fa26fc0d4bbaf29e6409ed3b6f9b83af1a7813b8098aa207bf
-EBUILD errorhandler-2.0.1.ebuild 900 BLAKE2B b7643f5e0a0571529e0bd60179347e14612a0dfefbdfd294351a7ca54b774524b68b91da6f99ebd50ea6dfa5817bf08a192d880986ebcbf6f9dd47609aa5fe38 SHA512 291783f471361073c80688003733130f0db5c4f3e44a01a9b0b8b8433c6102cb0d7f1b18d8b0947f6f3e31d831052c4437723a3f26b609aaaa0fc093d90bc051
+EBUILD errorhandler-2.0.1.ebuild 890 BLAKE2B e9c892eb356149037fecf1366c5221973f325c4d51b26bed2b0371c98bf96ba9fbf45fd9060115319deeecc8be24330c76616e687b57f30e0c8bd15e737ab04b SHA512 b5f4dbad8a510cea575cc9cb66039ee58fe3c9996e684f2a1d6f3beef1ae291a746a11b2e1856237bbc1e55ede004dc11d1606d16e4206767b61f26f6574399a
 MISC metadata.xml 325 BLAKE2B b9d3bdc299f206991f900f0fefbf436445eedfd32b0c005919d37417003fb115d435924e424943554333fb65d6811d82e27436f6cd40b0818e204804da74ce6f SHA512 d7a0591bd66d48cab6821c9ac4131839a8b60f026ffbb677263f1af1a0f6f9b9dea2cfe3be003c40e2da7f16914ff2078ed591de0c6833406595010ed88479ff
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
deleted file mode 100644
index b418252ed2a9..000000000000
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging framework handler that tracks when messages above a certain level have been logged"
-HOMEPAGE="https://pypi.org/project/errorhandler/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="
-	dev-python/pkginfo[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/docs.patch
-)
-
-python_prepare_all() {
-	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -c "import errorhandler.tests as et, unittest; \
-		unittest.TextTestRunner().run(et.test_suite())" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
index bcf47ae3febe..93ae7ba108e0 100644
--- a/dev-python/errorhandler/errorhandler-2.0.1.ebuild
+++ b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/errorhandler/files/docs.patch b/dev-python/errorhandler/files/docs.patch
deleted file mode 100644
index 10c704d6fec3..000000000000
--- a/dev-python/errorhandler/files/docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur errorhandler-1.1.1.orig/docs/conf.py errorhandler-1.1.1/docs/conf.py
---- docs/conf.py	2009-11-07 20:08:10.000000000 +0800
-+++ docs/conf.py	2013-06-07 14:05:17.321475285 +0800
-@@ -8,8 +8,6 @@
-     'sphinx.ext.intersphinx'
-     ]
- 
--intersphinx_mapping = {'http://docs.python.org/dev': None}
--
- # General
- source_suffix = '.txt'
- master_doc = 'index'
diff --git a/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch b/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
deleted file mode 100644
index 126b508b9923..000000000000
--- a/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur errorhandler-1.1.1.orig/errorhandler/tests.py errorhandler-1.1.1/errorhandler/tests.py
---- errorhandler/tests.py	2010-03-01 16:41:46.000000000 +0800
-+++ errorhandler/tests.py	2012-04-26 02:28:11.991954681 +0800
-@@ -134,3 +134,5 @@
-                      tearDown=tearDown,
-                      optionflags=options),
-         ))
-+if __name__ == "__main__":
-+    unittest.main()
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 71b234cc4b8e..327aea7dd805 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 699 BLAKE2B 6bbe9e3df20eaaf862c2a19d321dfbdde9b2562297e23487ecc773496384e1130bbc0bbb558166c17f5de072aa9bf9d49c85093cdbb27f889216df1771b69056 SHA512 088ccf813f77e4c894a83ea37db5b08d66e87c48c26d57bd2eb948ead2dd44c51c5250bd0a7846fcc0935c12e94ef8141e67494ad94dd9cc77238b0860df2112
+EBUILD et_xmlfile-1.0.1.ebuild 689 BLAKE2B 3d25626def4e20ef6bcbd3d93ff42767be59ce4e74a69e4c0a642a76e6269ae40b3e8707b053336950f1394cc091ede4a0725304be0be2a135d91f51f43b9cfd SHA512 953bc158987f28e6338798406d334e171deb22b9252c9880ad99ba85e5748c539b5e6fcbec376b43dfdb04d71c75f5c9f35387277d423022466f702f0f7635a9
 MISC metadata.xml 387 BLAKE2B 3845ddfa1338a00f43db111a459108eeedebd0946dc93ef359f7dc01a005acf19d9985d7fd508853bb2a44de18579018450bd0f56850766bb7afa542ad8adec9 SHA512 777c9ddb70e315fa3d5a943a4037b2876361f9ae53db8d86fd84453d2ad21f10882e79b3f9148263bc2288e77382a04614a006797a35f8da810104063826d244
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index d3842a50bb90..015d1dd5cfb3 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index c6f4a74d2f86..3968dd877f5a 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -5,12 +5,12 @@ DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
 DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
-EBUILD eventlet-0.18.4.ebuild 2055 BLAKE2B 10dcb528c8989f802855b079ce113d5faf5a4b76a0cc0dd544c6447afcadb88664bd4055842ef9208f3cb1c7fc716b6fd21b91c75f51e2d77b331d47a4bb6492 SHA512 f48f97911c23420c41db6b6c9d832005e00ea8dd77d365507be5c2d74f8d9adc1da31750e5b41be21a813cd9b5cf779273a0b6beb5faddfd89316addd48ca6c3
-EBUILD eventlet-0.20.0-r1.ebuild 2159 BLAKE2B dcf9f114001eebd9662be39d94682d0765a4db45c8a8150ed490721ffc449506d7cd92fe232c42ae3fece39473720b408feb430b1520b23354c18ce8a7e5a417 SHA512 ce0a0613954b1d895596acacb5ad27f9ad6996d2d464001bca32ee572de379f2c4d374de4efa1ff72113ec9f60fd9dac55ee3fb6f323c9b6a31e9fbb71021f97
-EBUILD eventlet-0.20.1-r1.ebuild 2175 BLAKE2B e78edefb4d0d18d74d78476bbcffb6e6e13ca1fc98ff19c65b17757934b49e98b065201238d40f2bad7410fda61e9bac8195f0fb0b8245201ec3e55621281fa4 SHA512 657f8328585ab23c97c8607fc127eead92488c721c058d2a5859dbc1d0f1a4b7a440c865672609c1c61c085d1372278ebf90cb6c454fb8a43305dca0c4729e42
-EBUILD eventlet-0.21.0-r1.ebuild 2177 BLAKE2B 020837ec0c4cd4059d554d31be0823e3b15adc0a908ce1f8ff02935dba8fb7b1c6f293eebed9ce8f3711ec1fcade7a509eb95e9d1d242fef32b7fffed9fbaf8e SHA512 38116452848c16903a88f6e938b4a4362ce0c350e4281fa57cf0e800b9784dd6d50d2318b822f7232e1e88764957ece03a1a72d307aec4c7183197d59f1ec317
-EBUILD eventlet-0.24.1-r1.ebuild 2378 BLAKE2B 457a3de1b8603c4d159f1ba56fd66390b4ee0b41a57245cc7d65b4fdb0fb41cac9037ab97e8af03ce4ce04dd0dfd18bfd9fbf36016274c68bfe32aeb8f47387a SHA512 83e35c3e60e9f6b100e4e9212045fc83ed3c7b7f98416152db069f0d4ff132979af77efae88512b94047f70c2e698766c65866f27e3f922994b3ecd353821f53
-EBUILD eventlet-0.24.1.ebuild 2377 BLAKE2B a1abb7317ceaab754f903d78909ae3843099833a6c41d465e469394cf239c41923eb577823d341dba385a61c16940f7820526f48a86cbaedcc7d6a977ee15ab0 SHA512 88ebef7b4e2d18a5208cd0e68cd4513840f901162e54875382715413baf91b7149a625eccf5c9e7654afeba326ad4528b74ebd09fffac97cc3b452539c89648c
-EBUILD eventlet-0.25.1-r1.ebuild 2243 BLAKE2B 4223c43dacb9e0a9883042b5a67154c11ee45340a34b7a35dcf461563b884da3cea6ce17b4c043a16aecf758766e8435f43e0918624e355d87381e31ba910f75 SHA512 ba6554e4ea4dae3831187dae24a89f0e535701aa022c64a8469ce4f644ed4ddb5b866d99bdc0347921de4b8c4d6eaf613ec6adec2ae22d3143108ebd935fe018
-EBUILD eventlet-0.25.1.ebuild 2379 BLAKE2B 2ec2eaad69705c9e243ce33283d9925a237dfc7815c1835db1a9469070de5155b608e9c15e87ba3ddce6c9773968592efc9b6c7456034fc4bfd092da72838535 SHA512 a5eb188ac203dd8e5b157821c8c6b2fc0ab0ad76355a7c762603f108c59d7ab0a583648ab0f674b2c3d2490d4eaafbaf9bc73ebc5e2ce90786ecb3f030592571
+EBUILD eventlet-0.18.4.ebuild 2045 BLAKE2B f0288ebba52b8cd6e0eb71c959744792c6b663945886e907f2af90074c740c8c8f14475d411f50499d44e8eb5a02d4a6098057d23dfc58e545fa9d13ac5c76b8 SHA512 d94338c8c668d93006ccddc8f586039085204f38ee7492f946b68a49cc6f57938277cae4d4fa0d4ff5e9e11563a6e9e7ba99d371234e609a8ab380643146efdc
+EBUILD eventlet-0.20.0-r1.ebuild 2149 BLAKE2B 82be761e10901872ba0b25d16e7e10a790575c2f3c035f5a85de519ca65ccb659ca35f9948d6db5cc004321f52d1e130785fb836a110d701cdd956bf50877d55 SHA512 2195334f9a215a2a01f9e813fdb908890672d429b5847a4feb8906f72ab3ca1f69d6cab8a99ebf227c79a04f5acfe3513be89d19142b54920fecf773804088f4
+EBUILD eventlet-0.20.1-r1.ebuild 2165 BLAKE2B 977af80352ec14b52eee1a44f0786a08a61f963589f86d88ebaea90b52d93d1533eb18b37fff72f8adb3225f79f0de5cf27cbdde9f25eb5634ea39bf4ef92fea SHA512 45a028205b3c907f46a24edb488baa89da41fdc5b3d3f572f5dd5c1c22beb815818659937cf9192f3d6e87ce02bb7ca09900c08b16f29e3ff8155284a294fef3
+EBUILD eventlet-0.21.0-r1.ebuild 2167 BLAKE2B d443e66396396593497e92e7cccb30dc4b841d58e56d3a563811a4d744d1c0deeb8a7445a3e7060085f0dee849d42ad31356961913a6c78834e71af6f9d43315 SHA512 02de031b9b03d09484005c5badb9e462c77a384f0ab6b2e134ec2ffa02b73df8532d4d167b1e09ecae0f7943e8f0bf8f3c7353b1ce009ef355b65ea3af703ca5
+EBUILD eventlet-0.24.1-r1.ebuild 2368 BLAKE2B 01675c39240110167041e36d52fc9015904efc1e628de161a4ef23cb5a70ef0b5c4663746da47df2140f82d3a5196276abab2279ffcfcef65fce500cc34071f4 SHA512 5f90514a5fcd19961da30efcdde251a62c014360c8e44764c1290a00f72bfa743dfa744109a3c3fb042ccd90098276899b0a5c5adc503b9e96a62bdfb2053c39
+EBUILD eventlet-0.24.1.ebuild 2367 BLAKE2B e8fcc2916205ef9af7ac49786f2497bbbba14c0ea0a51cb18e290a37bf63e11c3934768dca0b9406759f952d558caa5bf1c1fdc3214e5b2d69c0c5a7559daf6d SHA512 a912fcc63ed78deae4ca6bf7350ee7d20e57ed097ed9da820df5f02d0cbbde504bb09448b9b736dc0654d9171b3ec84359e7aa72d57cbed36f901a93f0ac1791
+EBUILD eventlet-0.25.1-r1.ebuild 2233 BLAKE2B 358510f6d773389903d59c2eb7ee2244235498eb30b28a7f9b8844acf16db42188696a39dfc78b8cd916757c64d36f52e0981ed4b16a4023443c5b6e772f2288 SHA512 cebe8ba4b3068997874186eb95a0f15dbd5049e5106c33925867606cbf14994d075842c85146cd66e0a1e18c17ecd8ba9d65f70d3dab7edd8a89da1bd7a8b206
+EBUILD eventlet-0.25.1.ebuild 2369 BLAKE2B 1a76705a163a4a42385c022bfbb9a5287ce6af0c4aad672692dc5699bebd472ee6adf115dbe0eb461da50db9c023858e3a7d3f453ca308751b5700aa9c3cbb94 SHA512 bc4a265311217c91cb570724e76554a8721c43a9c99e97fba8b60d19512c9af892160a3267fdd82c172e93f6002657f38402cfc0486a30ce12152d5b157067ff
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
index c1924da953c1..e888b1cd7d6f 100644
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
index a9771fd1ff95..1a2072bf4320 100644
--- a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
index 764fc8788727..c465e63f3917 100644
--- a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
index 8d80f39ee7a3..8113a67e3b6d 100644
--- a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
index b9a0764a8145..98c0190bb5c4 100644
--- a/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.24.1.ebuild b/dev-python/eventlet/eventlet-0.24.1.ebuild
index af59a138b59e..0de044ea912e 100644
--- a/dev-python/eventlet/eventlet-0.24.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index 2f5d7f5e8abf..f762fe2ef6e5 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/eventlet/eventlet-0.25.1.ebuild b/dev-python/eventlet/eventlet-0.25.1.ebuild
index 22de0a1f4b9b..4d645fda0ee2 100644
--- a/dev-python/eventlet/eventlet-0.25.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 840551d9b518..6057b26207b6 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -2,7 +2,7 @@ AUX execnet-1.7.1-tests.patch 7299 BLAKE2B a2bf00a2b283dcebb777ff4743f6dbd522ddb
 DIST execnet-1.4.1.tar.gz 171041 BLAKE2B 7e51320969b0203a8ff55d69364c3fa69d747d67f5dd3a3aaeab7700192d63918bbc11ae29a1e26e466078f1ca87ea00ddcfe0f98132921bacfc95671c3ad7c7 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790
 DIST execnet-1.5.0.tar.gz 168497 BLAKE2B 1777f3a72cbf75e5bdef90cdda956a5d8101980f299a1bade6d6faeec52e1026a18a87c8b6b08c8d27073acedacd38473f68c6823908701816b4725edd3d9fb0 SHA512 ca2b571fafdf8f68b3cc7a04ee326e3255828d4cde28ead65d0cef325569c3a6dee09359e525152248038de65326ffc6b75c8362f53aa5c0b3f736eb596cb2d9
 DIST execnet-1.7.1.tar.gz 174157 BLAKE2B 0c2f7b8918bdd5a3cd1fdc49607e571874e20bd26a4806a6ec1a11359b912ed09244afb781670ff24fbee752516d59ab2bba7f662bbcddb802e7e6efd2c544ef SHA512 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
-EBUILD execnet-1.4.1.ebuild 1248 BLAKE2B 4dd5394dd4054ceeeaa14250c80fa8e05e6c375856ba33ac3d570d98679c0c3cfd84de12fc3067eb68fbf242c0944cf7b53d2845b599f1bf621663f2b321b37f SHA512 2d0391ecf0cde5171cae8677b299e64f47bc64fb276af03078ed1cea54e134959da8471a1cfea335462c5f8af495279666718b97584c9373757508536b7bec60
+EBUILD execnet-1.4.1.ebuild 1249 BLAKE2B af86b56a1375fabb359a4e6f95e16c902e6b9f7c2011cf771872e3b2a4f8aad129cacbabb04a9c58701af2e0f58566d10c7c65eafe9642b3f7a131622a27e8a7 SHA512 0bd328b32905c8cae31bc6cdccf671bf5ec91cfa2f5241d890a2bed02a0182a75c384b1c9bbe192d34a87aeab8b685024ef6748957a2d6e7d790fc592172906e
 EBUILD execnet-1.5.0.ebuild 1263 BLAKE2B 3c8deaa0777436ffffd7919ff6b5998bf3302129efee4c7d90fa21b1ab95e368e89a45cb502942f0682fe4c236dbdc7add5279cb6079a4f79e0cf0b0125b97ee SHA512 0ba6dd3bbf93c51f47f58e094f4bc1c89f27d9adb3b0ef68c3c6c9f4f55275bbf59923311468756d0341e5f47a09b1778d0534084fdd4590069759e7b829be82
-EBUILD execnet-1.7.1.ebuild 1172 BLAKE2B 6b152da7d22a48b91a0fe25055c3e61da338eedca7d75e424b11b9615f5b16353e955f7281717b48a2ae69c19c1d92f1a4f6ab0b6f4eaa4529eff06ad8bf8db0 SHA512 2efbd402841568a101d021f1ec4d27111723ef3bd01de70ca277a8ece07db006c761cd7a23a792e6d6fa73ac69088539a68070afc933278b11e993c12743416c
+EBUILD execnet-1.7.1.ebuild 1173 BLAKE2B 689cf647b46eae1eefe8b0b281415bbe4cd61a600e9c2187cd39e1f7914ce50a74279df30090c7f23e23fde5270152e07fffc3f7298ce67f6fa91dfce191ff04 SHA512 57cf81e1d82dc1f9fa77e425c3bcdebfeb7cc93432d321cf83840e36537d8cd53f7886eb4d04ec231e3f6d28973441d38179560663b6afdd36b4d74e5f065df5
 MISC metadata.xml 541 BLAKE2B a1e9f563cf102eef9dcde4800cca44d354e4cb7d77c20422074296c3eb2df1baa46f4cf5a803b07f454e98f902124f185ff24224f499d50577a2c2ed3cdbe21b SHA512 8afb04a008ce5704560a8f984dc5662abb01244b93bbf655bf0c66365a125a07dd1adca26f75df2bc89f923409b3687bc610f0ed739879a6f66167b799963091
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
index 5291e08ecefe..ff29fe003f85 100644
--- a/dev-python/execnet/execnet-1.4.1.ebuild
+++ b/dev-python/execnet/execnet-1.4.1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild
index e52da1925e8a..c6ea7c2a4950 100644
--- a/dev-python/execnet/execnet-1.7.1.ebuild
+++ b/dev-python/execnet/execnet-1.7.1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index 4bfb310434b5..60cc9b9c63c1 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,3 +1,3 @@
 DIST expects-0.8.0.tar.gz 27801 BLAKE2B 3371ad3b494a6cfaf463660d013dbd5c26d88e0cd7816be11a39466a831d2a3c19e9459967947651e004dc1bbc6f6e9a61eb0b9f69685482440056061fb9bd95 SHA512 c2379bb6b3b6181a0365a84b0602f2552de40760b7cbadd775705bacfe113ffbe55bcde818c5766f7079867ae38c8c02e318f3c9ffdccdddb58e6cf0559f1e25
-EBUILD expects-0.8.0.ebuild 834 BLAKE2B d13848253b918ec9ab863d48cad3b7e4802f2479e9426030028f49131d82ef22e9d8597424c9b32a1f04654d043ce54a8d8333b8581b4468db3742103273f039 SHA512 4031cd7dca1a448c6f16e1becb6b2f0c92cfd9abaaf0d67c3b60d5d761e302e01fa472152594145a2eaaad5eb65c4bc936a5cc33df911d3f301d9b0f01fca7f4
+EBUILD expects-0.8.0.ebuild 828 BLAKE2B 7890a7648263ddd98f5b3f58c9f427abc2eb312286d56b9d1a4def295b2482ea17d66c8793da6b7ef13719198bda05a7c9b391f434f6174d500d36f9900c0511 SHA512 0d276152bef13223664847b4b8b02ffbea7854a2c869332d5ed62fb8fbfc9b9df0b56cb2222207ab8eceff6bc6b3a416f24a96cfaf41f75dd04378a933d45131
 MISC metadata.xml 300 BLAKE2B 31a0397f19e9d532bcf03051b430f97e50cda0ad360e9ae6ffbdcd17ddc5d6067495ed3ddcb73fad288fd7a7c0808e6e08a1a629ae1eb8fdb92749ef423a147c SHA512 8540e7e195b657fce1c062e1a41b3e0bc988a393f4f251069f14379a072708707e4ffbbd5dbb80fa217eccbf887bccc4c6a550dadfcb9aba54a1bdd4db8ecca2
diff --git a/dev-python/expects/expects-0.8.0.ebuild b/dev-python/expects/expects-0.8.0.ebuild
index c333518bd000..28a0c94321f3 100644
--- a/dev-python/expects/expects-0.8.0.ebuild
+++ b/dev-python/expects/expects-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index a0dd356fabce..a9fe75f3e485 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,5 +1,5 @@
 DIST extras-0.0.3.tar.gz 6231 BLAKE2B 28f60a341628f87f2fbd333de8f2d6e37d42890a186e42d262079f26beca5f9452860b9c434c6953fb8395d13903c2fe63969726d1c1cb4bcc0a469efec8fb13 SHA512 7b08d094717a27fbb522d49c0c538e98baccef6540216479d176b55b94f3f0b97c4b70ed48f3802a1bf08a58fe9a319a113d4ca04d9dadcb85e3a99bf7490a3c
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-0.0.3.ebuild 726 BLAKE2B d82872c1e7ab4b24a6b467dd4dcb7c0f34cfd4a81d4086a31847b36388a1b14ca006fdcdb0078e8f200dd1fb4f0a540ebb20013d9f2fc397850dd00c48696d51 SHA512 cad7c6a7bf01bab9b827b47661f8d7abc4c6757c2590d3bc17946598f41897c2909cadb1a6b1b109f5716702c5ec1f894c1f5c34c0e646833b91476435c2fc1c
-EBUILD extras-1.0.0.ebuild 745 BLAKE2B cd011ecd8d7c3c3e9840c8bc4a7e41871769d37237ea9314d11e207f26c8429aaa94b59642a1ffe83f006aabf1a4f727f7d9713c3a73448c5f822d5addbd2bd5 SHA512 626660670321def6d2e7a3c27b848145ca5f4be7af9c539bf1f89e6c40f18df0aa8885431d6208e8dc12c9b12264d3f3316d2d1cd4008d3960505747d4d9a2ad
+EBUILD extras-0.0.3.ebuild 727 BLAKE2B 96cd5aff54622d8cc9b05043d4745dd5616cfc83df93f15e2b77f827ac3525458a136b6acce3017b9068229e54b214563042fab259bb68699be7863857e5a7f0 SHA512 a27238bb6fe920d53170430b87611dd6f3da1a7fde4db7599b9170848a840a22a120a36be771e9290dd80f801f3fce1e90510128e65ff76c23cf54d77b6fd3d9
+EBUILD extras-1.0.0.ebuild 746 BLAKE2B 4f85bd5485636c25fec052a966ba5f5923c7a6cc1893f970db9f392b071510c8dd6cdd7bbc2a91e4340b6dda5c3f763d4e530b8f5365d8b7e3ba06d227347e0d SHA512 43c216196f871f4194e6a1fcfc919fd87599b9964eb1ad263339ae8db57320ff16df599d497b4af9496240549d832163d34f65fb01e90b57083cbf9a5a447f95
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 5d1c2543dc38..2e362b6f3d6a 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/extras/extras-1.0.0.ebuild b/dev-python/extras/extras-1.0.0.ebuild
index 81ab8c883b4e..08e22462ab62 100644
--- a/dev-python/extras/extras-1.0.0.ebuild
+++ b/dev-python/extras/extras-1.0.0.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 61ec9713a010..ed630df03946 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,5 +1,5 @@
 DIST eyeD3-0.7.5.tgz 221685 BLAKE2B c296f61036cd0e43f1820c830e9fa9630d8bb56770c36c922ec0bbbd2ed9566c4a0330677dc1c7fd6cc6fa30f9b415abef2867d93a55ba337b520ed52e330c39 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
-EBUILD eyeD3-0.7.5.ebuild 989 BLAKE2B c4b04e2dcd8b6f20ab0261a0eac723564c1c69bff7577eb56cd43323abfc0f836b8f5666c906f232e699275911b4e049bc43b2ebea43d2165572fd19bc0602a7 SHA512 4ee3e662e9b48f7e3720e8955bedd48a5c3df1949e13ade12bfe4cf02e354e222a86c8632ed2ff345d95087b1e93128a25b73b1638b7d262b963be9ce79562cd
-EBUILD eyeD3-0.8.11.ebuild 590 BLAKE2B 81e5934880f1138e10291d3322a4deacf66cbf3697c7bcf49a35484c172807df7e24c2d6618385f254955fc69f6d8e3d52ad32c98cfef5c0103748d1c403054b SHA512 296e38193e3082cd4cbe2f787bade8a66be8f3b96ebb5ee2cee38c2d0b5d8ec28d15a016ac06683b0b72bdd6a5cc6887c216e8b9072c810e2fc19f6cb5229277
+EBUILD eyeD3-0.7.5.ebuild 990 BLAKE2B 7312f73088b386252088fae68d1e3e5fd95d03f6c3d8db5d084a2527e35474e4d387ecc06f8f40c6284e15d6d40de20669b3e651af4995e13689b017023c82d3 SHA512 40495711222ac7aafdd17be35e4f6688380d850d42e014f197211dcbb9ffb75ce522fbe06270acdc4b29c53feca7a12231e280d95aa6b1a8bf6b3ca8bf5942d6
+EBUILD eyeD3-0.8.11.ebuild 580 BLAKE2B f7f0901275d74fd4a3dac25a08362439d20328e1978fdc1dbc7a0181e85d80e4019e837424ad38406f1c3ae9dd96347ff6bc2a52980151d73ffede7e359f69a6 SHA512 7625da139d5886c9d98a9f722301f761e42ab0b21a0d2100a01486a7ea7300a0195292f5164091ad51e5665bd4e4b256a5c021864145600dce070f19313db877
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.7.5.ebuild b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
index b31a2f2a1902..ebdfce221649 100644
--- a/dev-python/eyeD3/eyeD3-0.7.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.7.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://eyed3.nicfit.net/releases/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index a18581249abb..f307c5fbd427 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 5c921ab615a4..469dc83d9664 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,3 @@
 DIST feedgenerator-1.9.tar.gz 4136224 BLAKE2B efb70a48a290fcbd959e4213ef2bb95138433a0b86ca000d7a498fed3705ef237690e81a6e2bfae0d050b2be89486f1c2d7d0038c1626dfbfa38842ddf5fc11d SHA512 77f4df51c6bdf261f0d1665206ab048a21f8660cf8f2c7abf3d71e17c63284240d0eaa690dd6d53b0b7d8ce9c9e0349094d5270c75c2a069608b7717538d7fa1
-EBUILD feedgenerator-1.9.ebuild 724 BLAKE2B 1698a988d1e166a0316540d54d090f2f461aa7c1d92e89a073d828661e065c85146f6fdd277b7db0f7cb9c1ae74c8a0e4a1299687bd91b6c9859a7b026cb7b81 SHA512 2fc3b752487cc590b3ffa6d3b57909878d2b7b0c205f8330cbc9af83033cd2b201bf1b830d8dead102ac26a848fb61b007b072c9bf42d491bf306c015577fac1
+EBUILD feedgenerator-1.9.ebuild 728 BLAKE2B 179acbfc3b696dc53d43af0a7050bb174dbcf2e25cd8851a3ef6cba2313ee659d1eff4a9cb93e90cb3d0d9852e8aef65ad526170806714080e4b3898ae680b30 SHA512 2aabbd551107662ba978887e39412aae48b9e6ad9f3920caad476d9b0cd4b8d6d90b0962d011db91b39be6b37a2562e5de28c5c3ca8a487c1a1738afdc9d1013
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
index 028c1f7c9948..9675ba882ab7 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 52783c0e536c..eff17cfe5a55 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
-EBUILD feedparser-5.2.1.ebuild 1200 BLAKE2B 4d36f9c7ebe68bb59c14b5787b007162ff466f12f9227c856e16ee6bb948fc44313630d8d9607d349246162ff7ee2ad9742aa9c4eb0b5ccb48e96433e11b32db SHA512 f20514a3143000ecf088a6a5fe6027303177950d062a5b99603155b54b4f73f0a25e656005e71109a3ef6947418d6b76b47ac0c4152ec5d1951ab4d49589e25d
+EBUILD feedparser-5.2.1.ebuild 1201 BLAKE2B cbe6e6be06ef2fe58e8cbd7e6b05cfd706ba4fe3d0f0f0feb3223a73173c8979f8f00ab0ea69ff28b1f4caa6afe3197176b279b0bf3031a36ab22e43152f19e2 SHA512 45f3ed331479002f720b791b7a46d91dcc95f8de2544ef4a7f3c50be7c83493c2c9ff8a6d7b3bf4c981a7390122fa4a5b3e5695a338ad94f37be35f5ad09f69a
 MISC metadata.xml 545 BLAKE2B 259d08b124b1ae245af79e6c014da99bcca0474a63cf681343152b225cf914001bc10bc59af5ddabaf7144979614507cadbf4506ffe0ec69d69d6bb28c090767 SHA512 529faf4a7612e461dbae6746acf9e886a0ea497b11996e0c5f89de5fece30b544226fdf02a4e19915d132e40b0abcc5b180cce36b5a9f172cd6364ebe3d3f46d
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 272de270aa06..7b672a9d964f 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 51692b32fd92..5bdee015e437 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
-EBUILD fido2-0.7.3.ebuild 1137 BLAKE2B 064eb31858b0157d404503148bd4be0701151dd969857c419d15540cc49ecfa1089fd33bfaabe3ad33bf245e9b73b4cc90a39af68e96ef31921ec6a31c10cc45 SHA512 eae83bab4fc89934285554b0f662450b5feac0b442be7721a8113c53a723ae25255e290847e698403e9e4a25123c5c12af2ccc5bec9481ef7d10e30b897d3852
-EBUILD fido2-0.8.1.ebuild 1139 BLAKE2B 1b7764ce28440814d6a1103468fc91df1ddc8c4e9b642e6b79d3deb55aea6b05ee1834b5e33980d0d63ef34430a36b9e5cf0f3b18b7a91a47eb1d29912e0fb72 SHA512 3da0403889563232c705d8bfdb7cdb8aeac895d93862e9400e74207ea654c5c50b74a182a73ce63c7a1555da0aee03191aefc3310a477430b5bcf1b617542d18
+EBUILD fido2-0.7.3.ebuild 1131 BLAKE2B fa86ce58666f670423ef670c17f6fa1ae6396454ab82a06c27b9f5195737855c07af791360c1bc279707bf6551a0d05e3b15f7a1b94ce49204ddc84a5c6574ec SHA512 ec8ad23636941a441f65f8c34fb42789a75743617e658c43dec8dd9218b9e63c56a29e10413b1c83ae0558cd5479f54a9954b131266b72702541c5bdcfec73b4
+EBUILD fido2-0.8.1.ebuild 1133 BLAKE2B 8dd9f289d0d5cf9cc9cdf127e490f42006fb4dcd728156fcd0540ea16dd383a2114357a33631702ebe5e8840c303c06386e0794bf4a178bbc61023565364b078 SHA512 1dc45f2e48b7ba9d2b6bf615de15280902167e5f6921a7c9d72056ab305f30d6463e0ab414180a4ba1e25b9e9e9d4bce22e628045fcfb3978e64ea1d9d0444ea
 MISC metadata.xml 516 BLAKE2B c8d1710daa727f863e8936fcd4d2374c174ba6f1224d7c66d498bd9353e165b5659d3239d730bf406cd18adaf0acbe1446ebd3d2e3d0baf4fe28e512ac70fea6 SHA512 18f926acaf096999fb70f2942e81ff76effd0f769defbc975653992282ede547c2403df64937edb4d183dc3e218c0183ceb39f343349502f6ff9052db1446090
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
index 172b58fd1d47..fc86c9f356f1 100644
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/fido2/fido2-0.8.1.ebuild b/dev-python/fido2/fido2-0.8.1.ebuild
index 78b4fea9fc98..bbf3b34f86ef 100644
--- a/dev-python/fido2/fido2-0.8.1.ebuild
+++ b/dev-python/fido2/fido2-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index c2f93bf30f25..f383df60f7eb 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,5 +1,5 @@
 DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
 DIST py-filelock-3.0.12.tar.gz 587613 BLAKE2B 3eb765e4cb251ace50fcaf3b7cf52939e697d5a710b87eb2f0ea0cf66f554b90bda2e95754b82e1544e45d0abd8dea861f52cdf9c7de0f1e91a8f5c8e0f9759c SHA512 0f30b54b9de2540f023855effcc582b18fedcee6681f21e1733f1b60dbd39eb148e3830bc798a44c5e8c22e7ea8ca26b6d4547fae79dacc78c62b819a3d84683
 EBUILD filelock-3.0.10.ebuild 1007 BLAKE2B 262c18c5972a245e06cc3f8d9a3cdbf98092bc193af0308aca8b9b87ce5ba5ac88edf1dadf300c9a3037bbce4f1972be6e32bf9885c9d724cfdebf39e5fce757 SHA512 d04bec2a3e414751440bb46c04b0c92db2b96f4659184b856ac30a29c86cb955fe06e5fa1ac1a6366701270ea6677fe1eacd8574016919f373f5200c71eb9ab0
-EBUILD filelock-3.0.12.ebuild 671 BLAKE2B 0bfaf5f2576f02d59cf7427055d19d2bd757ab82db91854a5b84b5ff56c44b0b090a526cce3fc94d912e3b168a80beb67ff50032b12570fd8e4c08bf3fdd1e12 SHA512 e12d08ace64f79f24f2e62cdbf918967afb7af8110ab2259228151ad204e9889d2c9a4db7d4acf541198740ada1330cc472d3df1b4464078b7fdc4d57e10ec6e
+EBUILD filelock-3.0.12.ebuild 670 BLAKE2B d0966c6b6b2617534bcd20a4b3116249a09748a30b8edd27f78471675a87c83b3c2721046d3c380a8cc9d978c9b479fe48525785b729cbda5e7360734687778a SHA512 a6a5ebec93ba926966593c3329d8bb35710c334c3b71d78b9f53ef885879e291a12b4d3ef3337ccf4344138d2bf08ab00801dc0abc4cb7158ba6d4e7def104dd
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.12.ebuild b/dev-python/filelock/filelock-3.0.12.ebuild
index 6d60b1491457..9d49dadb68f3 100644
--- a/dev-python/filelock/filelock-3.0.12.ebuild
+++ b/dev-python/filelock/filelock-3.0.12.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/filemagic/Manifest b/dev-python/filemagic/Manifest
index 49c98d1b704c..02d87c55617a 100644
--- a/dev-python/filemagic/Manifest
+++ b/dev-python/filemagic/Manifest
@@ -1,3 +1,3 @@
 DIST filemagic-1.6.tar.gz 16754 BLAKE2B 248de7f4c900f693d56197828b96bcdbfae451e17948abc1f59105b5dd78bdcb662e5d7751927128e7ae2b4cea086b5c095f34ba0fbbd73d8acce569e77e943a SHA512 2b33b55467d14697ddcee2b1cb69eb41dd51474d2d8d095873f6f6609d77efa295a91bc9b976c9af22983a7cc801e1ea1e55163c18c5b6a41c4e1ff9cf73bb47
-EBUILD filemagic-1.6.ebuild 640 BLAKE2B 8f8a44da6b4760bfdb868afcc056c08669fcf298af62fbf5e68a363fff1fadce51c53dd180fb4303f735eb6e6523e55e929c310602359507ca4f79c9fa3e2825 SHA512 f085d6abe947d54329f6bbc9dbf71762f96bf1cb8442931b89ab213ff7fbe61c1e77298394f223c8482870384e0d50ec11c333ed3994cf6a52ebcf8b8b82b9c2
+EBUILD filemagic-1.6.ebuild 634 BLAKE2B b915da7b43fe0aae570753fa80eba753bfbb828f98351fcb29cbc10659d468fcd376be31011ef7a3c90a9c00dbdd2d8475e269b8ff1763fbc1d8b42a5a6faa30 SHA512 eba3f9ca73b3d41243a40262d8f14f091a3f008376da926cf7430160dfc2189a3154e21047c2e1c2ebf7b9ff790571761ee3b0d00dadbb2727303b4bcdd11f4d
 MISC metadata.xml 420 BLAKE2B 870c83d63bedb0a2357ef11eebf51339d7cb0df8fe28a8b08d919e16878c131e40f3ea0b0ea2a1f811fa51104a8d13f8cc266a07e16bb5bfee7daa72e86263e3 SHA512 d5ef87b48a68d72cb02aa911d906e9914faee12fb43a5cc9d2b0710fe6dc7de592d3d2c99c163832a21811c65d2fd4ccb41a4c8feccb7e33114668d584039270
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index 2225c3055e91..fda6fd4d403d 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A Python API for libmagic, the library behind the Unix file command"
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 7324edfca31f..dc079d346df0 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,5 @@
 DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-1.4.0.ebuild 957 BLAKE2B 1893ca89a48611d268756c2ca17557b52ac6e748db5f531c6e71f4f39cee8e7933752b29be5b02cbe8e5b22a2a477e1e1802935f021bdf87a3193360a1cf82f3 SHA512 c583084141442d5b61c30da475cd6638e573652b4fddecce0751493c349ae1b25064667870b0022dd449168a8070cd4f309c9a864259fbc80274b578ac034dcc
+EBUILD fixtures-1.4.0.ebuild 958 BLAKE2B 5f1e3a4a5fbaaa013e9d812c9c4b41dfadd9be2d990f19d4b3655bad638343cd678b122c9b531508433153779d16165ef2bf1d05b31184b7acd1096004f12b8d SHA512 0a2d2723c800096f7ada7978a4abce06c399de11ea6dee9f8f94d70e663c77555f091ad04b277164f2b06c6229b8742a8c4e502d4ec7829ace13ca506d82b73f
 EBUILD fixtures-3.0.0.ebuild 967 BLAKE2B c833489c220b7ad3b19403420385d9899c9745a12b6fe3f481c952e3a867d4b32d0c702bbf280a489bda88de1ca87a5dfbf783c3431f03a9c1f28480312cd01f SHA512 6a30218aaea7b6dfa6cffab2e282cd209e18979864c364c0ee224bffc35dc63e55bdbc45b2f70fa7f27a55dd10e747f9ba33882dc401930972d82f8ada9b18b6
 MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 4cf9c482da87..6cb7074497d3 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flake8-polyfill/Manifest b/dev-python/flake8-polyfill/Manifest
index 54741d7130ca..1596b18df849 100644
--- a/dev-python/flake8-polyfill/Manifest
+++ b/dev-python/flake8-polyfill/Manifest
@@ -1,3 +1,3 @@
 DIST flake8-polyfill-1.0.1.tar.gz 8094 BLAKE2B 1e93503b7f45da1d2f8086ea7e2f619df73a68f6680e958fd1dc13dfa0409ecaf0a045e1a6fbb3634279b17479e7227d68412d97c16d3a87182ae2a3e2c7cc11 SHA512 cdb1530c004015fc44007eb4efb5a84b2ff6f22bf75b3a33ada0c0e80eca5e137a2504baea11ae186018ff7617c8935bc14c36703c17c533a27abc81f9856883
-EBUILD flake8-polyfill-1.0.1.ebuild 725 BLAKE2B 0ca23517f71c06a12fa940157486e168df88aaf284c5476700693e2329cb02a802b1ca7e3e358bd16f4bbae99a34bf0bf1e4be8aa5916520ef97d343b67ca227 SHA512 ba4be817ec934b28501d5c75b0e40e9b2175614f4e472d151e7aef89f794f407ac8620cb110324138d0726c94852dbe15da578314155afa29ee29a3ee6bb2fed
+EBUILD flake8-polyfill-1.0.1.ebuild 715 BLAKE2B 08a105d5287a37bd18df6fdb5571d05d22b69fc9ca75fe5b1b1ad56d231f101cbd65b0704601d2bd50b7eb8fd6316efb79f0fb45c85aa577bf9f9ffa3a645778 SHA512 9ba453c3daaa8347f6e428c9484817ed05c18239770772ff627efbafbf6ed205c8ae5d3d194dd3c4b48cb5be49502a5b89662fce2ee1207f7ee2dc2455e83be8
 MISC metadata.xml 296 BLAKE2B 1b6ed3723bc9c8b200aa8edeac760400493117046f88144e6684c41326de6b5c0c17fb474e9d25a6f4b75ec55d3a699ea3f0134d204e95551f143f8bb935f5f3 SHA512 8a15e9dc8f9ff3ffcb88147950d11ab9dfe69124bb8aa9293c5b3582044ddda95acc0f62453667f53a732dc98f984ca40c8739e965edfa3e8db4f61ecebcdc1b
diff --git a/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
index b12538191434..f9bfa4de2ea0 100644
--- a/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
+++ b/dev-python/flake8-polyfill/flake8-polyfill-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Polyfill package for Flake8 plugins"
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 7fd48fd33176..3565bc375a5c 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,13 +1,5 @@
-DIST flake8-2.1.0.tar.gz 25010 BLAKE2B 23f89456a28815700f88e2eb3abd29e0936b0c40b93e57036f07ac384a82ab6b05bdb0a656fed08406569d33165f68ff1fb8074ef376a4d8c530c4d62405bfa4 SHA512 bf961d76ed08dafe7c2a9b767594577a57a2276166e515f1d84654223aa50879c5ee1e20919b3a4c7576c7d549037c8cfe67c11ab1f6648a0205200f5060950b
-DIST flake8-2.2.5.tar.gz 28333 BLAKE2B 016b5b05b7448dec762e7d5e06fad9d631351d02ba5941a34760c51406164dc2c5508e3c4c54b52c49738c193f815a816d9cd39558bfecaeb83cfddbc6dcc63f SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee
-DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147994485542ba519d6151ab11d4b496066c74141020858f468050e7b6dc3d6ce3a89ddf809e9cdc6d130984ef SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
-DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
-EBUILD flake8-2.1.0.ebuild 1097 BLAKE2B e90a1cb50a39a987321a497df7e0b10153721858e1fa1b7555a44149b652fcdcecb7716f556a29b8e66de1d2d0fd52ebc314ef59a71442b1a6bfb26fa974fcd2 SHA512 7002e42fe8859348daa24c6c233966f7602bf95647f9d0b5db3978edd4f30ef54de546410dbb78d757e5d632b3cb0c331e8858539ee07a6cf39548dd6b4c44e9
-EBUILD flake8-2.2.5.ebuild 1122 BLAKE2B fbc5b05cc55ffc0ba61c547604d4e16da2b388eacd918857cba8e5ebd5580dfd95ec222c1657d5c6fa2d5c7dcc58a16506c996a0a0fe799242bc5382065de6f1 SHA512 87b66eefaeb7fa10185c5cf06607301b328e9925de5116209a7f2b01b513abb1bf1bb46f98cb0cfcd560087d831a210b32591f1178b77b4adcd459fa2d45dd17
-EBUILD flake8-2.5.4.ebuild 1627 BLAKE2B a9bb2b883d489915e8c7d4494a993379281f1fbe25a98e44a5b8e69022a2b05ce39a229370097615a10481479bd01e0a311d080ebdae54cb5960feb9bd05f67e SHA512 16fdfaeb19f6c35deb7c8c4869cb0acf709f0765936bc7876afcc03624c8b3a29935b99f149af891bfea703cc4488ae7dbfc02715bbb66ecc88634ef7ee501c0
-EBUILD flake8-3.5.0.ebuild 1599 BLAKE2B d125e0bfac657484fae1031fe674f9b5962ba4110a27eaec07b3f09622dff6ea9901d1fe5508d7220884279d3b382707e65d3c56967e38095401226ab799598a SHA512 f24f5727f57be4bed5b340b79308da318232a064dd73e54d558404cb3496c2739a5a6ec48cc95125d4c24fd4840487a5e35b7968dd8d5090abed6506094ce808
-EBUILD flake8-3.6.0.ebuild 1613 BLAKE2B 9204a054483015b7d9bc98f334bd95c5849e5d392c2be6d970093b6f03e81a8a189388df57b771064a924ffa4c12dab167f47e6ed4783b704e2d52a1cd1e4841 SHA512 0beddabe54a578ccc650b9673d5f888f2f6b2e0880ed19f6975244a76d31c859359795c274d2c95621059242c6d60d17d578d81293edcabd2ee1092a86aa3c75
-EBUILD flake8-3.7.9.ebuild 1592 BLAKE2B 1c32be81f59edb2b1b942988c3f98c481f1e1494e0db81b9110588e571105a12946b72346df8701a6bed39a60f6b8466dbdb42832ecc009e5a1e11ee6ee741a6 SHA512 0c3d53a0e5dd0bc976b5f502a03389058bde38844d9a1d835cf20442d5d338660de7e88e281ce2feb139d23d31be25b91c66907f467ac34caea90d8e04c22a09
+EBUILD flake8-3.5.0.ebuild 1600 BLAKE2B 8450b5b85db4ee14942a44eadb7db5ba22a424d9041bd6c556529459364528a948590a3927e95c401bcd1e77a41f881155cfa7880212a0d828d5b4a0b5aa4742 SHA512 832fd75e55330e6fb3a64d1bee5e6b544ca6b7a2d230c98638de10fe88fc35242cae647109071c2d5b564b1de8a6c380207659cd0b1d358c9d1b77ac24183fe7
+EBUILD flake8-3.7.9.ebuild 1588 BLAKE2B f012e93293ac08f2cf21dacd65f7cdabfbb1d24e6057f1bb4910b394d1043ec4bca27fd8095a46839daea43dbbae7d902ca072793708badb2dffb489c227b7a7 SHA512 78fa37e5122dcb265d1bfc97e8a103ef3891d5523716e91f28ee960228f9959bece6bb9591c70b33ff990674a5c1567ea5d96c0ddb682d845b1caf9435e9ee93
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-2.1.0.ebuild b/dev-python/flake8/flake8-2.1.0.ebuild
deleted file mode 100644
index c755bd34d173..000000000000
--- a/dev-python/flake8/flake8-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.4.6[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
deleted file mode 100644
index b690049e9b6c..000000000000
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND=">=dev-python/pyflakes-0.7.3[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
deleted file mode 100644
index 850b6d0fc8b6..000000000000
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.1[${PYTHON_USEDEP}]
-	!=dev-python/pep8-1.6.2[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${PDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	        <dev-python/mccabe-0.5[${PYTHON_USEDEP}]
-	)"
-PDEPEND="
-	>=dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.5[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# This tests requires / assumes this version is already installed.
-	sed -e 's:test_register_extensions:_&:' -i flake8/tests/test_engine.py || die
-
-	# Gentoo has flake8 support restored in >=pep8-1.6.2-r1.
-	sed -e 's:, != 1.6.2::' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index 6615b0de01dc..13da912b4ca6 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
deleted file mode 100644
index 2b23de610185..000000000000
--- a/dev-python/flake8/flake8-3.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
-	# try to install it, causing sandbox violations.
-	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index 032442b3ac5f..b6e6ab64270d 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ia64 ppc ppc64 x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 79e2acfc6e58..5365ecbb210e 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,9 +1,3 @@
-DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d3f7a3728b1e3127f011f5900187669bb4e0755e706a1bd77e1804c42986a07c6d3dc58fe085967adb6957c SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c
-DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
-DIST flaky-3.5.3.tar.gz 29320 BLAKE2B 6bd2095cd481fdd8311e08c3e8aaff78fe22bfefd8463ea3b8190a469d8f909039267256afa876a22a57eae9e390af8235b10211509fe8549d000ed7e9331baa SHA512 9ecb80ab1ec2e0db96b7a7a5856a147434c22d29a603e76d3db3f8d94ddea06ecab799943179910bc1d9d8d5dc1c7bcc94156628352479d67e2dcaaf5cbabf27
 DIST flaky-3.6.1.tar.gz 29501 BLAKE2B 57d8c1ed9f271688f8a6f2acf25456058b3a67c86ea7aac8c32fd52221d294b5226461b9260677e3ed94af84ff9993a02e79f0d6b01f05daee2992efd8ad03b8 SHA512 f14fbd9259759f3b6f18a7dc16e00717ce54392a10cd9b3225636e33c904e69c6b01398bfce96d7273a40b6c2cca897a05ad386a4d8a83bffee12fab322f9b32
-EBUILD flaky-3.1.1.ebuild 1403 BLAKE2B 08d44a46970c3f879980236b0e68c81f018f5351338bc539c358926ee5364f0e41f987042a81b5c8e8069ee777ea6eb37d23fd206274641bfca77a7a6d37164d SHA512 4eebe1df049b6c0d098ef7c762b91a3183cd9f604093c5a705d2151ba7f476e32a14ce5bcb5a6b2108855f1a7cea5fd33ffb8541ef69d340bbafa4fcef88c591
-EBUILD flaky-3.4.0.ebuild 1475 BLAKE2B 98831e09efde29e609c7ccb7e66c555d00cdd0f366c46112de3f5c2fc20aa362b059aa1eb455c94b45f2b0538a287b966537d514c1e67be2b3d8ad82d65430d8 SHA512 39edfdb89399109d407f1c1e385c671330ff3344d92556d60a60b68d5ebcfea679c036fa21786e3b73a66de0f704a529b84e5b60c9c5be323b70d90647a245be
-EBUILD flaky-3.5.3.ebuild 1474 BLAKE2B 8465994b9e02a5a09d666a393189096691508224ec4adf25469e7b588302dfdd52bf647ab1e613829d5cff1e58d0b50f1bc2b42fe6526e0c985208956513d4b7 SHA512 49b8700ce628806e8611ae0abab8ec08479773e589da31b4a6dc62ebfe732feebbf74d0d07f14dff775a1198cb87d491863c1faa73ac74b3d87d34b1090737d9
 EBUILD flaky-3.6.1.ebuild 1307 BLAKE2B 02d7c14e38e78ad1b414ddbd38f178e6f065c71328bb71937af80424acf0c58721e98c58153ed62bea46769965d8ac9167f666f5d3f44686349e2fe76fdbf13b SHA512 4080210d445c835056147e7b559252c604bacf7f45c645afa5425dbb84fe563b8bbe9216ec231ad583bb2463fa246a6fa801b7a763555e6ebbc68e322a7de9de
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
deleted file mode 100644
index 198d388fb64b..000000000000
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/genty[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	cat >> test/__init__.py <<- EOF
-	# coding: utf-8
-
-	from __future__ import unicode_literals
-	EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
-	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
-	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
-	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
-	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
-}
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
deleted file mode 100644
index 029509940bb6..000000000000
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/genty[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	cat >> test/__init__.py <<- EOF
-	# coding: utf-8
-
-	from __future__ import unicode_literals
-	EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
-	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
-	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
-	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
-	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
-}
diff --git a/dev-python/flaky/flaky-3.5.3.ebuild b/dev-python/flaky/flaky-3.5.3.ebuild
deleted file mode 100644
index 19ea7bf31ed4..000000000000
--- a/dev-python/flaky/flaky-3.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/genty[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	cat >> test/__init__.py <<- EOF
-	# coding: utf-8
-
-	from __future__ import unicode_literals
-	EOF
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
-	py.test -k 'example and not options' --doctest-modules test/test_pytest/ || die
-	py.test -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
-	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
-	py.test --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
-}
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
index e3284e743d8c..68ddfc866e0c 100644
--- a/dev-python/flask-appconfig/Manifest
+++ b/dev-python/flask-appconfig/Manifest
@@ -1,3 +1,3 @@
 DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
-EBUILD flask-appconfig-0.11.1-r1.ebuild 1285 BLAKE2B 5572c2fcff993f95970ed0f87453f412397d446e6cf0470d23843c8f23200b092cb660a812971f60100429e2498ef6227bdae8f2682546876dc755335b8e0873 SHA512 85bf66708a96e70856e09b293dd1ab4a913ad85666793063aeb58dffabdbfd0cd1e56ca67e7d801828dbb31a23681dc3432c400ccd5613b3d1804fd70989e81e
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1279 BLAKE2B e8251979e78191c9d54e3e58a2f7ab10ab1554798a5d2a154c0df0de217de0f28aba5d37f573f02d912a037bd53fb8cb6658c9d5d71abc441995572a389d5f5d SHA512 e455c9511ad7f131ea6afbcdbd0ac464970a0d999ae18ea9e4197a83144e9d186a7a7a95d2dec7b58bb8ba2d0e8cba1a5cd9b922fcec3ac524171f1e6603c1a5
 MISC metadata.xml 449 BLAKE2B 062ef689f336373983993c0c666feb9a5fa6a6d6a19d3509a6856c6f75a4b810fbf6ed6ea42511073691d83c23a63c5cf3a78db1f0e41d2001b146d8b950e30c SHA512 6a71fd90326834e06eab6e45aeddf17940a9140d7ac41e9fbd1dd8551042066a7fe4f6eb6840d5e2363deffb9d00d59283aea87c113b4b190590d545cd283122
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
index 8bf5cf5b46a9..9ea5d50ed6a7 100644
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 48a992a112c9..5e42ef4edcfa 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
-EBUILD flask-babelex-0.9.3.ebuild 1162 BLAKE2B 5ae393d8aad63dcbec4959afd77fa2789e35ed0e8eecc80131bfebdaa655367d9e176a8d150135ab93635068204561981163740f0181a282de6642ec800570d8 SHA512 68f161735d8e905b8e21e3079faa5985dd909c84b1d4abaa93936d5846c6cd9916ae7b5313e9b5f5980ba473389cc3a594c2a52b1ee889030a89701e39589646
+EBUILD flask-babelex-0.9.3.ebuild 1152 BLAKE2B 67e2371adf0f04d65722e3fdcdf7946ad0ccdb87ed740a888889d4841f68c47a66cd2dff5647c15f4420476246502c82cb6a802ffd44202a3846f743c7895ba1 SHA512 328ed17c4638d95ff021ac02b98ccdc471e143690e464719faa3da329e9da7c86037746aa5fc09d1e4ec259e015099573912e4fda31d7d99410a9747b119ced5
 MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
index 8f9800186d34..384e134b7556 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 3ec60aa0f576..729c63023067 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,7 +1,3 @@
-DIST flask-cors-1.8.0.tar.gz 17368 BLAKE2B e342a8d026cec1148448f49a0114c598dba7825d5a3c0ba3d92557c826c2474686741721a35dc5b8970a344b463c1fab21988527dc46846c5f84bfad1aeb096a SHA512 185a4e5785223d547373ff40d18dee2112a8da2dec2ecb39cb7b7c394e9220551e46302590870393c35902dd12e58d3d7cd4fb8fa052828b21d4107457a080fa
-DIST flask-cors-1.9.0.tar.gz 22846 BLAKE2B c0aae306a810fe39c9f7d374ca2af1a89f8ab6e51dfa03c7542ff0009e928ef47370d29543ebf6d457c4882cf25c2cde8df9095974db707f60e7e46f524f3bf1 SHA512 0ed2d4fdd80b43bbbcab4257c3917ea12b39a9da89989e3cad5575d1ebca1523f9cefaca6c36b4dae81629f65936b2cdf3af04c789b28cc03d5660062c2a0e56
 DIST flask-cors-2.1.0.tar.gz 28038 BLAKE2B ecba951b0bac645088658ea5dc4947c0eaf9d0adb8f0f70e3a3f68337e008cb04a5efab3cb8139aaddf380f9b59c2524d33a5c5ac851b98446dadff9aa82fc92 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640
-EBUILD flask-cors-1.8.0.ebuild 904 BLAKE2B cb7e3671c218590484c78a8b3fa57636368f40f1d62518f50efdc644c2680872d156131af40688f57b989d9a2c9fe1d35e503e18bc2e196589d3aaf5846ce584 SHA512 9f6a0ab9e512bcb8251842e42c5c11ce34c68354d987c01b199e96dcc0bd74016510170c6733d60cbf441031b3fdde48ad4bee3f71b5201e76efa3331aa692c7
-EBUILD flask-cors-1.9.0.ebuild 1699 BLAKE2B ccf8efe656c6641cb4a94cb517fbac93c88b6f8bc83e296de13c1769da6b2b808bb0821f5c1b5ccbbc197c6aaf8313f51aac25a22045923d2a15fae6ae9a15b3 SHA512 931a81602ab463df81728c2e5a4ba20c972aa689ce92e2d1850124583a3fe37389a87005cffcb80a3495f77acbe7f3b5a62e720308a89e31d377b4b3344d743e
-EBUILD flask-cors-2.1.0.ebuild 1703 BLAKE2B 2a1dedcfe64884b82bc4998b08a516ee183cd096d752bdfc75b12539e56c0f5c6e0f5c1f6e2714e7ca8f4ab5aec9dbafcec25214a8ca702e74fd3d64b4823c5d SHA512 6c6d4c63f04d8fd6378e97c4b0a7bbc6eab7c8e0ae79d578528865c0b07d057b7b4adb53aa84c28c1271d63919676de1ea8e343c4c93b58cdd72435416d47f09
+EBUILD flask-cors-2.1.0.ebuild 1697 BLAKE2B c1d7d414617e548225909389fabef7f00dde243aa9918117f1f96a2241c17b734b7471f83db098f28e693bb2ad6c7b18c958c8d5dc8214ad3b80d7ef1b0b663c SHA512 1934e08be5cba963a226b4d37e237bb1e3da8d184b69a36c51e0b5430f7be39168715557e1c960650feb02e6127d72099597e10523ae4e8fe064487e141e6f7c
 MISC metadata.xml 514 BLAKE2B 255de178f7bce4d4b4678199a8edf799c2a07bd79c8c518bf28a056a2166169864c3e70315d80a09db14ac15a858cc759f5e401ac9808dc5d7d3f2b1c8495dde SHA512 d91e721a0f45e423cb947f5943d9d0615a17f84401c365584ef3eb2b157259f5bf978a10c90e690a52d49f4160c1991f9edfb26e74768686200149f50a15a443
diff --git a/dev-python/flask-cors/flask-cors-1.8.0.ebuild b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
deleted file mode 100644
index 5c9edc827471..000000000000
--- a/dev-python/flask-cors/flask-cors-1.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/flask-cors/flask-cors-1.9.0.ebuild b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
deleted file mode 100644
index b1681d1c1f62..000000000000
--- a/dev-python/flask-cors/flask-cors-1.9.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Cors"
-MY_P="${MY_PN}-${PV}"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		${RDEPEND}
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/python-docs-2.7.6-r1:2.7
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	if use doc; then
-		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
-		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
-		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
-		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
-		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
index ae79980eef17..153d823f42cb 100644
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
index 837a604de0d1..948da2de85b5 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,3 @@
 DIST flask-debug-0.4.3.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
-EBUILD flask-debug-0.4.3.ebuild 1217 BLAKE2B 26c6f516a0dc18d6721d4135c14ed572b2d7fb2248d95849c1cb38ae4beb4648087a216970283c70d94b2fee1c69466f432e7b7574a4dba9a9d66a8729a3f528 SHA512 cd22abdf7f038bdce9af3df203ad413e98c88a144fb56ffb4c384d5a6531df0bdbdbe2c814e6329eded2320f826e93893946a01b2f461f11836231da60474c6e
+EBUILD flask-debug-0.4.3.ebuild 1211 BLAKE2B c0f14871076f34df30f71c5f814f82b7f1bd438a603ff180f3fa5d225ab08d6fd2f3fae0b3b282f138d0c0e401753742e0577c559f8df975e833d11491419bc2 SHA512 dbc78e5177a49c679b071128d9f0d38322187584a86d2f0938c01c7451a7a2aafa252746e7f31f7f2f725d0c1744a654bfa0a68856b40ac807ce43adc48bf2f8
 MISC metadata.xml 437 BLAKE2B a47818cc11d0365a7a03da5ea3c9fa7bb60d3ec783d63bd8780e11db56dd2093e39ecf4633f462f17cf95e97c93dfbc64301c1c321450a985dcfe28bd6a1bbb5 SHA512 93d72b4859ed2838632f65de971957dc279ccb5897b703b61baf5287a5748f33a7b94f484f8f457b6e4a4e7c5c25e7a5f35506c86e3f539ad7240bbc66748398
diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
index 1c4d0a2ed7f5..8a4e915c7738 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 926ebb72ce20..1e053b3457af 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-Gravatar-0.4.2.tar.gz 14216 BLAKE2B 3dd270e620c047990a099315b8273e60ffeac01cc2dcf152a30203027623a209bc4f895ad3c8a2320a0f0eddeb8c84765e46a601c99dbace8f6983914175bd16 SHA512 9f18faff3dc0b3a5fae4abd538b690c8000fe17e3ed0a9417d6b28e5a40f34143530916bc35c1bb302ed8a72e15bb8e0f98116e5bf7270f9671f8cbbf7671ba1
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.4.2.ebuild 630 BLAKE2B dd3e97bbd34a0dc807ee20306e112c7c0668f6f2497d06ed0f6b5fccdffb59b3ce16b894c91b33cc13a17b0eb9f7df0f2800082b57ff19e149f4024fc25d0232 SHA512 e44877420a65f31cb41e8ed8e067f4076c39d2db8d832735e01b3db17ec0b96e971c209496fadf2a6d22b93d716ce8382ff2ed003f722c30d3362447133dc2e4
-EBUILD flask-gravatar-0.5.0.ebuild 626 BLAKE2B 591777fc12dd8ab725453f522353a064218211e4e9a22892536ec12dd5aa1988b78084bbae9cd65313c2409429d4c043952c5edef108c5f63cb6f99b8ac90d2c SHA512 b0165d934744623b0af62ef60fada09da2b5d99480d0a170dd56f340406381fbcb4b6910a13c841683e7bb5e8af2250577dbb3ab344495a356c0b1f4e3e95a77
+EBUILD flask-gravatar-0.4.2.ebuild 620 BLAKE2B 06fbae609c589166e990d549964f35276d2fbe918a399c990eec0706f8b925732397bdce162c623b819d94b60ebd94d0a775741af5aff9cafd918f8e2fab731b SHA512 b384985ba4d1119c77e393a5e65db4924b2950ac419ef2e9191166440485b0921c80a1e454fa51e6b55fc18daa2eac0026309a67d5f6b33193fcc75e47947c95
+EBUILD flask-gravatar-0.5.0.ebuild 616 BLAKE2B 08e91bef1100e4c3165874c95e94ac6e59b15e9af9d8e9590f028c398fbf196f12fd105156708501c69b88f980a2a442362008b88e7ab98f7c0bd0845e8734b8 SHA512 33dfc178ef431cf137fa4b4ab2d1d922c737539d08fcbc7df37f8ac9ed7a2c89d3f3212eb8322551a395bf8a76e149b06515759a39ba838d1658804fc477fa33
 MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
index d3fe1f19d85f..6c758584e469 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 27bb3a7103c7..8c4f7fe1bace 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 37ddb065897a..db0cc1558186 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -2,8 +2,8 @@ DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d
 DIST Flask-HTMLmin-1.3.2.tar.gz 2991 BLAKE2B 2f7dd1bff1c67e7b69c3d0eb5517ddd1fa0a2c9f5b87e9017eed207c4536743cb73cd6962f7f6d82cf1e061ca5a4401154464bb59f834071aa33853f0be27a3f SHA512 cb8730506a445fd1709ecfb03b7bec37df2d610f4c0f42aeeea0fff2ba1e76b9d16a341afb8684792a4ee6e3852d5eabdf7b81b229533b35c28a5362f58a7f52
 DIST Flask-HTMLmin-1.5.0.tar.gz 3609 BLAKE2B 0e3eca5978d98be413d9e52caaa25ee7949fc3476e9d046417f1a2328e4460c60728c1b9e3e892b3549effb64e6a5b472832e9fddbb1a7e9780ac2a49f75a12c SHA512 73c551237c67d5a0162f0ac07b5b9a79ef06f082d6df985155dda283f2276b7272ee6f2b4c47fa755af30ae69c7aadc9f3cf595c7f8be4fe41aa06bebc15a66e
 DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf6606ac31858fd051f46203123fdbb2e3707575a91f545b7ec57a1e6f4cf62f87c3d387cc7ec321d7f1f9e4b3c6038fd SHA512 b468b95329054f996ad275b00f58dd2cddf52a029eeb08ff83acc5ef37ff0557af4e98181c445a980da2eeb21dd913ec1da08e0953fb97765d4790731353dcc2
-EBUILD flask-htmlmin-1.2.1.ebuild 568 BLAKE2B d8a413419da0817366ea689080d08c166240e0fcea66fee46ff7ba3d4f7ee6bc30f8f4e486038ecb92a4236cf837ddaa67a645c2147168840724bc79c3c4ac1f SHA512 0a2aa4b0f83aac94102daedea86df293c1d93fd4d7768fa92e25e8b11ceae846539ca752af5f81d46fc2f24b65ab870f310c2e69cd974eec8773707c46dc561a
-EBUILD flask-htmlmin-1.3.2.ebuild 568 BLAKE2B d8a413419da0817366ea689080d08c166240e0fcea66fee46ff7ba3d4f7ee6bc30f8f4e486038ecb92a4236cf837ddaa67a645c2147168840724bc79c3c4ac1f SHA512 0a2aa4b0f83aac94102daedea86df293c1d93fd4d7768fa92e25e8b11ceae846539ca752af5f81d46fc2f24b65ab870f310c2e69cd974eec8773707c46dc561a
-EBUILD flask-htmlmin-1.5.0.ebuild 679 BLAKE2B 4a14828819f58624f2ba60094127def750d1454c44a565172993f7cfcf92a5068284fa73b90960b0746914bce137c838be2fbd839b1ff611836f38d0e7668224 SHA512 76f201231875eb9b7d422b3571c41bd4871fd1c49051802517ebb4ff9da85d53d05adb615671d2077fb9cd20e036027cbdb4aa94e2565f089a6ad47cd9a80be4
-EBUILD flask-htmlmin-1.5.2.ebuild 681 BLAKE2B 9f88b6acc71f99336adc46e863cd6001f9cc47782d26796958fd24256b37f579156b0491a02cba94926e50b74544f0501f90a2c1cc39794807ba36042ae24988 SHA512 3e3e22a9b974261c2daf3a1ade0d666c2046c3d0f5328d5142b2bc4c62ecfe7115bee536ecdb3d4c1d716957d3599357ddb6477422fae6a4ad4ed9cb00e40db1
+EBUILD flask-htmlmin-1.2.1.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
+EBUILD flask-htmlmin-1.3.2.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
+EBUILD flask-htmlmin-1.5.0.ebuild 669 BLAKE2B aa5abebcd1e58c692991a659a39c3f40746ed6df6960a3643769c0c561e145bc3dfd37c1bef894353a1e1b121416e58b45bf3a9eac6659933a6eb34dbd606e90 SHA512 52f2c917e36cd7881a7692eb7d7a4c6c5d41c4eaa0cf34d2003da9a093a55bb9626583b54536afe0cdf0121c123b8292db17b559320aec6130cf0f1107f4cdce
+EBUILD flask-htmlmin-1.5.2.ebuild 671 BLAKE2B d8f7196373066b9faa340689ce651348768d47d1384676a7ef6d8484dc784f4e0b38b3527628e8f0f53e37bf752f9230dda0285e3100f8738018e01f38ceafa6 SHA512 f6ae67c040789999a75e4ed4e180203fb9cfde1afaebacbb80c489d568a0fe8bc0cf86e32613c8e579cdc3cb133dbae91f29e869517c521c633b650a231a1567
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
index defd667db78e..892ece2db6cc 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
index defd667db78e..892ece2db6cc 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
index e57214b19202..708c06e1c93a 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index 22b4b07f3666..580d4b4e7100 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 861ea776e694..535f7f2f855e 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,6 +1,6 @@
 AUX flask-login-0.3.2-fix-tests-python2.patch 1115 BLAKE2B 138cab48cbf144a3d4d4704ae293db79e9d41b30326bb2ec28c1c00e75ceec42a2b0eb46bf61ac369bd863406b9fa4a3d7bdb81421e1288ef19d03871e7f5d02 SHA512 2796244a27b504feba773d29cf394ed04b8d7812d8989aca9a5dcd58207c3b192545531c23883f9d6828320adfb09f31388e92af72da5d5a2d2e6df05b89282c
 DIST flask-login-0.3.2.tar.gz 38626 BLAKE2B fbcac55e4a8dc5fe78b4b5b3cb8acbe7293bfcc30ce5323ebe992c92407238198d34724179ac12e688875356e54f85f21a2870249ccafb48499df3880a6c2062 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
-EBUILD flask-login-0.3.2-r1.ebuild 913 BLAKE2B fd31837e748cc80d91c3b09850891320eeb79e28b4ce0030e0d9bfbba64fb046a6abc69caf366f87bd35799974047f71ea9b1a5573fbb22efe96caef4f8b47fb SHA512 93af5fe9390c5a9cc79cc39c9f938ff3d4852c535e761e8edc4ce2972dc9456adc1075abd9980fc57cf1ece3d344af9098f3333e7e3515d2447c9a6696ecd473
-EBUILD flask-login-0.4.1.ebuild 1211 BLAKE2B 5201f1864201d15c60f41a4ab64bc62e71441210f956fbd88d735a631638f2b1180f1318ec463b3642a4dc66d52d2450977cfde6e5cdbe221f587aae79aea10f SHA512 1e972059797e155782b813489a68d25e2aaea4e4bb0de75f2df74f65a9a6616dd26acbcbe8e10d47a47c72b960aa3373926cd69410bb6e3324d516f0590c0d61
+EBUILD flask-login-0.3.2-r1.ebuild 903 BLAKE2B bd299a49488d3617ec9b5b3fac545e5b2cc38ef15a6d1bed37183449abb6075da1f2a5680b2f6f5317c3433029bc1e5144cfc5d77d3a4590ced8e4b08fd04c3f SHA512 9af0dcf13b0f5148185e49155cd99480cf186afbbbd0c0af99a8fbf5d732b024de848e4961724048ebb534b24172a118c6647991e0cd12e6c2bf68c5ec59ef86
+EBUILD flask-login-0.4.1.ebuild 1205 BLAKE2B 596161a6700310d710287ee787bdc5354e6bfb074109215588c29188b093db73f7fbf1f21a5b9b0bc91995bc9ca24c79213ddbbf70e5e81eace2f01fec3875ed SHA512 46e0a834f43108e3990b4cfdb1b6d4ed1e30bfad494b371d889922228fdab9ac91cde02a9cee0b65878f02cb7626cf7e35b6cb306645a5bcca5944ec67323ab2
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
index debfda82ffe6..73228447e62e 100644
--- a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-login/flask-login-0.4.1.ebuild b/dev-python/flask-login/flask-login-0.4.1.ebuild
index e32ff64de8fe..33f04a0329f3 100644
--- a/dev-python/flask-login/flask-login-0.4.1.ebuild
+++ b/dev-python/flask-login/flask-login-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index 22fc49c66c03..dff951f13603 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 1068 BLAKE2B 3063decf9ff3810207c696bc19fd07038e4969284322ff45cf0bf19f236526690bd6bedf146dfe14c2a72d8053067d4532c48c44efbe3c6be423105a8f21939a SHA512 05e8205478317e0274eae38b2c50a68bdad50c0c3dab2b0fbf64dd4f3c1a73b2e7b7ad72b1f352970fab889923f294b9b84de89d2e43b476393ccd271e59d43c
+EBUILD flask-mail-0.9.1-r1.ebuild 1058 BLAKE2B b17ea459bed40703d7cf1fe53ccb120c8ac6c0c573d77970ebafa7935cd8956213ffd7586ed2c5d2f8c0013300e4cf69553e4fb45dc938e2b565972a92d127ed SHA512 979fcdbad92bc9f898d1b393ec3dd9dc3b7aa25b8cf9626d3131584c3d4fa258e3a1749d2a2a57eb5098300c5d8aef0fb0dcfafdc25581512fb0091952823b02
 MISC metadata.xml 313 BLAKE2B 750a760388ab833bed8c5bea79a563798f3f47790fcacd72779bcce17678a2df4214e22e3c5c636d9f0a1eb6892c235f9a573e991a518e68319d45ee5dc9f076 SHA512 b898617b8854d5d1abe05a263ff182c9734539aca8a7ed6721db1de0a9c76c5c90aca7867fc5a213b0e938d2b610ca48a79c3b71b01ff5291aadf6f46de93532
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index dff1420cb773..31281eefc272 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index d99cde024b25..12241f247b1f 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
-EBUILD flask-migrate-2.5.2.ebuild 872 BLAKE2B e3da80da7363b3c7c6e0136b9de899fab8111a9d9e55f11633060320e111c40186710d50fbee6a41f1b2ef3322683938ca6d62a10f17544b94e1bbb596c948b8 SHA512 c7bede253ce1d949ece81344b6a05aab011744ba783bc0511837c0f1276e6be4933c44ea14ef60604835cbdb25ef09ae260f3bfad2ab81da258745e21651fb35
+EBUILD flask-migrate-2.5.2.ebuild 862 BLAKE2B dda99bc1aad79d33e38844fd47da2adecd06310e8a1bb97ae44e56f5bc6278eba02cbda1a5416969fb13879d56cb15aad5dd114962585f424709cf01224ac50e SHA512 c4a09e6479535a94acc24d7edd87e6b1aa615780f84129edc74d4b9a7acba389b89012f94d0855309f324fd096ecf12f3be500dadccf8ab611498905dfe9a8c7
 MISC metadata.xml 316 BLAKE2B d01833219129a9ba04f2198bd569d605319bc4c4d604e69cb6a50a5d855e0dddb6491f78a6674b939476b7128d15c11aa35d0f9eb44db149d3053c004ead4bf8 SHA512 1dfa03b638a9c39be69148ea8aabb4554326dc65bc3a004a2eb93b05fe4be8d667efc7470ea35a138bbe1bae17511a42d530448a98da5c5eaa3eb1c2d3126ede
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
index 55ee3028f874..ef77539ea5c0 100644
--- a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index f3bd0e5c4347..8d33c6cd47f7 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
-EBUILD flask-mongoengine-0.9.3-r1.ebuild 1163 BLAKE2B 412749162e3a04136cabfaf643c9016e8405e7ffe5067fd43646ef583c19b863df767aaa0582158f36131bb19814e41731cfc71eadd4bc75577bafa74b01b669 SHA512 8c349010407af659522915326cbf2a3952f642028218d8c6829eda3d67bf4d3c8324c8557fa853a20578a471e7bde28b31e5a8012c9460530b58148fc278a380
+EBUILD flask-mongoengine-0.9.3-r1.ebuild 1153 BLAKE2B 0a85e37e870833ea02757f3ee89f73191503fe85d2db69d83684eee431f3eae0acea6d614999f45be7245f1e188a70e64d2fcbf07688a1f35954fc5d2fb61eda SHA512 69ce15907eca5b48bb8b4ce19ebaa01571a4f630533ba721260af7193d29840f6bf3a4725f676d6f3c1338fbd3b85c43469642f91781c8ea7380372cd162ac7f
 MISC metadata.xml 330 BLAKE2B 590f7ce9feffc4646a100469830bd4db174302fe419eb50ebc227fa9e7ae543b4d2a2da0d74b333ee4ea9db3c54a2ec9858f9f3cad7e6e063a4609ba11d18f00 SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
index c84807b41ce3..f8eb13822f67 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-nav/Manifest b/dev-python/flask-nav/Manifest
index 6c37084a3bf2..47b1d76c2ea5 100644
--- a/dev-python/flask-nav/Manifest
+++ b/dev-python/flask-nav/Manifest
@@ -1,3 +1,3 @@
 DIST flask-nav-0.6.tar.gz 12270 BLAKE2B eff90b6fc08629139012e2d920b4d464ed06954040a5e97636a7aa4d59d11654839460ef52477cfcec967bd774d942028a53675d682e850f08f6359c5cfbb54e SHA512 a7930687425a53fac9ad9a7cb65c2e2a759a0c9660189965bf37ea6e9925dd869074d37a283801631b3e6c3391f9f4167e0a36294104f72970e876b5a7a0930c
-EBUILD flask-nav-0.6-r1.ebuild 1220 BLAKE2B 12a0c429ab6066eab79f6f95a765f6044ef62b785cd240990e7bacf607cdb7726ad19ee4c8ecd44ac33b69bd26383e783670fa4a1a4d8fddd7ea847a59b9fd36 SHA512 f7f7b8e3adc8913c5d5fc1fa7402544df2954d2b45a6630ec55b779b36f630696b52b5912aaf8abb9676e8724961086d13d93253227c1041141f34b11dc71e7e
+EBUILD flask-nav-0.6-r1.ebuild 1214 BLAKE2B 1e413d5f92f7e91157f35db0a864fc1833aef26cfb0d2195578e1cc7ddb1c29c000fd6bc86005a3c1431edca363989840378c49be72e1a87c749047409016f95 SHA512 d49e661ddc270446eef69cf388257699a656e74a3f04ba5a30411ae0463844af9e642388d5c5e71fc16d843ba9b24805bc5e007a988165dd2548b17c65e97335
 MISC metadata.xml 431 BLAKE2B 949791299994b108e48e5bfc9076726ffac5a530783464f54b44deb95646492078e3cb608e99382c04b2ae825336e644433fa5ce7775e7f44d39f6e2840565b5 SHA512 aeae5220fab0583fb7b5f4a0e694791edbaf6b9f5f61fdb04d48b4a91f12726b3101e41097e26980404a19e8b6c5e43723dfc0b61f8d4cfea0f6a5924f8b67f4
diff --git a/dev-python/flask-nav/flask-nav-0.6-r1.ebuild b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
index 9c3f4f6e8cdc..d8fdd36f3ced 100644
--- a/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
+++ b/dev-python/flask-nav/flask-nav-0.6-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index eb27a4e46fbe..616a2e07fb1e 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
-EBUILD flask-paranoid-0.2.0-r1.ebuild 671 BLAKE2B 1b3fb4962b5b3e5e91161a1541a3c8e7e0a9ee4b5fb46400cda54f41a87c062ef63824e6ac1300b00847398f72ca3cbc172e416225bcea60568b4b17f33606ac SHA512 03ff5f581e9891e314ca219b3ea3582497eb7f2e93c31786044d0b4128e4bf8389bd2b93681421feafc05e0cfb6e6176fc22d78ecffeb6896653093ca0634955
+EBUILD flask-paranoid-0.2.0-r1.ebuild 661 BLAKE2B 2443322271d86a8d5526714e742a6c7823639b3a50c1028ffe3d2180668aa488aeff599ca88164f3fe53a581070c963d3278f796e47e34691dc7c75b79412440 SHA512 9d40b0f591b45a29464fd995101f0b0342e1228e4bdac439e83363df6bd9f6e18f213f32b444db2d5c4de6db11eeb7ea09575c680f84b7c27242bb38fd00431b
 MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 527165b0801e..054f64cede2a 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 eapi7-ver
 
 MY_PV=$(ver_cut 1-2)
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 2f61a9052ed2..6e9473fc8571 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,3 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
-EBUILD flask-principal-0.4.0-r1.ebuild 791 BLAKE2B 699e72564ef46a5b4f438a2de3e8cae1b7ad66ea30d5f26059802dcfe07b287fd4c46a5c3d1b40de4a81682534140cbacd3fa7fd2aa2e31c723109eab7d982a4 SHA512 43bdda878818cec156a12c956923573ae49b736654842f0885b61dae49782e48109610f14d13272847e671875de26fffe2c456337c7432d4cac7a117a5270803
+EBUILD flask-principal-0.4.0-r1.ebuild 781 BLAKE2B e243c5f5cc5666a5078b48bb84e22f902ef8b2ece9207f9335ec2b252d3e1992d14e89225f81d78d78ddf545898e2fa179bf7c702a73e086f68b1bb9360f62d1 SHA512 f70003adcbc9294432ee99e1ea43ede9c114f3052b14cc670a6a6b8f538ce187aa0f3d9f9c4c7e81ebcde5ba85d6a1f031ed2e973a9dacd5c948e94b791a0f16
 MISC metadata.xml 385 BLAKE2B bd3864394906ea719cecc764a75db12eb0dc3e7e59c96859665e59fafaf206860f0a9be2a49cba98de5a3566b9fa7e8bae848de71bd06ec41797364f0c58b463 SHA512 453ca2da57ca6cca5d2b4d55f048827f0a62e5d629af12120a314117a2b11fa405402580ba5da933bd5eccb924816dd6471a64cbe409d13c22f3a923ba815f0b
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index 557b45342bb9..cd78c47f24b7 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-pymongo/Manifest b/dev-python/flask-pymongo/Manifest
index 231b01c03706..d8f19b5ecca7 100644
--- a/dev-python/flask-pymongo/Manifest
+++ b/dev-python/flask-pymongo/Manifest
@@ -1,6 +1,4 @@
 AUX docbuild.patch 618 BLAKE2B b2e228246d3cfaeb50783e3a47f8b826c0226057677563b26ad2b393312c9f0b763f55efbe82593dff2cd700b3f84ec253e80ba73da524aae7ddb9a0693f5287 SHA512 20ae49b16c4070e9d988e27a3eb7ecc35106782150bb24b95ef1656707d4ba4311a04aa86c3bdf1ef5886fef3ca41fef0ed8ec99260a44e742dcc00d3c63c1b8
-DIST flask-pymongo-0.3.0.tar.gz 21019 BLAKE2B 40d408926d6779d6c23de855e72b98af517927a2ceca3787ca5bd1cd9736526dae13e9fa76eaf71391e67f62c511ee2c9be9ff62ec93a20b0ca80bfe21eac9d1 SHA512 669e2c2df4c3378aec0a9f401120ceee2bfb0452a093beca6e7adaffd764bfe0a90a5e5b82d0945933693c3c179f3a0bf56cd4a2e03ab0522065eb650550ff44
 DIST flask-pymongo-0.4.1.tar.gz 22323 BLAKE2B 0a9a1362158f8a8842d746a1228eac6b8a13306202e2079fc466ddf89afbcfc1adf5d876c7c9e942856471595a0f140149fa47cfdcde71b0db6ed6d46dca49de SHA512 2d64ae430ee9592204462b5b81b4fe2d0f5fa8e17e03e1b139acf28b11330d7ef990108f1d49e3b968618acaa2ffdd4e26901b1e03b85f8f25ef05d59f5d6d83
-EBUILD flask-pymongo-0.3.0.ebuild 1077 BLAKE2B 9af0f5e894d71d7ab4696d95c92fcd0eab24564aa71ae041e0338fbd88c99a3bec51adf29a63c1d4a3c2e56f964934a47cc32310cb04b516b6e3ee38cf329b8b SHA512 0eabb5cfd73f4dc389aa0336fa73ce0e4127ecca4778db6d9d4d3b479d03ee10d855619f4f4e4060db959625024e886522f1ee9e9cff5dd26072ab44c5644048
-EBUILD flask-pymongo-0.4.1.ebuild 1123 BLAKE2B 22f0d75e0aed3bea6ff6cc4f0c701a19662ec3d8455ff79b87dfe92a7a33ffa693c18e3f1a8329306eab6244366f0093932f01174eca4baa3f7af4ae4857ac84 SHA512 95f63cc08fb88950ea4122d4c517a88ce8aa43e233cbb5af1ed94e9a49d84b7671a9bb3c048b92f68e57936e478a83da88be79505b9c3662904f322e5ac40e12
+EBUILD flask-pymongo-0.4.1.ebuild 1113 BLAKE2B 9e12cfd9d75b0a1e877517f18a43d86f1fab8a923db2a34baf1645ca22b64b5d0064bfa5006fb87f3be4c218cbedb6e2b5353cdcce59a3ea4724fd3a392368cd SHA512 c5280d341ddec2105b1dfdc9240c7a8c3c35dd088ae277c6e8cf6de7421728ca736a790002e028af75ba6d5837b48dc0a4d2641d621a85b4a2559c7dd25eb75f
 MISC metadata.xml 503 BLAKE2B 651357b95af5289d130566d5e9c9af678ad6b09a794491c9de1e726da1bad047ba743bee717d70b6218eb87e8fcdb7878af551aeb9c07948c40207f99bae5f32 SHA512 9cf902fcc48e65e0676376dcc1d7a943e5df0852c905b98cb312305e8b3d61bde14e85239e4976d0bc27f7205ac1c9dc84114177217397bf7ccb755744a36cf8
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
deleted file mode 100644
index f03e1062ded0..000000000000
--- a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
+++ /dev/null
@@ -1,44 +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
-
-MY_PN="Flask-PyMongo"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-PyMongo/"
-SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/docbuild.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# fix me
-	nosetests tests/{test_url_converter.py,test_wrappers.py} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
index 920a848ee2aa..1475eafd4e86 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index c977084d3efc..23fab943e80e 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,7 +1,7 @@
 DIST flask-restful-0.3.5.tar.gz 113214 BLAKE2B 0acf4d0449c55861b801a990bc3220d98e47ebeacb3c5b6452774992ae19ada97e31922e440a8a533bb1be68d4476e2654a8ca224b2369fd7733cc4c0da465c4 SHA512 a541e6739644b4db6ae97cf529bfc43f3136c97fc19a8538277d1f9be033b7c6dc3e39e1c4b2f313e099efbe750dbdc85c67b527224df557567ecac668e5969a
 DIST flask-restful-0.3.6.tar.gz 114512 BLAKE2B f03f7ed0fd521a265b8a2293d1526273650a38f65b28933b4d90d74f7365e04650efc89a743a49ab7c9fdd59d238958bb7bc03936f44af8728a4c435d2df23be SHA512 c5136302111e6c8953e038d31b42b029744111bb916dea7ec8bd5fac2de5e17a86d30a7d04a7335cdc5da25ee13f35ad9a6d284166e11cca0c6fec96d23fd977
 DIST flask-restful-0.3.7.tar.gz 114238 BLAKE2B ec960f060b3a1a36e538606d710a57e9d9fb3b1c2c1ee1874c5f7592e9ad8a9a2af4716f820f27ec1a9e55fcb0505ca711c6e045e6cb0ef8c9c64de339871710 SHA512 1d1d066dec5f39af3197b680f791d83df686602b703efe874ea0e81d7f3b65f605dbdb63f84fdd07e469c6824d52571e195ae70f58e1543b53f13a81e1cd8543
-EBUILD flask-restful-0.3.5-r1.ebuild 1304 BLAKE2B 27e3d50cf4206d8420f852bf85aea38d5838ca4149d5e47f5ef5666f9f482a79c0272f36c3663555eff7cc4dc636667f9b5045f677ba798dd69dd8e658774d1d SHA512 9bfcb00ef219403049ec5b234865565f83148add48e8a470515ef70dd21e409dc978c2cf5cfe96622d3e12f409180e32b4ebd3083e99f3aac269d36f17ba8891
-EBUILD flask-restful-0.3.6.ebuild 1313 BLAKE2B 88def14488459ca470aa27a0e111ae577ca76913d05b29d45bb432adb69f3660628544648fb80df5419f5d3512ed6a4f7b6a3aca46b6c6692920e1a81075c77b SHA512 ac7cf84969108049b725c34cf5bcd00fea5c467a48b05d8c0f55c604beeba0c0a1f402eb7b2fb2cb464c77266b7ceb96c5f891dd4c243a8a04a2e026fd4ec60d
-EBUILD flask-restful-0.3.7.ebuild 1315 BLAKE2B 5754f681c3fe34f2b298c35e74b77eae68554beb531dc79fcb67c05d2f6883dfb5066a8b093e652d774eec7274773630b28ad95bd1e1037279473e6a6f0b679a SHA512 1e93caf84c4e3744ab2eb49c8c5f00334d8f965ee55db38877e6ca3baa33e329044bae45c18da67fe22772c4a4067181fc560a14154c48b4453a87af02a392a5
+EBUILD flask-restful-0.3.5-r1.ebuild 1294 BLAKE2B ff0c70f2147eb1a73efb34d4daaceb757114a72fd052730dfe12db2af8d47289754b18c20346960be5ee0e0631ce805a477cafdc7f9ac1408cd46b3b07109f1a SHA512 546e942e1befbfc799db2b5661d54c2e1b6e022629573ba8dc376812ac420fabb4e7260c789d9dd40be1b06229083f483b50dad819942c9d263c8db07a801772
+EBUILD flask-restful-0.3.6.ebuild 1303 BLAKE2B 21786f72f998e4ab778e603f138865029823d8fbf9ddf168f4de9cdffe07f00253b54cfec1b4473effedb5446f2428dcff049c931c26e4ef665031b5f97df84c SHA512 2ce8157ae80b6db81c2c1dd3335b397ceaedbdb9c5724ed27af7f0fca3b9979642a1aecfa14de38c17867ea8307079a3f3ca2a00032c3f14c2591377b0633898
+EBUILD flask-restful-0.3.7.ebuild 1305 BLAKE2B 49cbdcc2f998dc36cc4b638e5c889b31c6f0a058191ee8b73ef6d5ff87693085342911ca508af81ea20c9f26250e3942579ccc23c06e006e669d48031b35c71b SHA512 57a099305d18e7964d3c3a3c30e4a036bd2f4033dc837be4444280da8cf552c10605a91403ed45fbb73982cab9281eb61458c2efe9757dc4ff090078e8572770
 MISC metadata.xml 400 BLAKE2B 73ff908518d52fcfb2aaf73571c5c1a36cf0cc749b0d1f5e2c28780323b096aed34644c8bf373e241112892e08dc184d0310bcce52aa583ad6301473cd7a4248 SHA512 be62c37c4d0fd8a051cc14fb2a9dec6885a1e83420bbe95282a0fdc7803d700372b345d83c3d648037c45080246d71b91086b3e4841d9e41fb3003d7c114e0c0
diff --git a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
index 77fb6fbf84ff..2222cc76b5b2 100644
--- a/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/flask-restful-0.3.6.ebuild b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
index a63239373d1a..7fd37c917f42 100644
--- a/dev-python/flask-restful/flask-restful-0.3.6.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-restful/flask-restful-0.3.7.ebuild b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
index ec37d219a43f..2662716efc18 100644
--- a/dev-python/flask-restful/flask-restful-0.3.7.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 52680ecc2e69..746951435010 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
-EBUILD flask-security-3.0.0.ebuild 1424 BLAKE2B 2f08d99995f1237a67f5cfff95515acf35b3c51e60dea4c9e62ac22b694701b246dcc1b6decdb84845ec852745293d983a1cb4bde7395f591456fdffc4f31e6a SHA512 37eea8929df1bf8841dcef50c96f816217c9c46c4e66f6c9da53bed05f21e9f1321e7a7b3956a2092288a0f15d795fbc4d507bf94c1eb16c9e645214406fa9e9
+EBUILD flask-security-3.0.0.ebuild 1414 BLAKE2B 61889a483da2034e409045db55cc2e219f3a12d0ce7111982be9b4c0ec2c6f4513c2946a041d4cf46e3c798c88f491a492767a18902269be52420c5d8d6d79b8 SHA512 02fa53c260b0ffef632c3041255ab219e1bdc0e584292da867b3e2a5a1930c57e640f0e8790c643eeb32c4b0b1a6ac2a59124403eaad5740925d27e33933d101
 MISC metadata.xml 317 BLAKE2B 4889668ab37b857d0e46000d1663eb953b8f54b20e9ea16979d9db73b6d96b3fa8317bbb5cb10d9e4b4cf0268b966531e33b1bc4a9ab9758768120466999e9cd SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index aee136435768..edb006fc5544 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index d9ad4e931167..2d8e4ce19fc8 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
-EBUILD flask-wtf-0.14.2-r1.ebuild 1380 BLAKE2B a466a2a0297dedc1966822dedfdb588ce37ccc04d5f595765aa04d78b2087fc5f759f06bb9dbcaec9aa93e4f8b5ff4d7ce04c58c791ab6ba3ab63cb32e4497b0 SHA512 5a4770b183176546d70a158912b454851640ff2f1180b81abf9373a912e4cf96722f5cb66704705b3b8aba8ec152c54f826ff7625a085c2012cc1e754d1e9b95
+EBUILD flask-wtf-0.14.2-r1.ebuild 1374 BLAKE2B ed81894868a9386a640928e2b21ea91aa6375139717c9fd5ab76815e2c1351f5bf1bfff3d79fec5a6955643e697c7649bcdfd5da6f496c0d8fe24e0cf48a4004 SHA512 0698501556c4d01f609506da2f7ab07e21c5ddde3df302ebb4564f8f54696c99a9fe98c4f8328d5da3e5890a9d13e4543ff0cb1df6fcb5eca722f6f8d7895f80
 MISC metadata.xml 635 BLAKE2B 1914db37789f92c3a41a30564fc58298b32a6babd32c812f3c5be7dbd22e5ebbea6ff4c7139772bbbfefb502f8325ee9fda9854ce9b167305541e8f56596cb90 SHA512 67b6dd0104a4f949aa2df5f9de39c7d77c18ee1a20104e92b68ece9c9ce04b7d7d27721b4170b562855862c99f4080df0949935d23c8f82cd27d15d8e93972e9
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
index c62c1eb386f9..1d0bca5eb449 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index c626b05996b0..1e70be76d7e7 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -6,6 +6,6 @@ DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5
 EBUILD flask-0.12.2.ebuild 1852 BLAKE2B 227bbfee82cafded94dca9fbd8492c5b14fe4921bc9eee93bc7559bd2af90c510f76758ff9a323f26698266e76533448be0d48936c66a19afe58e360a5aeadcf SHA512 76caa706a286644af614cbdd39bf9ef6e609ac8f98d9e7e5951db84946ba105ae6defb64a73d5af1c3106b91b2155bd24c5b820c70340cf88199193deb496857
 EBUILD flask-1.0.2.ebuild 1560 BLAKE2B 9a6c26fd51921b29c8fefad6a09fc4a9d9a8c16bebd3431194b872893ecf0012457167d20bb0e8820fe6d8a5cb6b25e5f1ffa95b5c279d5a36a69cccfb1b7b9b SHA512 bb44972822e4e0d2b09cefce23ed5f9c9964fcee15db9279b7bb356789aaa29e5b45d6b98b033108710852eadc730bb7454054885cc7019e50aefd5de9d5f638
 EBUILD flask-1.0.4.ebuild 1566 BLAKE2B d4e6a59a03460c2050de9f4f4c1655948df2375671d3d6509eba08ceaec8915873c834e315c6b6b448934ec2fac7f350d3a7caaf25a78bd8f29abc43bb8895f0 SHA512 7e14a329956f2bae023af857b1ddbd53fab8d3e6effcfc4518a3127e3cbdbce0313a659bdd33eb9071edb7340aee74367f504b6c7a57e22995cc490b0431b98e
-EBUILD flask-1.1.1.ebuild 1409 BLAKE2B f1f2a7b1f20715a6c85038c33d505c8e732251d75a7f5d6b615af92bc3e814f3d7cb1d234793001af0efbc3ecddc7f094a53a4103bd2dbfa3f48c88fedccbfa5 SHA512 42db66002f667a62fb8e6c503616054e129825209da5269556d88bacee84420b1ae0aa01bc9c484dd89cdf3aab94c7c8e0567c5411e2d70922a45ff694f29581
+EBUILD flask-1.1.1.ebuild 1415 BLAKE2B b956e7790630901883129e5f0df89795b9048f902a4b69326d303109cfebdc557d64a6edb24a7aa0a90bad15e9b3a2f86f2031e496f5599050c5ce31c6e0dc3e SHA512 168298edbf16e11ebe97754453700f31e422aa4006c4a4d1c531678789016bab36f0a659f24448bf42b31e735c9d8ff553a04aa0dc37de698cfacd02800c8474
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index 308df9bac228..b43a865a386f 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flexx/Manifest b/dev-python/flexx/Manifest
index 48233c0bf0dc..6e6c815e1ecf 100644
--- a/dev-python/flexx/Manifest
+++ b/dev-python/flexx/Manifest
@@ -1,3 +1,3 @@
 DIST flexx-0.4.1.tar.gz 287596 BLAKE2B 768100f6ed38ea7639e79c23a74a2ba38c41e4450920be4c331c159fed92ee8fd143de28c33ac7eb2625717c2fd53b90571a0a9064b36e5c9be4883d6e71468d SHA512 af9d84876d2c6b5f8b9fe7967dc282e4043456606c1574c10cfcd15a3f3d0d3f8f889a41ff254655eed06200b5d9c10fa27249343ee689ff62346031a4ed607b
-EBUILD flexx-0.4.1.ebuild 642 BLAKE2B ebe4ff62a7bcc9daec86f5268b83638f2c83a805b47d3c069dd79447dd09ce0f8c6de0a411160165fa1c88c6af4a7d7e010f0e4bda3040971622932d0ab3875d SHA512 8b480a80abb1534f14cb3d058a9c07083d6da6cf73da026fb79aa6126044f0d43436058267ea0706982628bcd2fad8be5b85725bec6ce9d00d6ee2e3b16d45e6
+EBUILD flexx-0.4.1.ebuild 632 BLAKE2B bc068ecc73fe7a691cf393fa39d87e2da484c120263dbd9df17dfab7176b8bab5d8ba324471190fa43b24ee0e008cf6eb044fbaa138abf4a629158b978777acb SHA512 29f3deae9a3d5cdd1a968c210e4f70069815cebd8628da2476197db6ef968cc31e978199e0a745bd351b839611c6bde90f8ca4179e3613540b54462362d6cb2b
 MISC metadata.xml 509 BLAKE2B cae737d6d72895541b62c3aad8301bda5b44314fd46df14237061cfd260a57f524d803b7054927834b00316d1add8e28be4fdc05adcc6142a68986944e263ccc SHA512 5e15dab8c10def713dacd1e6883502c075aff68e72b839d89273d28b3edc7ad03cc82152e1f4fddbd416b08fb0efdda3df26832c99bab7cddf700caba0258492
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
index 4a302dfadda6..c79c0bc52329 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 93042c53f91b..09fc97204eb8 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1,3 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
-EBUILD flit_core-2.1.0.ebuild 1003 BLAKE2B dd2111d382d6ccf9868a86243a4716e1d7f1bf1505ebdd94a65b471aca0ceedb5d7cb4cb116f560ed246df684b6ecf7df577184a216f893b573a572b79fdb3c5 SHA512 502085c5fb418007f1cd406f851499f9f55b10917053af1d0621541b7468a4ec05b0f547eb0e8086fdce672c88e67588a4b37587fb1b69e1c393dae6e904608b
+EBUILD flit_core-2.1.0.ebuild 993 BLAKE2B c2186df9c2d8afc39f6b1570a85ed6cc69a792ad0bb35ba7736d5d7d388b24616b799747a0b564ea36d97bca6df8d63d4648fbe1309b49ba9f4c4ed33144507b SHA512 bd334cadbf5fa3c77dd2a52a34f763936196a225e61a35f5d03a9c9bbfa374a4c587c62cfe81d1eda85f791fad630914555068578f24370913af2a15529665cb
 MISC metadata.xml 387 BLAKE2B 80b0a547d8f1c60916e68279805d3d60473d0674de329a5c3077e4dfb3aeb1285f9236c825e121f9b56f3ee16f9a5dcc65b667cbfdb230b99f430b38735d4bf0 SHA512 97c77a9eb206814534d35eafb4f64a3a613d7e2bbff8de5f929c94cc0e9377c13e7305c2e5f05911567172214566f4d7ec03fe1514ac307fe59b3a457cbbadbf
diff --git a/dev-python/flit_core/flit_core-2.1.0.ebuild b/dev-python/flit_core/flit_core-2.1.0.ebuild
index 2d758c09d79a..dc6893b75550 100644
--- a/dev-python/flit_core/flit_core-2.1.0.ebuild
+++ b/dev-python/flit_core/flit_core-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules (core module)"
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 6e177e0f5dea..e7193ba6c97d 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,7 @@
 DIST fonttools-3.44.0.tar.gz 2040100 BLAKE2B cdbebe8b38929ed8f436b899a9f5c7c5cddf546558ffd9e347fd41fc06dc4521741dd80d4b8c1cec4f996322ec09e8892174c965ff55bc6e4c7e4c5f44be0fe5 SHA512 ce390ccf69a4222ab8042f72c4e2495e39cb6907fafaea36f505407c7c6cca891d43374d648ae9f1a3119bfaeb1768b34f7c0340fad4fd158722cf2bfff425f7
 DIST fonttools-4.0.1.tar.gz 2240578 BLAKE2B d7d735c4edfc09d90e2fd5b05e195e900f4f96e7acb52d0fdb00d95e9a39fa698dc853908b93f6f54674d9536caa9b7bc6c2b487565443b3e115a5ab3237eae7 SHA512 ae8a956ee03923ccbaf9d8950361cf0a2e3b86d61145298de07e8f4ed50680cea07dc56802663e3edf1fd9f18850983fac5685036f3c99fc454ea72591646eb0
 DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
-EBUILD fonttools-3.44.0.ebuild 1475 BLAKE2B f72e45b09e084fae9034c640f41bb45e6432742ae0adf32b9f642b105fdfb41966712a461fffc06d22c82521ac93a507b8a2a3382a8871bb7edf997240eebbdc SHA512 423dcaf5d2e6a4498b20d46acf330062d3c0388a0fb06d452f9d53e1736adda46c2b5606a59df9da2fa5feb6c329b6c6036adff529e1c114fc93c0b2934c820e
-EBUILD fonttools-4.0.1.ebuild 1383 BLAKE2B d7ab1cbc8facd281330cfe467fe16b4cbd06ac04b78bd6ac0af32efa911c04def6ca460e9bef7ef279dca85fb0d316a5eaa7911dec27185a7fc6be09dadd1f56 SHA512 f5cfb97718330382fdafdb44dadbc5af54d1c0e8255505368d9cbf6e1b4b078548143f44bdf5940f0c682cd6f5f35852c0454d49a83c2403c3e55849b0f177fb
+EBUILD fonttools-3.44.0.ebuild 1476 BLAKE2B b6c5f728e398bcec1613e7ccb57edfdff74c2da8b2975f2cecf4d263fe279669268927df40d59f0a0dd719a673ba714eb469aacb3d69a78782edb2a03f7fdc62 SHA512 cddf5f3a4cee27f6d7542855545e69cc989b2b09e6ea375985d7b2cb5d31d81e0100c12db1301bba646a7ad648e180805bcab04f28ea324e89a368ffd40f47c5
+EBUILD fonttools-4.0.1.ebuild 1384 BLAKE2B 3cfa83797f4d0b7b0e5095242fbcd90c50c03653a3ecb1f0b9a58f1143b4a9540838f59bf6059868bf5b1c4498348c5e22cb07628ed0cef439a286f4cd1943d0 SHA512 b8a36ba8d21553ec8cca3c69b67a7c0ae8ed08f2643bc896a184a2300e0beab3ab4c73437326d639f2bde0d0b5ada8c3df112c798d9127de60c647133e313629
 EBUILD fonttools-4.1.0.ebuild 1386 BLAKE2B 6c702fa823426d5aa59d1aa8c2237039a4af1b1bb0a21a5195a2d39a0c456aa0c8fab2e31f786d5564e3bbc1c3dc2e1481ee414e57741ffe953294c5123f7347 SHA512 d2b6f1bd6b1104700eeb8a3609eb90ae151208f9947d100f15981053efd086849750ce9dbde3532f06a354bdcda52dc7ad8188c81eddaded0e7dafec963922d6
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.44.0.ebuild b/dev-python/fonttools/fonttools-3.44.0.ebuild
index 7e8a180be3fa..e72bd1043870 100644
--- a/dev-python/fonttools/fonttools-3.44.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.44.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fonttools/fonttools-4.0.1.ebuild b/dev-python/fonttools/fonttools-4.0.1.ebuild
index 7bd58ebb8848..a9c7eb92ad66 100644
--- a/dev-python/fonttools/fonttools-4.0.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index f68a877765e4..a86b389f0eb2 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -5,8 +5,8 @@ DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558
 DIST freezegun-0.3.12.tar.gz 24346 BLAKE2B 09d7c662a82d7b7fa6ae56c09bff0d73e2b63fba2b492620cd8e68ee06a15129a7e901418d1881e65b440babcfe0d014ad3574ab8dd2c7eab8486b3d868273ac SHA512 f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4
 DIST freezegun-0.3.13.tar.gz 25419 BLAKE2B 8334f921609463bcb18779b61b234bb80406924578ccd43ca1f4a10c65eddf87f399fa7fb285453808988c6f74331345a373cbdcb29f3bd412f3a9e472fce43c SHA512 682f689c475ee574e7a466bfa102b96545cd8b7f095c4b5bdfda496ef667c712248db414d66c9f17fdb1a492c0deeb87a07d8b2a4128d7fdd771f89d5ea8277f
 DIST freezegun-0.3.14.tar.gz 25327 BLAKE2B d96dd84e73e1cd0fdcb8846d97901260aeab80b8ee1d1cc35715073df9693238b8b4e8b8163c6b70daf828f0f7f9e13e202ff99f3325871faca3c4a4331d63cb SHA512 960e63206622bbbc378a64a62c9c849cda1380c63c148588a10347c1bc6414aebffbbbca6c53e734c8651824688c38b47aa71192d94edaac0422caebf4b1cb8c
-EBUILD freezegun-0.3.10.ebuild 946 BLAKE2B 32d543940a7b23525a9bd96f216935b95755f9317b21e574fc16ad8a46b39e26bbd0ffb5a98ac3439fda5d9269012b8c393b4e03f751f13db7d75136c2ac8e5f SHA512 2734f2a4bbd8df2ef5cc8c92c405f1a4167ae1e4cd0212e19c39ca424fe337c7b32693d19751c58207c4a47682a915d94e47e9f564d4ce0e51bcb877eedc9bce
-EBUILD freezegun-0.3.12-r1.ebuild 1295 BLAKE2B 446dcd46003ddddb2a803e1d44af68b8249dd8db3ac29cb275fd3a2f87176aa18a2d7adfe10aeb96221cee4e8f6ef01608e88e1de0bd9791af05b5e98b70119e SHA512 baa6d311efae811be7e13ae7695f0f17783ffd536807877ac7d3ceba32e3e9e6bf5d09c2f5d4200beaa64f8dba73db91fdfcba54049f5d8a91435a55c2b7bb14
+EBUILD freezegun-0.3.10.ebuild 947 BLAKE2B b6aa03aff7b51c74dda8e97ff2252ca92f74e68e7f400bc9e66ff418fc1d6df34da3a6591b1c448be053e4684e4eeebba3487bef2b7dbeb7276075e49618dd7a SHA512 ade1225993ce5d898ce6ac3c9421904412cd7268ecd4de872320d1e9d3adfbd8c91a7cea564fc0026741a47dec3a11fcd55239cb44020b28d21fd67371a0ae5c
+EBUILD freezegun-0.3.12-r1.ebuild 1293 BLAKE2B d43e5859b4a4de22ba39f416e793881b4ce0d569051c1c3195dcf0259bc75e6e59b28e54f4b6b699c965e0353b0d99084eac58489cfffb5e5e823508e7cec674 SHA512 16d54a4e6ce7ae401e085c721d143ffcbb165190bc3e7cf2a7241e613070e81bacfb4141c01cd17f6c5e0e004b74473ed50d8e3510fb6f0e539b2b903931201d
 EBUILD freezegun-0.3.13.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
 EBUILD freezegun-0.3.14.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
 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 399af5cfe6a8..d4902c626999 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
index e245d46f84ae..b5a2e5c2ed49 100644
--- a/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 8c1fd80abab7..dde60e1cf6e0 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -7,5 +7,5 @@ EBUILD fs-0.5.4.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf
 EBUILD fs-2.0.21.ebuild 978 BLAKE2B 0760161fb608108890044982901ee1c5ebc3cd10541bf791daeefc33ef5bb43a2d57cbfd2209575636edc961504ee842a4e8156688ae3c40d8ba902bb4787592 SHA512 31183798bae3e5b43cc7d376046d0f92578a40401ac51b1e63bc20589d59c485b59f9171e782365b0c236baf12b4c631768bc408d307cf04208e1089b03a6bd7
 EBUILD fs-2.0.26.ebuild 977 BLAKE2B 89acb35a3effdd431abbfd728547e5801120fcebf62ae4dd163fe1810eed0b723729bca82dc7b150acd44a6d6a2d763c4ffa4e4416c4e49c5cf0398c7c55f438 SHA512 6d4ec0dd22d7616adb86c8a7b2db097ae67aa04e9b2842d883c67f5acc12964179cac3d46dba8a292a4262c22c107623d2311068444a7cc04c761cdbce05c42c
 EBUILD fs-2.4.8.ebuild 1052 BLAKE2B abfcd90148f4e21977f5d683bb8ee986dfc5a59ff648cd64dd03b22e91457d3067aa6ecd84cfbb9f65a95b1a56418dfbd08a382d2c235a986cb320e0f83c3c04 SHA512 568528e4e86acdec377ca93e59d6161295bcf0f531ce02c7180eea91781cee9e04b75809d5296a5ce32b5c85d92280e7fb3a4e7be630303ec865cadbf016ecf0
-EBUILD fs-2.4.9.ebuild 1381 BLAKE2B f88566eca3b20661a4cc158e726460059a976b0ce429b0fccbea3a571dfbf2a4f1cb001b5e4b2ef58a92810adefacd8ffeecc3e20f82eae92757d8e3941e18ac SHA512 ea9f881d99895d68508a1bb40e0884a7b50fab9396bef0c425fe3c069e4db21c699540e811c1f4eaf56a13fe9953242522e015b9d6974e3b6ea457cf6996f764
+EBUILD fs-2.4.9.ebuild 1382 BLAKE2B 9b74f5c4d88a098846d549d98658bac2a036a60ffdd2036392ee026c7047e540611e2209a5416404fb8f992957c519727d67c2082f4ec5d6ce71fae3070684b1 SHA512 c3afb3c69f4ffd29821105cd870508edaaa12cf6dbcdd69986d154ac9495edfd28e13407b3248a19357a40797b3dd6e931d8f6c0d8658b999879284c826ff248
 MISC metadata.xml 486 BLAKE2B 69d62d79b3d0e05fb12bbf8a4d4f703f82488cace87e8f42aaace9319c18f564c3c841b5b69a189530ffb760bceb1acb9fce38472af659a6c4ce24b1bddc16c0 SHA512 48e48fb5f3c868fb8e1b9dce7c483c13291659c99e0f19e096204451e1ada83fb0d2334d89a3beb45de11b7e710a3deb9e5777e5c8f905312efe899cbee02d07
diff --git a/dev-python/fs/fs-2.4.9.ebuild b/dev-python/fs/fs-2.4.9.ebuild
index 6104a59572b4..6ed2d4ffee1f 100644
--- a/dev-python/fs/fs-2.4.9.ebuild
+++ b/dev-python/fs/fs-2.4.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 545c8d80d9eb..8d390f1adef5 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,4 +1,4 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 694 BLAKE2B 36bc7494ada7b6a1dde561ddb2c1acb0152567f9c9270c07f2e85e6eb78e6f75744a54984253dd307dae9fff66279357fb8d400797768427b04769af8622bab5 SHA512 50a1b1e0eefab4f4034bf82e0be47df1f6c9f83ba9aff38d74fc8da1ec561a87ec3e90cd0c3cf0bea20d8a4524704df94ac366eec554a7ea03762fde0dc0c791
-EBUILD funcparserlib-0.3.6.ebuild 727 BLAKE2B 3d2cec34ec81f170256813806a049aaf11b2578fc4d041b54a3436cf6e8e8ed182b6cb1cbfe717a08202a35e61fe3b7ec2ac8d19142d8b40675f9aaf45002fa6 SHA512 35233bcc225721ad4bed24dd4adcb97f6b86ee2fb6e6610bfdd113af72d6aac59a149dd2740b9470b89e4aab341aeb063a5f65ec535f50ad3994e2fc7f491ed8
+EBUILD funcparserlib-0.3.6-r1.ebuild 690 BLAKE2B e2542c440875222be47b7cae3146bb394492e515cb75cac1533ebe35c65ca23ff9b976d4cadf28148a017110eedf93e00a1866d2638aea8f972ce630cfb3f2f3 SHA512 df6f5a92d09f3f5c411f4fae3c79b7cb03dd0ec3cfe6323aefe158e3b4189879d7395b25476b681dc3474d29e3d123d2dac9770585d56f34d3dd06317fced28d
+EBUILD funcparserlib-0.3.6.ebuild 721 BLAKE2B 3fc1e96d282f8318fb92731951d2188d3656485eaf3995f085c50f2d5b02326045c6ef276b5d82685ad996f340f532d22456bdb93552fe831825956620b7120a SHA512 fba04a7f94c43652bdfa3acf4aa1c2a78fd96629476a844df58eb213fe016ee550179a630c126f47dc1596268b8414debfb1840c2082e67d31bfa289c609e05f
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index d892853dfb29..fbb7b64947a4 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index 79de30f06534..e69253e20800 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index 952f3a767632..198b5375b679 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -1,4 +1,4 @@
 AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9fa172695901768849d9278b0b384819b4c6ca3409f8dba3d9ce058f16e88f0696d1fd7dd6d3b7ba119989fb8b3e97fa0399635 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
-EBUILD funcsigs-1.0.2-r1.ebuild 953 BLAKE2B f6967146df88131587e33b5d989097166b873440858c7856b3dba44de99b49ff3d54376612458421ec694448a621e269d22486e74c776ef3d19cd7595f5b98a4 SHA512 a92783d176fc3ae3b77a0023717f73881ac930eb6eeafc9cb32d0c5d92fec722b09732daad690799f23255c3f98f1f92be755396faa9e91d7ea69400b4c43156
+EBUILD funcsigs-1.0.2-r1.ebuild 954 BLAKE2B 8cd3d384e8538189c2c48439e8b4aa2a7b15ba2a1bcc19281a940bd3a32a7b7886190b2a97c3bb01b6a411275bad4f0eb80df1c09db855c29c8c6c1c9bed28f2 SHA512 5c5fc8517a34281ba89e5fc64c46d9de97482b0392e454fa388976971bb854411c12914ebf25d4d3d00d75c79052ccaaf434143828e56bfae0cc2d4893c3f40a
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index e09064d69432..a76e80b2b232 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index 23129476c39f..fd6c7e37f14e 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 626 BLAKE2B 5677a435366a931bb253fb61a385d9c05f95da7f28e9722d23381f3e1f829d263cfe09b0c72a288cc2a18594f0a57138715af906f30eb3dc5738abfb3f48b043 SHA512 0e7140083f6cbc03db751753b35c15805535a14ec7f15b814a28f8526184ddba842a5ebfa793587313e2ba1bbae96fc4acf1d5f40edf1346c52d96ddc1242f9d
+EBUILD functools32-3.2.3.ebuild 627 BLAKE2B a649bca61a2890c00f86dd92eaf2f745e526e5724385e2013b1d8393ddf4c95863fe373551b3d52a88d7bf93a8930e8210b523bd33c232227191fca83114ac1e SHA512 fb69fe82ad358f003106b0a884fdce482e57cafac89da813838ed0f6a2a81a6696131ccc2825848d4c381bea1ce01e77f59afca7e86790b11dcd7139d7ff3042
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 2a2b0b3aaaf3..698267120523 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2.4"
-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=""
 
 S="${WORKDIR}"/${P}-2
diff --git a/dev-python/funcy/Manifest b/dev-python/funcy/Manifest
index 49fee92c71b4..67374a72c6ce 100644
--- a/dev-python/funcy/Manifest
+++ b/dev-python/funcy/Manifest
@@ -1,5 +1,5 @@
 DIST funcy-1.10.1.tar.gz 29657 BLAKE2B fb2de795a5564f7009ff5717b8eadc3cb24a2cd4c30b9b9627861d7c8bcffdc1ea27f480c2895b8733f6dd965fbf9ee0fd7f12f8bbd3cf5f0d291829bc852f4b SHA512 123a5a828bd3cdbd38926923eb3979c4e5bca246da93179321eb1619df22cf6f722b5971d1309a1bdee2eeb362fc7fa85c6769a60efdd668350bf6c7d95e184c
 DIST funcy-1.8.tar.gz 25642 BLAKE2B 5365dd8b3428feb70e9b921008dc48b206b5ba1e5f083e67fb2f7f9677aa84499b15cb168911db7700d98ed5a911899bb5d9c4f94f70876d0da769ccad7594de SHA512 21e3447426376cc3d9f06d57297fcef346431a33e0488f1cead2aa7d8c281dd65c2b33af3638c21639d2d7d667b9c1ea6c7e2eabefc5635d02ad92ce7107f839
-EBUILD funcy-1.10.1.ebuild 427 BLAKE2B 1b459827ddc132e8695728996593e72e0c5b03f6c0f7adccd6652cd5afded3bd9d3e5e2b186968a14844a8394f1fec288992125d167f0ccffc735d54ad926623 SHA512 b9fc19f2fb9ea8071de3e2104521f25b172233db54629f2251aa4c15f407de830e57a13404eedf91e2bc9e439166303548a9947799bf5d0018f8e3a1fa5746cd
+EBUILD funcy-1.10.1.ebuild 437 BLAKE2B c28ac7940780ec84d5b530c59b87b4e42b47c264d439dcd824e088705fd119553ff0cde812165948b5f572168f9d8611462d6deb59fd6209a090aad4549f0e85 SHA512 78f7d8fd129bda101e70856a1d97f96173117d0da4c277d6a3a6e87ff89b2b4ecf87fe001272bb1888c1e3fdbe83ef81cb4b5bcfc6eb2cd12d8b4cb76cb96b6f
 EBUILD funcy-1.8.ebuild 420 BLAKE2B 73d1c97033613661fd52e7cd99bfe68df40470f07f3a71d7681afbc741e4fe7b6c7d866e3235df6cd40423d3bd8948676a292d5930bab2b23ebd82e288c8becf SHA512 d24cbe97a6ca21df716b003b9eaa68967a40a3f8a96b7e5481ba0c9ec07189e56eb34bb7ec00256bcccc895af1b5f445728f9cc725c83473acbf972497af8a4f
-MISC metadata.xml 362 BLAKE2B c57bd6319f39820ab9596061a44d95ada10374f1a5f4538b131b96e1b537f2c9889094ddcd8df1d812ee6afa7b94aa1c81243e603f248edd316af81ecb66b2cb SHA512 2491195b4476b35a3871d8cb8d461c2822d102597b24e4c73203ef87261367c49d9891d72d3b8e9d4c551410cef3377b46c2aeb8dad9147510dae5e050254931
+MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/dev-python/funcy/funcy-1.10.1.ebuild b/dev-python/funcy/funcy-1.10.1.ebuild
index 1f8ab7fb85b2..1223e2f48a5c 100644
--- a/dev-python/funcy/funcy-1.10.1.ebuild
+++ b/dev-python/funcy/funcy-1.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="A collection of fancy functional tools focused on practicality"
diff --git a/dev-python/funcy/metadata.xml b/dev-python/funcy/metadata.xml
index e7e8d79d1f7e..d0e866f244f8 100644
--- a/dev-python/funcy/metadata.xml
+++ b/dev-python/funcy/metadata.xml
@@ -5,7 +5,4 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
-	<longdescription lang="en">
-		A collection of fancy functional tools focused on practicality.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index b7595d5003ac..0e5b69d2a170 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,7 +2,7 @@ AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
 DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.17.0.ebuild 1061 BLAKE2B a8bbef386fec78b6d3891de79da2eff2fe076b84cfc60dc6eb769d4b6f18457dd0a1c07991c4c69c5428dbefa8a7683866635d77631e6c05e33ac227be5c21e3 SHA512 4a3b8c4fcb99cefd5b160a5b2beac8e3eda96e38f0eba2e928c24a018c440e9b70df51c7e5de3d779ef17485024564bc11b5512310594d9f34131c9568bd3618
+EBUILD future-0.17.0.ebuild 1062 BLAKE2B 97135420676589569d8e3631fd454d0a9e75959702c8e2d95ac7904ed6ae1171c87a65b89cac4dc5af9a889a613d93ed436e1c9958408d0bcdfa2517e25fa291 SHA512 8155beba9a65e89aea74505fbaa52139d50eaa43ba31a5a76d416d2ff006013666aad1fbc8604fa24391e0bd1781f6ae502e2e865415bde18a32ae225e575d85
 EBUILD future-0.17.1.ebuild 997 BLAKE2B ae3fb84fcbe455b168a1978fc5122abf5d1bd439a07029d4650727b881c1cf495e7fa10b89858f2ac1baf6cbf852f25272e572421f0b4426052b0c80a4f9e117 SHA512 425d2f8cc60f252bd8e0f708c1716898b3eeb7cc324bcd5768253c2cff50c195322ab55832ba5033d9eaebf002e4a71fd2969b5bdbd78af209d099b3191e01d1
 EBUILD future-0.18.2.ebuild 1120 BLAKE2B c44c2393ac46ddebc60f0dfed005bc5820b5d138befd6582f7e57b0bcd93728c31f5bc1a3b039d84a6dacd080462b9204b8d09781a4fb00ddea4d41503cb99f0 SHA512 6783a23c7218b89cf73849235fd212368499b1db36970f50654da37de39b81a96306c4ff859fc85ec713fd4c3a1fa9f1176294a508303a4bd7b6e4ff707f61f9
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
index 3f8e75d94012..eafb857cad00 100644
--- a/dev-python/future/future-0.17.0.ebuild
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index ec73f4d74f59..4346de028b14 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -1,5 +1,5 @@
 DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
 DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
-EBUILD futures-3.1.1.ebuild 830 BLAKE2B 7b99d66fa14c2ae59dd0bef0c71bb2bef9adcf71fe58a3a676184e93b30d0b0d57b0ad63215088d8d86584edabf5a48843189c98dc6145ed6f3f41ac94dabd89 SHA512 d60152721e7f3645d0980dcf579ada3a4e7629d50faa72881343fb832e340bdca91b273db13c1d910f0ed8451b845d2e01e41bc1dd41a7758e0bcc8e71c25685
+EBUILD futures-3.1.1.ebuild 831 BLAKE2B 571e9f68ef6d21c4a98d7e903108a049926481f9b24f5c061f57ccca6274f6a860847726f478b950aa308bda0a8ad16d802cf50ecc6ec9d0054d29b29e4c8f70 SHA512 3af410bb7933cb2270151154e12c34aa088d4aaffc5b43c4f6a447c6550806daba5905b330ec29e60d508590bb995871713218ad4bc65eab7644454ba472a4f1
 EBUILD futures-3.2.0.ebuild 869 BLAKE2B ad3441994bbf21f036b9a8c07c4e8e15e605b8f102cb33565770352cf1b8634c28f92704880e11bd85a21f2bbad87af60d57479a747226f617927e2459abb48a SHA512 0f313d902efe0bdc24fbbc8ce747703dc61cfafd7df191109c35f75a26b3e662e4a4451391db95615a967dee547b15624bae27fc5da22b38f809e79c249e0e0c
 MISC metadata.xml 373 BLAKE2B 1e9903ae68ebe8e33d96f6e6f811fe125edb4f81b1c84c21fa9f962ce4fe7053269d00f29ef5699fcab98e70a755414ad86db30afc528be60ded71e6f60f9eea SHA512 df8ba320e5dfd914b6cc6cb15dbd5efc19047c0d57c44a60fd401de9a7f9c59e06b5975dd832c78202aa34fad94e0771e8a5ff6f16f246c220c5640ec2c84921
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index 96b131d7da42..ad173dc34963 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index c85c2419088a..791ad2c14cbc 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -1,7 +1,7 @@
 DIST futurist-1.3.1.tar.gz 40927 BLAKE2B 7a746bc7dbdfe1ac9ff2fcdd02a0f4f6e0caccadb52b46439620bc5daf736545de906d0a8d159d39fe7d0ab8eda05767aff4723607dc777ec5c1b43a1670c277 SHA512 88b3af8922542d0bcc3e3e1ba8c456adb6233a616c1e14b3b49b11162be5b65855e7088ae6ce573d42bc80675f51070270533fea65e70935304954a3889db3e3
 DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988e9f4c5dc2de9559d295d88f2d93e5afc017dbd8c9c20a6bb50a63567d42f3ac46c61fd9b0d08a028dbdb2c5bf SHA512 fdbd93e3ffa61661218e4a3f180a448b1d8c75126847c50a36264543bac02f50984d4e493031c0ce3257d16661f7b4a4463b5b3dfd7ae7e2f974410e0d1234a1
 DIST futurist-1.8.1.tar.gz 42430 BLAKE2B 4584d37dd2a5de41be576b1233a50202c9c134b0a7e6c231e028224413f2a0c6e2ab22e1685e5fc974cded3e70c4fee6cbb9ae1262f167455a40a39eeec8c904 SHA512 4ec292284a1a6a7675bd9970f391bfcc47841c42beedac8348b23755481c4f87a2467dbb0f8c963c4b9fc8148a8aaca43e3c166878d07c9e48720481b0f73d9b
-EBUILD futurist-1.3.1.ebuild 885 BLAKE2B 1857c9f601da8723368d602db353fbdd67a05ee92ce0ea971167246754f624c42fe6d4d45c8a8ab959519754206e7f370ad5d2ab1c767563b73ae1774d19aad1 SHA512 83c7d6b5e086003cafa95be67da7b5d5523bf587ba7c4b2cc397c3ed1d248c477019460b14489438b6f4ecc0de6e7b7ff99a7ed552cf5951a690e6d45852d061
-EBUILD futurist-1.6.0.ebuild 839 BLAKE2B 307ec0ecc4da04b5e2cb738f8b4db3ceffb6bb65466dfc5ebc3158ac1866905c8c4378195684c65c5f9c6e30abeeb2a6c6adfd113357af41f5c461f992d4d4d0 SHA512 d68d013eb4860b4d9c2697c9c57d3d0ee3e900fcfe983f76fbfdc760822b1fece14b920b0eccb3754a2fc35ce024c4b9330138eb932d516839926b950fe02efd
-EBUILD futurist-1.8.1.ebuild 848 BLAKE2B 2d10c61c587bdcfcc0478e670c9f58b75569e83201543308b5d4426a6bf297678da4707f993bd0e96561f1b86791241015ca62c827e87809a8827c601fbc8e18 SHA512 2fcb0da3b6dcaf58e9c9d331363aef8c745058408d2bccae47be46db2c5940da8d56ae1af430c831fdc08edf9d2198b66e91e6ce9152b9b8985373bff66a4f18
+EBUILD futurist-1.3.1.ebuild 875 BLAKE2B 72ccecf7880f78a5521e5ee982dce91d33d396649756488a87775b335d8cbe7dbe13fa73d7b29da20c17852feefe01c3a058235629fea6665911670fcc92568a SHA512 84581de2e0e9bf08272e292929a807fb3fc8f2ed20de21e559447fa6d7d50646dc51be37a74a0add41bf077b004131fbcd2543bfa40df7188a6158d16397d501
+EBUILD futurist-1.6.0.ebuild 829 BLAKE2B 12b2c7f4be209bf12b65e2a200398469aaa99f6f7b121d71f325384be75ad813cce5821afbe60c4a142dee358909f8b9283dde88170fd76bad4b4e56a56e5ef1 SHA512 a3e63877a91445b872a9103ab4af97bbc1341b2ac585cba4f41db29eeb2184deb9c6babcbec8c1cda75b1c122727b4cbeeccc4cd04a575d13be484a4c14639c8
+EBUILD futurist-1.8.1.ebuild 838 BLAKE2B 806ebb286dc9e94c6ac599428579f4aca63bb0b008983ec61d183573542f0a1ca72ff1fe3ddd690f06aa770c75626f3093887b09f9ba806d3ba1251304cae3e1 SHA512 5899e11eadafb6c81c9588e08e04b4194c995312560241fd1d6e5feb9ce1a16ee08d625877d5ad234884c2d6af555bb5924aaa2594adf9247f2c24990925a4ef
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.3.1.ebuild b/dev-python/futurist/futurist-1.3.1.ebuild
index 3ec42d128c21..14cb8b7a2cc0 100644
--- a/dev-python/futurist/futurist-1.3.1.ebuild
+++ b/dev-python/futurist/futurist-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
index 86e3ee9b3f85..dd6b864a786d 100644
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ b/dev-python/futurist/futurist-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/futurist/futurist-1.8.1.ebuild b/dev-python/futurist/futurist-1.8.1.ebuild
index 5610326a7703..80db89cb2f51 100644
--- a/dev-python/futurist/futurist-1.8.1.ebuild
+++ b/dev-python/futurist/futurist-1.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index f5c5da10fe7a..ca4298cb1d1d 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
-EBUILD gast-0.2.2.ebuild 467 BLAKE2B a55861146fcc2c9350d093b0a294c4af7eef79e02ff4149a05f9281b6257b4a80be982c0624ba7fe2f1f6055e7dbf31978f074dfd75be285aa7089e21f8fda84 SHA512 536f1b7c524ca20165ad15a0f7e3fe22013d1f5072b77512042be3095a64c48f2b830dab423d80083702d312e0dce44a2b7d9c0f2ab54052c97b2e6453ee6ebd
+EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.2.2.ebuild b/dev-python/gast/gast-0.2.2.ebuild
index 0cc600445e21..3d51556cad8f 100644
--- a/dev-python/gast/gast-0.2.2.ebuild
+++ b/dev-python/gast/gast-0.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
diff --git a/dev-python/gconf-python/Manifest b/dev-python/gconf-python/Manifest
index 0604aa4b01bd..4174f8132607 100644
--- a/dev-python/gconf-python/Manifest
+++ b/dev-python/gconf-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gconf-python-2.28.1-r1.ebuild 570 BLAKE2B b59b3f36289982a80853216dd3a061b252ce77f13b0c9bcd71967ce7b6351ade2ceb7d18e2e3d6d8bd2642de62e2a09c4c0d89040a04811b4d9d6917576a7e7e SHA512 8df2dfaca0d0f1ff4a045fbae184ff1c421688726cf4024151a06f97413161732a4a05d41f413b7f75736e5eabc9fb7e7767d8403a5bc28bae8dae62b4621f91
+EBUILD gconf-python-2.28.1-r1.ebuild 571 BLAKE2B 88467ab465217c88ee411a105a4dd39e3e334b022d9ca50536a348977c4b10acbdee7a4a6f2efd06b7eb6e23b8d91faff190d97808bc8e08f2c7978a8735bb35 SHA512 29e22edc5417660b3f284c5dfbe9e8ff1ae7358869db3858d555addc7c20eb1c2980ad3cd8b8e2003d41aff9b5ab85fcc94bafcf8bb463b7ec20296f1a967353
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
index 8ad9125e7eec..d1881c6921de 100644
--- a/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
+++ b/dev-python/gconf-python/gconf-python-2.28.1-r1.ebuild
@@ -11,7 +11,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the GConf library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 32bc44434b61..960d3549b02b 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,7 +1,4 @@
 AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 BLAKE2B 5f0062699487ce5f73a2cbba96a6e8ca30f00a3bdd73b7fd5949eac518e01fbc8912a462951b7307a4da02d6016c869e829040ba530974db579d2d16a8c73197 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe
-AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 BLAKE2B a743a19b84ed84b2eb882da4d1885f6d931543815a48b38545b7a60f0702d8e23b16490fc1ffd9763d4540f0e2c1f83399b9a572772dcf070289d4491b5d2cb8 SHA512 cc1dc36815a4ffd42867d398f00a702c0677bcfe54ce772ea93a1e641fd9f2ea0f146b25947587c8d40f66a9b45ff1c4038002c518110bd78808565e120f6230
-DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 BLAKE2B 831a1b88035d6331ac2cb122fda5ffabd6319b7a030ae8c46dac32be571bdff034d6e60830e5e4403b65a414487c874cd4743f537a9c1d3674bcb1461e457945 SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204
 DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
-EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1039 BLAKE2B 861b5581f1522c8e648b1c081843071f30bc066a53d26e6826494760258a3dbafb71500ba9bc45267ca026b1e5b519ee4b17105a96b2f48a81287aabd6abd3eb SHA512 4026ecf2f8380a7371cd87dded9837632a5711cd098d4d2bfc214308c2ad687e8c0e452f120029fddbf3fd47085b9d65aca011a22d79ed520d4f0ca52eebd6cf
-EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1428 BLAKE2B 34e5c371f8385b09d54bd928c0089dc13b01f9bf4dfb76a173ba86c9cba54d9609cd25244ec527c446ff9f62eed0d42ba394ebad644142f3613c6d7b6a5f3852 SHA512 fe5e42268a0fa546c23001b433e6d7c2837f58d67c67317da73270fee77daf838295a0cbe1c5535aa4d84c48cab5c617b72f990ec667683b30cf868031b3e95e
+EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1424 BLAKE2B 32be3cc5974df25e38949168a92dd87d8e0ef76ce343fb69c9a2f08dfbf82e41fc3414e5a7aef5ce904909c0dd7c7da49347f5ec42520c98f8633e472ad8b11b SHA512 19c7a8cf5fa94c926b0fdde9d8d92beec848852423fd897628b895218d9a3a915d3e94228e98bf66002254cb142506dcf4a2159ec7981750a5d9ebee820264a3
 MISC metadata.xml 335 BLAKE2B 11f766d7bfb5e7ddb78ea1d749d3d2d79496d69e07b1054bede831ba7824d8705e064e5842c71206a0c35cea37e40558a6cdafd8ebf8460ee99ff8dce3f26ac5 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch
deleted file mode 100644
index c89b7a69b461..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,9 +36,7 @@ requires = [
-     'httplib2>=0.8',
-     'google-api-python-client>=1.1',
-     'pyOpenSSL>=0.13',
--    # Not using 1.02 because of:
--    #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
-     'retry_decorator>=1.0.0',
- ]
- 
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
deleted file mode 100644
index aa3fe6a5f38d..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
+++ /dev/null
@@ -1,38 +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="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed \
-		-e '/SocksiPy-branch/d' \
-		-i setup.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
index 1801721341a1..d653f0df487e 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gdata/Manifest b/dev-python/gdata/Manifest
index ef19eb5c7278..585535231faa 100644
--- a/dev-python/gdata/Manifest
+++ b/dev-python/gdata/Manifest
@@ -1,3 +1,3 @@
 DIST gdata-2.0.18.tar.gz 2475552 BLAKE2B 8679667c427aea162a13d56bb6e88d3c092960c3d0b15d4f297b6a96ea63a96373469e875629386d573a0a97024d16ef3d42798749554dc09b621919b98a4f65 SHA512 57d01a8e41fd7507621c10a4ea3e66223aa1d481365269daecdb5ef1bd725915448bcfa5aca9bef3a7fb4b735627d7916b7f971f1c05d7bf840069346e98ceef
-EBUILD gdata-2.0.18.ebuild 809 BLAKE2B 10ee41e3cf5dfd13f9691053e60b6ae21a240a0c9591953d92a812a2370eec717bcacc262635141a03698d41d88defe80f9762bf421c405baa3b7491b515b56c SHA512 4f3429e5f0c23c88f1ba8e6413b3bbafa533ccdddd1f89d2e0dbb4f2a4b2bc33fc33f0e23d699e5279b6f2985678def400803622a08bb3e6a429d026907ffa58
+EBUILD gdata-2.0.18.ebuild 810 BLAKE2B eaa0292015e14d49ea7fd21a8a271aff3e3954f883a74252042a068632936eec9da32b2092aae0c3a7a2d377c8ec05b33a417a2cbaa10bdada197580b809373d SHA512 8958f836ec727dcf0b9ce733b98046422e10b5e98177147b60787bbdbe29f86b92be704116ee47e312f54aaeffd448eca9330ab5e3d9e80766fc947930f21721
 MISC metadata.xml 374 BLAKE2B 8034fd862b60a12ddf48ae0f61c5cd7b4c8f5f537e8ab6e2d5e8a826889d39f106e96c03114c5f99a265cedb2277fdead21316a39722fe3d7925f5aa594aa4e5 SHA512 d4c66573bcdb0cf9b1f9c61539180de94c57853fbd6241c4049247ca745779284072b39087d90b79ed79f83504dc0551fbc0c62b9a52b5572ae1681af97c41dc
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index 045a7e761cb9..310cc571087c 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 1a835e9215b4..f13e7e26fdc7 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,3 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2.ebuild 750 BLAKE2B 882614576de348d0f7527a900a3eec143538e9e0a5748f01e44e9079d8292307660cd461843db924a0263a5da5254bff44331f7d4110875f5651abcfba7522d8 SHA512 9ec25c5d2caaa44227d8aff3472a60e83c60101f8ec3ac0fdf8f056ec2015bb709d7e7c890629f2500a8fda63a144ab55c3b252dc9a9ab5d54c44e9ea8d2d2bf
+EBUILD genty-1.3.2.ebuild 751 BLAKE2B 49411f0a59b934cc759e868d1843e80b46017f1a6a0719502e1c241a61a468990f3926d0cce178864a7d27f3cf3cc1c05b9579dd2c1dbf15225330445aac3831 SHA512 a8b96164b3d4586f904795c0d9f87a6e92552065bdfe47e40deb2c7d706ce78fe19ebfcf991b0395b06b802ff23318714138fd15b6f027f94673d019948ac2f8
 MISC metadata.xml 357 BLAKE2B c4b7d3382dabce66ab01fecd442eb82e979d27434b0888c06d75d138ced20b984c67367f632a9fe00602d8d385f2222af1e195b8cb5e8b8b7e50494b9b018627 SHA512 ba3b3f11913ffc8848a7d2b1637b028812badef52306565f5d0462314d97ddb5795219cc6f674f3dfdc47c3d9b0bce602425b25df99c7227dcc166f1b1f536a0
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 474e3d64f3d2..dd93f4241d34 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 13890e746d45..505657c38add 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,3 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
-EBUILD geoip-python-1.3.2-r1.ebuild 910 BLAKE2B 0159280c8c3f5d58d9829570dc2b6a4b14930527413352c44bff41fac929297415e49efe6b078da17b4e029d380d5ae37e71fd72fe779dd3cde7d69d4b8bdef1 SHA512 b195018bd613edea2df4d71e687071d22919defa94aef44c2c4d5c0b153318ae3cdf4b38fc0f6ff854c2e4a0e3e35fbe1161d645ac686079c803c0cee89b1b59
+EBUILD geoip-python-1.3.2-r1.ebuild 915 BLAKE2B 8a840267912a6ce6fe9818decea22f11f0eeb31a8006145a7f8e2a608d16213050e72871574bde767fbe6a74a070ece5555a9251ac921d0330f69039d63c4eed SHA512 30b23d73aa5b02548d4fa1ab494ac5bcbee93cb8bc04737a1af2075fbb9e4ae1c1b183ef54d096219e6bbf05c299cdb1e59a6caa98a797a70d6fc15bf0a2f0dd
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index f2da64580553..2af3a4c3967e 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 0e587f5f272f..807068271cc6 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1,3 +1,3 @@
 DIST geopy-1.11.0.tar.gz 72035 BLAKE2B 9d0ab7407f629ccc942e55d3529dbcfa792c50046aad7a23801803085f21675ed4bb3b734c430c5f7842a6f1f69d679a5ab9b37e4e60eefd48efa30a11468557 SHA512 b3abbf0ce4ca08eadc03a97876a662bbda1901660ea03329aace30bfb5f8af17c82653273e4d2eab9aca5e817f50768dd742b4865083709e10b8599331d5573b
-EBUILD geopy-1.11.0.ebuild 2307 BLAKE2B 829291ec65fb91f0a088d7fe567f7bb163b3fbbff582e3b677ebde9c3a28cafb628afe087e494535f856f524c8463c53d4cba67cd690422bee673064e7103f00 SHA512 5b1982975d758750768297d3fd10719d4e95396ce5a7d0d48ebe562134d808f027a4a8439397d0fdcff4fa841e84af2a074d6832aca324f8812a4d21fb71783f
+EBUILD geopy-1.11.0.ebuild 2301 BLAKE2B 57d4a689dbf16ed74cd619f0603c210cf5e2c446098dac2873303a0a77384fb90a569df9aa932def7a4fd8535bf18ad3678df588711c87d5cda0f4cb3fdbb5f6 SHA512 9200e9b18a0a9f01c1d4c0de5448980e5dbd3485e4d63d0690f5c48bb00781726a109ed605d86d96b14ed174087250b4264210a4367e8e7840af376d240f8924
 MISC metadata.xml 566 BLAKE2B ea35386f802c3a3d619e8531eabad55dfcc4da3ce7895859aab57bba610f52bee9f026513ca8a983a19a7eb52e6464240d629577381e1ba0030dfd4c8577a659 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
index f9c142975f4e..6e322c763e28 100644
--- a/dev-python/geopy/geopy-1.11.0.ebuild
+++ b/dev-python/geopy/geopy-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 32a3e1f180b7..5163085ca907 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -3,9 +3,11 @@ DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597b
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
 DIST gevent-1.3.5.tar.gz 4609085 BLAKE2B 55cb4111c9eaf9bbf636c9f1ef8d695def15a92e5591a0c441aae27f41a126487b37b8cc7a701a43453109f24114e3a0c584dff4b9b202018fd8334f0bae8e8d SHA512 4fd6d66e62437c859d653de4e981500fb3a025e6608b91fbb3d5ba4d8f0bff7cce980c03484c1c160a608427979ca763a6660d40ffcb45df4abe5f152ce65d1c
 DIST gevent-1.3.7.tar.gz 4614437 BLAKE2B 43d50c36fba2bedf41a7b33d38180f096b18846146953fa68325155f4a3cb6edb7352b9bb4cff5c7eca7a06ac25dc5b3e82a04545704fd0d6f43e9839a8749a1 SHA512 6dba487a9527eb352dc6a5f57120bf7973da655b3a331cad6637271b626c6e9e5439b20ee8abd9035ecb36e5259c99c69dea5ecdb8fa7ad0dbe28876c4d746d8
+DIST gevent-1.4.0.tar.gz 5169595 BLAKE2B 0c78f67bc94d15419b8eadf8825d9657c6a7a82756308216e1ca94d5465c25836cb736b8b370a12d1003eb8614effd4110d8ed47ee2b0d7febc2bda4038adc0a SHA512 6771f4f2932055270e4f5a79ae815e93fd0f471defa7f437dc84907ea8b44672e05ae5eb6958f8d90580b2471785dce4044d9d1bbea0dd0c34c1381d88af0344
 EBUILD gevent-1.0.1.ebuild 1463 BLAKE2B adffbb36780aebdf3f577e739dd41861f1f563ef06fa09668b6ce8dad0d8401b6c6173a77f9b15e69b2735ebe317b5bf2b6f680980f3e293ea68c12e34673470 SHA512 f64ef864e05898bb2cf45683d7193f5f618d5aa8781ba8c40952d771b608431f095cbf3d5abba50b08c680f1ab0d0e55742e615a3c086fa62419154aa2f7564f
 EBUILD gevent-1.2.1.ebuild 1831 BLAKE2B 18501c089850b5a01b61abd9a23adb50ee44390da0b9b609dbeb2e1c4527a69e809272d94b992d08c7c52de7fceb393e356e3c37a7583d604ba5c340ad7b4d29 SHA512 209a468635cd1c67036cde289dee61f900b121080fbd3fa3592262e0e455f5f9664c1da61391363521d9f48bceb2e70de376c8696980503db32a934924a2f72e
 EBUILD gevent-1.2.2.ebuild 1842 BLAKE2B 4a3df21765214b39d1f2b9724f933c5a423dbdca89ccdf05858df4fa08385e279c5084f5079005a35a387e09faabc8c295ea2d477e66dfb5dbd53ff38e7a09b0 SHA512 bdf22fb998632af60cf2a30161a8d70f6a9541cb9b9bd10c4aeb484b7bbbc2347b18bcbed59c580ef8fb5c9eae493f6a39a9be0509bcf05dc1586058fc85fad2
 EBUILD gevent-1.3.5.ebuild 1779 BLAKE2B 8e8f5b8fb3846daceafe41094a2efa7ca73ef34d03e8037406521de3a06b938b4bd58f43e9b35774e5b2a446854fccfb4e4afe4130df6667bf877c83b32654f6 SHA512 3a6d3f20594ede48a876e3a4c0bbb99b8a4bf6e87b910e0337510dcd879268336005e9b831d5a0269f2f9cb5b378ef3320746a410b7f4c1921f29cecb31253e5
 EBUILD gevent-1.3.7.ebuild 1777 BLAKE2B 04977e8b830347446b2ceb406891ea30f8a6a22acf5bf43ab319037ddde4f5a7f3d3ee24f31a4c4e79f2d3fc11dbb9972c48d6157329d9dfe5887838923b9a54 SHA512 3201001a405b4d06e56af485cd34dbf043a13dd6afff8e1e69af5c70eca8e7715c65c0b27d824a12fe47762652e0b1be06b7f0cdfd31a78e38521c467529d22a
+EBUILD gevent-1.4.0.ebuild 1707 BLAKE2B 946eea8f29a3c504275835aa268ff2195fb8b1790ec1f964ea593416d04d8e046b45188f1995d74d2ec533bb5f0d55ce386b4d1b1533fc6c465581587cbb9ddf SHA512 149a2814af3eaa9a6a4b5ca148d9dd82c2f2678d575535b37d906df7fca1f3e96a37a8b967a74e99f84f02bf0e386bb65c99b2803e9bcc90b0901c9235aa1baf
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.4.0.ebuild b/dev-python/gevent/gevent-1.4.0.ebuild
new file mode 100644
index 000000000000..71125420db03
--- /dev/null
+++ b/dev-python/gevent/gevent-1.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.14
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index e033fd54ddfa..de6bc7ac030d 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,4 +1,4 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 71822aa16cfd550f74bb0139a405afd1a735d271f9441c3189361dc23559906c1dec80b5eb60d022660572f52c1970a04caf15a8318765946c2c72066d6d724e SHA512 1c0c9f8044fd9726a4bbda235d118b9a1ff6b2598365706ad40045914b5f2ed41babc7e967188d09c7dee9fe2dc50f50c287128cc03e2aa8c9f603702562fc04
+EBUILD geventhttpclient-1.3.1-r1.ebuild 1472 BLAKE2B cad3eae871012e8905fd63701ee89bcf2023c92f78dff884e028d2800919a164c85b957cb2c93492f3989512310bfc96295a6c6856ea37e97b11ee012321eee6 SHA512 9587e0dfb96e9154ee0e5817a609052c3928c56684194142a1fda2a480ca89073ff440582a946c826817478ff0c58adda110d7b329add42994e22044b332d316
 EBUILD geventhttpclient-1.3.1.ebuild 1222 BLAKE2B 4d42ac8da7810fda67ee0622571cc5a87c4341048fe32860c232224f88871494b483eee070695d9f4262847882f8ad1f605a16a087e99242bc0a0b9cb423769f SHA512 9a30cf1330871362f15414116ceb3c21da35cd6c52b8d746c16065f166c963bfc5ebda7a0aadbd58707f12d84ecf529e5ed75a8c3a2f637fb841185bc406d8fe
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
index e8b00c55db84..730bd48ff87a 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 2aaf6ca4d936..0f184b8102bd 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-0.4.1.tar.gz 5002 BLAKE2B 667a40c0d852799e97d295df76d17d50017880afc9b2daa27d49444da84c791af619dea06b282e15c4d627a9584a23c2aa9fafcf45d9e0e924f9a6a966d071b6 SHA512 8b0e6578f05dc74449082a840ccd609a43fba3ca1c4dffacaddc4b27d2e9e3eac565a5c9672734e6ec5f2e8872b13ae0bb8a5d6bae4ee6c4cf41ef7d2c0b2eda
-EBUILD ghp-import-0.4.1-r1.ebuild 703 BLAKE2B 96b064729c8bf7050ca69b49aaee7894013aba36a398dfa8ca9002b33f240e05a9d47ebf1a1b5c865dba4e860ddc4a62a0a147b1545fcb7bde6225de600c5d6f SHA512 f0fb1e20f6a9ec2a28b0ce28d2a2295d19f76b71f5d1180b3f56e9e0431200d5983b2026349b81add91ecc1d19bb7d153ca39d29ad918689e67139b80af2f3d7
+EBUILD ghp-import-0.4.1-r1.ebuild 693 BLAKE2B a2f6c2155181ff68067282ed01b997840a5c53fb042710932d9ee109d449c1871f0ed559490e0726cef1bb37a815b280a68a6c4d6a46dfa3193c1a67e708aaae SHA512 288feb0af88fb77d9f07d02362055514a685a01a87bb3a0378d6088d138b842eef3762295df3e08710cb1591e390a405f1e124e01fb7bd02659fdb14889c87b7
 MISC metadata.xml 295 BLAKE2B a35ddaaaa21dbbb41d120d1cc45ee75b667bac1b6de115a587c9e46d8a86665560d5972db14b83af7a12e17509cb0414b889151cb63aa86cbe5a8d7db6d5c754 SHA512 c97c267838cdf557698e371efe5c544c787b53d3a7df771d718bc593be3e9eb948aeff7f3f9a833b6a9da19a5b380a954794f36b773e779a8b2dac752055f012
diff --git a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
index 06c153b35727..c6fb4d58de59 100644
--- a/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-0.4.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/girder-client/Manifest b/dev-python/girder-client/Manifest
index 48daf7109cea..929aa66225ab 100644
--- a/dev-python/girder-client/Manifest
+++ b/dev-python/girder-client/Manifest
@@ -1,3 +1,3 @@
 DIST girder-client-2.3.0.tar.gz 19976 BLAKE2B 4b6c1bb36a9c904dee331012a4060bc7e4cc381ebd1a74a9ab98a54a1c84ad41015209397fe7b1c12241176511ebf624d0ca4d43ce042d17a9b0388d9d6a325e SHA512 68bbb9aa328b9021b8d3604269df75f67c63631aebdad3b2268e8b170cc65ede911dc57abf049c091f033d85f7026c0869c68ceaed4ebf830f3f1d34d7e59fbb
-EBUILD girder-client-2.3.0.ebuild 830 BLAKE2B 0e2fbb263733e928643242b5f751ed225c4265f3c6a7112023481a4f153ad52b494efbd4dceac636362d3dd048cd0c2b90e4ce98c84b9a7f67587002e0a23eed SHA512 901436882387ec6a1c1625bae9cab475bd423bbad47d3ba22a2adafee5e7dc60a59314abf732d5349cea9cbe6a1473f361207c3fe4ee5ccf20f6cbda76bcd820
+EBUILD girder-client-2.3.0.ebuild 824 BLAKE2B fc03ae0741891be396417128afdbe2b3721e57c3a3555c579e142ac5719c8b86b48f524748f9b8ceb6fbc50727e413522eb38e7d58f637b013e16ed15af9aada SHA512 03df1f0b79e9b1a1a3ab96b9dd09dcbf9db998cd75fec423074e0bab71e8a1b71ecd6f8a87d202e7def76acdbf5ab95e6795dc732921ba5a9cd5f2d1fb5443ac
 MISC metadata.xml 515 BLAKE2B d14fe42614c20fac115740485ee00d74505a1b06d8e4e6cd12ce378b30ff4ad5f02da6d095fe49b29128eb930b490b2675c675eb8fcee1dba71a0cae3c012f67 SHA512 908a914fefa0d9d1cbb822dae3bb5e0f6385c85f15d59504cb40fdde47625513fc6603fa865d522dce9936d4e0a23523cc6a510cb7f87601aa42bb7acfce5e62
diff --git a/dev-python/girder-client/girder-client-2.3.0.ebuild b/dev-python/girder-client/girder-client-2.3.0.ebuild
index 66c8e1286ab4..c132023491e9 100644
--- a/dev-python/girder-client/girder-client-2.3.0.ebuild
+++ b/dev-python/girder-client/girder-client-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index 52643a5220ab..ff97ef0bdf19 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,7 +1,7 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
 DIST GitPython-2.1.11.tar.gz 428531 BLAKE2B 18b00f1e622c6588c14e1625f944d117348fb77e67161117510f42c8381db8cde8c6e16fa911edabfc4410239622fb845931b247bab4133585d2ec27969fea4c SHA512 5f964ee56c3f27c28f502150216af29b8463b19d9c0f773458dbabf17ba8587ee5c5e3fbcb31ad46c55e202d06bae447fd40007890a1bc116fe0370cdfc6401f
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
-EBUILD git-python-1.0.2.ebuild 1064 BLAKE2B 23c94421872e14baff18ec5bb87eee1ac9eb49e8d3ba45d08b8956947d6e0535ca5252f74c80f80d82c2929a4c81dbe7f6e5c81d53636f5af90a91b591bd0938 SHA512 3417bc18e44d63da20bddcabac30006d1e45503323f09036b8eeaa189274164412a7fb92801d30e6f1c4c87bcbc424cad2c3a4f06d7e15935f7f73f5f5d3e095
-EBUILD git-python-2.1.11.ebuild 884 BLAKE2B fccdf1c791b3e8d88cbfc758c6e9d110892daf4675e8245c9c0d5a5b54d68f07645770961a5dff75dbcfadd49ee31db835acc445c892887d597ce22b6bf83eeb SHA512 3ddb002a86275ca4e4a9a5f8881c16f5267a5209f8150a61ca4a8c8e183987a9c625cf349282cc185fdeeda9b42268322cea26c75c3efd704344f30ff5c43f71
-EBUILD git-python-2.1.7.ebuild 883 BLAKE2B ace8c92288233151f62298ebb6f51ad5b48f44efe19768ab529317195953142db111491698186056a6dde6a0a050d4abae5df7eed494405b32d43892fec1f41e SHA512 c2cb237dac6fa87ff114d87ffeaa739eab9142e8b013402a961d0755ce92cb4c3053d7836c991c0590f51a5b439b42c255d77c93d0e39f5f62471d3bbdd56c31
+EBUILD git-python-1.0.2.ebuild 1054 BLAKE2B e6a6f3df34f24593611560763edce5f853901b07d638695659eaaecec4377ac38c21fd3ad20cc95bec015ad6796358d1f50efd4c5abbe49c5e6a829c2bdcc9ca SHA512 b37c9c2cd13212eeceba28cf962783ccbb582f4a9753c3e972e2cdbd9c4017bbc89a0131fb8da88414f4312f655791729299a8e317d29102ae3c92f10c8391b3
+EBUILD git-python-2.1.11.ebuild 874 BLAKE2B 9b11349163301fcedeccf90d29c31ebace3c734720801690300be418216f040a6cd2f80007df61cf9ba639c0aa08828837398f28ff5f8597f0608dc6632ed533 SHA512 38d1a9604df23cd042fc1b02cc4b60de1d07446f8ef3b5c6498ff70112d649451065960b47fac732ef5c7e11066cedd6ef1ec4a845e7759b9d92474bcadb93d5
+EBUILD git-python-2.1.7.ebuild 873 BLAKE2B 4b581a545c89d539a311793cfbb7815e96bf4f1e2186a210944db1fb37cf0c9dd175cedaca0a6df18b9bbeb4c4bfbec2eb6244803c1725385e589ad2624f2ae1 SHA512 6f3dba32d510137806711520edaa983e0d724239dca7acd37ab143420df747266e3d25831795d94e1b62dd2a466af38f9c9029edd5169e6cb9814b905174b4c2
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
index a9272b7f703a..5bf25e7aeaa5 100644
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/git-python/git-python-2.1.11.ebuild b/dev-python/git-python/git-python-2.1.11.ebuild
index 50bd8d006a11..f913b11117bf 100644
--- a/dev-python/git-python/git-python-2.1.11.ebuild
+++ b/dev-python/git-python/git-python-2.1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index 34c1d99d1ab9..d162d0654d7c 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index d489eba6b6a4..0892ac4d0b42 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-0.6.4.tar.gz 400506 BLAKE2B 5c6f1bf15e597267bcefa6f77bf4829f13673a0f6e463b2d62a469cee3cf8de866bd88a59d9308211a03587fca18610b10a044d579abc976f40f8e1591b4f292 SHA512 2314ae70ec26c46c559cc69a1300ead8cd65a0a22425a3bb36b04edb73bd5e2628cbdcd8e515830c74b21af2badea662c915a727d9a46ed2f92f169eb71bdf62
-EBUILD gitdb-0.6.4.ebuild 698 BLAKE2B ffaea409a45aac62321cf3eb93b10327a620d23992c959fed8251202a0871ad6d06f891f599690b85ba246fdabc8fa35045dfc40b6d29509f7c6cb206d549b03 SHA512 4ea1b3e38436164c5234c2d0a14febdbd44e2b6d9b82404dc1a1cb6761450a5b019e642c9e3f2e722b41ca2a1dbda880778b6472090f30fbd4cc0cf9feedd871
+EBUILD gitdb-0.6.4.ebuild 688 BLAKE2B ed7eb492236d165c7e0feff1daa8cfc6de548922867f3f8f2f1a2d849287409be4927b14310dd1bf64aad28abbf9438086538d1fe635310607d837b840da4e6f SHA512 f26e33b118f119d654407dc55b4fbe87e365560ad9b5ba3aacb679deb0800eb96b3406d23fcf7081ee4154fc7257b6d0553142f873648de177af1e575fea06b1
 MISC metadata.xml 386 BLAKE2B e2ecd87d0601911cc37bad5055be83f73a24daae101ca7ef85d948d21251a14028947c285b0812af717b58eec399aee6cbc7a1cd67f58857d090d4142198429e SHA512 b9c7e7c5575d60c1f6f50f5577ca4bb9ba64285555890400edf4a7118d9a7546d71eaffdb9cc222e464b9397496ad832595e8d4f864228421a764b9ae3c3ad87
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
index 1d1e9ac89f7f..842e816383cc 100644
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index 908bcef1d754..81f53596e01d 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
-EBUILD gitdb2-2.0.3.ebuild 1256 BLAKE2B d52f86ac5258c3ae2366f1db0be65f57a73d27c78fdfee3980d6c322dc8dbbca9d2814abfea4918b7c373652a44c3ec2292eec4e6b4e116d5264c83c9a6b8667 SHA512 97887b19a3a5485130104a3fef8621db091e2dfca85f47734acb01615f35e9244cd071a26142f2ab5ce44fe38bbff21642d304a133a49224c200ebcb75f5413e
+EBUILD gitdb2-2.0.3.ebuild 1246 BLAKE2B f0c0c2f1a12bbfdeed58ad9cc0765ef489e4ab7359f4c8f4b6049634b55ab7c282561e767b9555ad5ae8bdffd31de3dbb160c74256cd7449c59d9052c0a285e5 SHA512 1bd455465dd8852e16b712a19d84486040d9d0fb213edf7a98dce2f2259856d411205d05b0e7d092027cac91b6901ae9cc6559e802c17eba2f6546af0430de84
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index e0dbc73a88de..80920af6b73f 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index b64f26b786de..b1681cef01ea 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,3 +1,3 @@
 DIST github3-0.9.3.tar.gz 783446 BLAKE2B 976013511e30a4e373ec4f986fd615e27d866ed38a4cf08d53f24be527b5c8ced38cc63f49eef7b6418d9ab5df3ff7d631e0abaabf10c20472eb9a14c212d3a4 SHA512 23d7ca5d9e5c4efd37541ec0be56bcc50c36d141999196ea2f0c17068ef1235e758d48c3e4fe9c8e204bac98931995913a4c3af227cfdbb7382bec8ac91b3c19
-EBUILD github3-0.9.3.ebuild 649 BLAKE2B a24151281bdc28d94821319661e1def66a013c1a1347ea5ddba39c6299a2aed0579c8c65a89a7379356310b4448cc38c4ede5829b25a0af671810260c74f5044 SHA512 caba910c0e2c2da50ebcf0fe74f1e21e2fa85aae6baa6f6ceab74ebad3d9380c56f8289e637825a80be069e331d1a6694095a1ccbe43a047204fdda3d0c02254
+EBUILD github3-0.9.3.ebuild 643 BLAKE2B a0e173b0108281fe276232c19e9f5c18a02f1215e2f8a4431f43440de709ddd6fabea7e1d1ffe902cce7886aeecc1fbf6b5f31f11a3368dd8a9dc236aee84eb6 SHA512 e7e97a3e02bdaff9eca6b2d5b6ec2af75aa61e2dcec372761fd9a04ec13f1cf91558df08f0ac688dd62b8f4d34239f8b70c21e8c20824428849b6478525091b4
 MISC metadata.xml 626 BLAKE2B 8e8b580d120dd5dee945bebb82e5b8183621a378341bba44918be642a5ada8ecbcc7634824bb0a1b8dcef8dfe8b8effca2296abba3d4d7132a1508b9478c6b2c SHA512 e7d2ee56150217ba65f153d875c0771fc99efdcf5a29682369e1b22d121fe55d77c38f45586f6b6e3723f9356e9004e4d3676ee09c21bda4ce5101b8ac551690
diff --git a/dev-python/github3/github3-0.9.3.ebuild b/dev-python/github3/github3-0.9.3.ebuild
index 1e75dd056df9..e907f707416b 100644
--- a/dev-python/github3/github3-0.9.3.ebuild
+++ b/dev-python/github3/github3-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
index e8b0f4245fe0..bbf8fa3ff4ae 100644
--- a/dev-python/globre/Manifest
+++ b/dev-python/globre/Manifest
@@ -1,5 +1,5 @@
 DIST globre-0.1.4.tar.gz 19274 BLAKE2B 6b05f531e9a3819f9916d16679a39c2a281056446afc8f395ba16dcccd25878355c749820c8b1fcfdd1e855ec7a8d0f10cc5a23e3a4e77c877e0e7180e9c24dd SHA512 288b2a6e9e1b7e646f7b06db73b255f9710007c0305466a8d4e26245ab73efb14e5b543291937edb3f0d1dd9205391a08a073d106f4ed687e2a21d181a83840b
 DIST globre-0.1.5.tar.gz 20388 BLAKE2B cc3dce578d4c30d0309a60a054dfea11b53d5039adcc3251fedccc1ee8a8ceb70e844799e8a7fffb398d0f8022a51ff2460a74102d1c39f1e49d5fa2eb8fe07b SHA512 8b102150acd17a77c8c3ce1f01e36f0c9258a051b44348b6d9494ea9d2f8247bb534de250c5d506641d889042107f3b93c05a313ed46ae54f6fb47ae997ffdfa
-EBUILD globre-0.1.4.ebuild 686 BLAKE2B 0c8562a34a5a3cdee1e71cc37343109ba5b8c46d7ecd636bd78a709ebad07157bc158e1e4204c5d08a0b54907cba0b3dcf213c15b7c227ce9e3898af41a2ea9b SHA512 c2600eab52fdba48f2492989d94fe0b7924d5d23fea3bd378d515954afba79900b2739193fab074101a08d21591b4b47b1c1a364260b4bb54ae5589c71ed947b
-EBUILD globre-0.1.5.ebuild 665 BLAKE2B 6f0587c7ff546a64fc68415f923fec68c76da66c65c77cc6d683b5cca73537dd6caa9bedcd20c007e576c17631f6bbeeef89381c3cf257aff7729fabd96e4199 SHA512 193ec2cde0aac788d167ca70b7eee075aed206ae409f1c66aaba4c873aaf1fcce0f97329d5f408c6f6c16e6a6d3cab13d536ab2961e5090a3ba97cfb702f4a41
+EBUILD globre-0.1.4.ebuild 676 BLAKE2B db23c1d9ffc808f60439193faff79a47f118dddeb66443bd86ac8baf78e8f9cad3d908621fff131f73bee78c8b50b69be198cc572b79a799df889b0a18cfebdf SHA512 e6a9541d737a67668d193fbd29c0f615046605657804d2a418cb0f5d8c623805a21207bce19550a108df191a22c76d65ade494ff1d50e7bcfa67775b091f5aea
+EBUILD globre-0.1.5.ebuild 655 BLAKE2B 1e02b97c53cefc155527459bf5b0878d1277165a7e1b70a0432fe9b433cd59d3e4a5a970bdcd3ccd2748501261dbf0b48272d81fc5bc4a9216639e45270fc545 SHA512 21a9b8c26e755c820aa716be9aeb54ffd925be457e74e5c5c6baea253d84102951d55334a9cbd631394ab0961bd8d065f9cf367caec2e5c936a08e4712040e80
 MISC metadata.xml 367 BLAKE2B fe876ca7eacf8c0c26d7d7198a43457c2e07749a9eae4e48c844a3daa998938768068893eeacadffff1dfffe1b68d17f937effca43714790a5d6e78d9ac4ea9e SHA512 d6d5ed219d18649e5c54e8a8b7aec3119f1af0dbaeab04953e88ee825aba9ec309374ea32249f8f3e36bf80b6fcd91a345f9562ec757efcd691ba8dc5a684257
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
index f3dfb0cf8c61..e3a7d6dc9f67 100644
--- a/dev-python/globre/globre-0.1.4.ebuild
+++ b/dev-python/globre/globre-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/globre/globre-0.1.5.ebuild b/dev-python/globre/globre-0.1.5.ebuild
index fcea07af31d1..11c88053bdc2 100644
--- a/dev-python/globre/globre-0.1.5.ebuild
+++ b/dev-python/globre/globre-0.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 2a25f3bf9b61..c9237dc2c700 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -2,5 +2,5 @@ AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
 EBUILD gmpy-2.0.8-r1.ebuild 1538 BLAKE2B d689752129227512511e0f6ca73d7f424403279ee7e684560583fc003fd56ca089daac29cf82927f9d25cdeda169e5c0a72db92fd6d0f73625bd75885766b3e4 SHA512 5bf14c51485abcb1ae6639d1304e7d5956b028ac94479a4e791f46c503077bc267d13c393ba74f50a0a358c6f4c6921bc681f519af402cefb2ead112f6d1fb8f
-EBUILD gmpy-2.0.8.ebuild 1825 BLAKE2B 42415775d1b35070fb4252770928d93c7c5a81d0979621f1007548a9c5d3ab920f618acf97e1bd7851dedbb7a2e133e3da593bf7833c8bcbc3459caad3cf6417 SHA512 8232f0c0ccc87ed2ef23875f2fb0dd2c64b53c9d9136a0fcbae9f329d22b24c32a93d12f8ee7df98a94b840398e420d630c8148eeb410a0c08436281a34bd338
+EBUILD gmpy-2.0.8.ebuild 1826 BLAKE2B 65b0ba4d6a9d0ad1f10a53376b1bbd43c8fef41f7ae1cc6e599b4daf9c70ee1657628496a0b05345477320ee5b0334b299f3082eee2a905870f94cfb27c58df0 SHA512 24c438dfa5b814341089ce852164a177b52d05012f6aeb5bfbbf51cfcd02dc9b2b37fccffa3befcccb1da8e9e41e1202f552e303b14bbe0b74cdbd98281c7589
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index e92fda760e0d..fba2e081226e 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest
index 3f1ca2614675..e8e1d16c1751 100644
--- a/dev-python/gnome-python-base/Manifest
+++ b/dev-python/gnome-python-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-python-base-2.28.1-r1.ebuild 1124 BLAKE2B e95edc8c80e7fca6c23a94946e3b91f00a2f0dfca58d6b35bb6be89b33d41c0284cfca56e967b3aa20fe864d0a6f0bf38d750f80d4f92add4fc07c5a36ee83ae SHA512 64b3bf19399fbd27c81257de6a77ac435fc437e7511a3cd926b7675863cb75b3f49ffce0d6be16f5227587c3dcada3c342dc81aba23c29bbddde928f4419f06f
+EBUILD gnome-python-base-2.28.1-r1.ebuild 1125 BLAKE2B 6dfb59ca1560f24a9bffd1922b4f43999b2a1d6c089d7935849a445e308c24641e85a541bdc09885d6b167c5fc0827c0af42ef02bab7343f3e8f1b016f5586d5 SHA512 2d42afd00e3a72e4d46705201e6d7de4f9a269dde2031d1a3ff4b1f0a4d354ad0d05a1b571b8dfa0547e4f8f63f850f3b75aeeaf2f3b8b25816b6de154dc03f7
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
index a1932014987f..e4cc29f38478 100644
--- a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
+++ b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.6:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/gnome-python-desktop-base/Manifest b/dev-python/gnome-python-desktop-base/Manifest
index bcd71862e269..2b941cc1fe74 100644
--- a/dev-python/gnome-python-desktop-base/Manifest
+++ b/dev-python/gnome-python-desktop-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1104 BLAKE2B 69c5169cc64efe7282802fc5d7be47cb7554206bedeb326ae33a73c649b14fab4f39c07f1e891ae3ef8c21c6df766d1a48a27849e0f93dfc195c48b99926ca72 SHA512 38d0d6975185091e388eddaf68e2a76dc9ff8243341dd9da84d0b82880b73d23c4f55db8b798ee32c2b39a86079b2139e84738d972d4054c033d082218f287ff
+EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1105 BLAKE2B e9142860069b568e5ae98a0cbc7791aa60c949c54fee5345c82dd7108d5f3ad3341b585bfcf4dd7fb5ae9f772d193aa478cc35bb0b52680b212c777ada33ba20 SHA512 6a8ad7c05cdf4a8ac416c327f37247ed5821acc49b6ce208270bd1da47afee80ac233b8e7c43b86654795c55bc3cb9deaf8783447782185769ab73cac7a362a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
index e085c55a3b20..7d04e179cbb2 100644
--- a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
+++ b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
@@ -14,7 +14,7 @@ inherit gnome2 python-r1
 DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
 HOMEPAGE="http://pygtk.org/"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/gnome-python-extras-base/Manifest b/dev-python/gnome-python-extras-base/Manifest
index 4db964adccd3..7a841e53c3c2 100644
--- a/dev-python/gnome-python-extras-base/Manifest
+++ b/dev-python/gnome-python-extras-base/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-python-extras-base-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1312 BLAKE2B 5efac6c108d24b394f8856fc8e76c53aeb9448e6a425468f5c7792f1dc5655c399ca8b8500987652cae0a6f4ad4d6ae2bee0214478a9dc14e15c73e145813b10 SHA512 1486655bfd3a73fd74be01edb4e8bd071efb189449db12baa9829f266912f787580f32faf8aa4d6df0d8d4cc76e7193d2ac846771013656cbbd39ae8c5b7613c
+EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1313 BLAKE2B 6621ed0ecd358b6dbcc03ecf435e5919aaff09fee00af0c794e88db34f15c492d9bf044f9cb238a350e5f30e093a4c27976b0351e1d9e61e6a8d2175743a9f7a SHA512 3acb72251135893db8870139e8b99632f9d67877816fae21a860dde196c056ae8a4951ae7b87f31f1abf4e3a7d7a6fdde5337f9ce2ff7af404c196c445101f21
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
index a49c097fd856..542c711646f2 100644
--- a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	gnome-base/gnome-common"
 # eautoreconf needs gnome-base/gnome-common
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/gnome-vfs-python/Manifest b/dev-python/gnome-vfs-python/Manifest
index 9fbcf853b120..4207e066e054 100644
--- a/dev-python/gnome-vfs-python/Manifest
+++ b/dev-python/gnome-vfs-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-vfs-python-2.28.1-r1.ebuild 655 BLAKE2B 6b4f018c6b320bc2ff223b3ea09daa7ddbc2d2b0aa7765224ef8a2a4c85837c63f36afc7bdf0e788b809118ee746a0aedb5f43622ce57b3a87aa3860410b8de7 SHA512 ed012904a4cc1d68b9374aa6eb8e220977b78b49f411a120e0306560c34c6a540f7dfb16f7790f20f1537d22afa7daec26afb81a2f76c70e2d1e8cc000ea1e44
+EBUILD gnome-vfs-python-2.28.1-r1.ebuild 656 BLAKE2B ebc0954d271049477a878bebe89991e8b51cd17ddfb6d4ab6bdcefdfb8749e6347cee4e0fcfb89f3147e47f71f308f4aa8fa45eb720079bb6ad1a3334ce8b43a SHA512 d19ac9f9af267138064dd3e6f2d56181e5a2e1a0d5b4ca4c38a548df130312c95fe6434ac966621ea63769e5b98868b15809c15517a77c1b54978fffbd91b92d
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
index 7368ba34c0ee..748a9b971ddc 100644
--- a/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
+++ b/dev-python/gnome-vfs-python/gnome-vfs-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the GnomeVFS library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 74fb006d54f6..60410a3d2728 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,9 +3,9 @@ DIST google-api-python-client-1.6.2.tar.gz 4262337 BLAKE2B 0ae3e5b1c6bbb80999cfa
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
 DIST google-api-python-client-1.7.0.tar.gz 4259363 BLAKE2B 0a6129e5cfa002095c18eb17c28b8f576f69c6aefa20cb752ce1b529cf5c6ba63f9d213cecb34340fd8224387c7d06c8ad3b4f493e32d26afd14e8e12b4c7ded SHA512 3dc0323ec8816725cc46ad75735b81c2b1e97d1dfc8964f9852f8f739dcdeffffcec461deb7e77b759d66b1e711ffcd948ae45df1e870cef9d6966ebfd793a40
 DIST google-api-python-client-1.7.9.tar.gz 4142239 BLAKE2B 1754162cd7ae5aa64e105e4842ac415473949064576241453ba5aefcc9c53e3a070167d4210f49509a5f63d4b9e79fa5377119ccd53acafe24eaad4a39e5f8c7 SHA512 1e4410c5e639a6bd3cf12b3e648a63e0098182bb52196085dc92597a38e98984fd349adc282d688aa58ec263502d984f54c7827b7ce53128811e7137234358b6
-EBUILD google-api-python-client-1.5.3.ebuild 1145 BLAKE2B cd6f7fde51443c0b10c1d7be6ad7c2a842ada712e1b4213fde46665804d5208e941ba2ce8a4c2d22e27b1024a4344f8da4731f16cc3ab34e12d6047906a43132 SHA512 f31091a35877aac1338ced37bd9971b9e0126e46f78ef53f308c2647a023452aea3a675b8587e2ee34f801e3c25789845688dde5075ca8407998606981802e57
-EBUILD google-api-python-client-1.6.2.ebuild 1207 BLAKE2B 12ebc0a2b391150a6f6173fa6a228176f54e065df5567f2d428ee616d12c298b0b7b9bd2d2b5581b305bcb8be2434d84769ccb624e9201d91a0d938711ef214a SHA512 39dff8e123caab937b06ef90739a88115b5dd0079aff4006cc10b38dbd2ce9ce24abb899add724ea9499f39de9f963eb338470eebe38b717173cde2209d43dbd
-EBUILD google-api-python-client-1.6.5.ebuild 1211 BLAKE2B 95249d6a43c63ac84039ff0c8f905ce54803f15ce2ebb1247ae0bafe784a0b80d2fe713c254f2d70e668e69002655b72ce7143d887f8e616838d94fd761a2e9f SHA512 b8c9ab036c1b91e39a7f6de42b62b6ac5c0b53a747f6d589923b7f5a98efd2429ff5dae244a0bbccfb4d636b4c222318cae8a481f0349ea3c4e1ba224e066888
-EBUILD google-api-python-client-1.7.0.ebuild 1229 BLAKE2B 68d0ffd5c354c137026bb5339d66ebfcb65245f838316eb98cba66ac92c9fb13a0052c8ca29207e6cfb04085a743cef6c770a0d48d23737a5c1a9a66f16594d6 SHA512 284fee5fa3fe346263b799b7a6f688caaf5557edaff7f4f787b3471b7e8d5abc28f7350bf368a37dde4496322d551019ea3bf0b90135704ea70564e6d7c31103
-EBUILD google-api-python-client-1.7.9.ebuild 1229 BLAKE2B 68d0ffd5c354c137026bb5339d66ebfcb65245f838316eb98cba66ac92c9fb13a0052c8ca29207e6cfb04085a743cef6c770a0d48d23737a5c1a9a66f16594d6 SHA512 284fee5fa3fe346263b799b7a6f688caaf5557edaff7f4f787b3471b7e8d5abc28f7350bf368a37dde4496322d551019ea3bf0b90135704ea70564e6d7c31103
+EBUILD google-api-python-client-1.5.3.ebuild 1135 BLAKE2B f504de55c56ef0421a2e33e685661f63e3d8eafedf44911c3c20fa72183dac41d614e80adf89211522b9b004c2c0356873f4513fd160c5082bec27be5433a323 SHA512 9ac87f214fee7dbd427ae7bbffc51a337a9fc450a96c3808ef8cecbdb24c7c1f529c741c4760c696ab8336f1bea3026332f97c7516cd59b1d2e0124aed188748
+EBUILD google-api-python-client-1.6.2.ebuild 1197 BLAKE2B cb8e3fb409e08d1023a263afa5b1c645455096bf8a9863f3f9a71d4d8df697ac6a080a9e8f964abd5b65221c6b70a9b776348791ac49d6d8fcf062ea87051e72 SHA512 16f0f48ba4b0506d7f3ebe6c8b53e1f8b06acefdf5d359f47f3f8361afa52960e3941566e68f2ec928abe5d49fe9eac095cbe9fe90235fcc21a41ff8441bf415
+EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
+EBUILD google-api-python-client-1.7.0.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
+EBUILD google-api-python-client-1.7.9.ebuild 1219 BLAKE2B 359ad0ee52e34de758e66bc76dc46979791858f369f8da19bb6d7cd593eb02d48702ae84eb02a7aea7b76243b263d617451f8558ca9957feef568e009ba8c700 SHA512 688f94149df1282369234c8ef0eac9b8bc7f2ba353f00f7c40f5aa5881fb1f81734baf98913cfca3151742ef3b3f15c4a7c6fd5713bbb825326ef248fd8ce51a
 MISC metadata.xml 356 BLAKE2B 57ec373091acbeaf75beafc097b6b84f56bc052d9c27b0386e12579e3bef8ca955413d38344ecdac04c7f5a0ab463295a827efd5c6691db1cb958fc4a7f350f6 SHA512 e45fdf92fc9a3fcf08b74e9ac07326cced2cd7971b16a6cc4f96203199aafb9d72d36a29e3a924a43ce8dc4f3709add9c8bfcc8413bef028408cfb899eec9338
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
index e77c75887077..c66c66487bde 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
index a89e87eef3a7..dfb0efc4bc83 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
index 531e5b76ba00..d3edcaf291da 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
index 1c8b3d211e87..140bfc9d35cc 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
index 1c8b3d211e87..140bfc9d35cc 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.7.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 60eb71dc28d4..9b78549ee881 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,11 +1,4 @@
-AUX google-apitools-0.5.22-drop-cli.patch 788 BLAKE2B eec24eadd85439bb978502dab49204849d9007a18866e64b1a472f40d12a45cef4e1c1b0ba23026a484870c7f3bb958e3f6d858d79c3c859e2b5c2ceccdba3dd SHA512 575140294dbcf3c1b0d5acc0b528db4dcee7625353e9a202fd3916f8082bdedf88fc77d1ab38a004604db92cfc0da949ec8796ecaebb1690ec62448c7b0e24c1
-AUX google-apitools-0.5.22-use-friendy-version-checks.patch 328 BLAKE2B cc25ec61871ac5ffbe068167b625eb20f0d3cbf32e32e014e4a17af276970cc5f71bbeaefc908a407a982a72ccadf188ff7c40b6a2c9704dbb5d682d2a8d34a2 SHA512 a21b43ab16678caf0ab1b18bb373fedb204dc3630aac26f584221ce0d5fa2834a1f44646c0f5eff6b8d9e7a3436c29dbd412ecca1cf354a6429040f308232a45
 AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
-DIST google-apitools-0.5.16.tar.gz 405331 BLAKE2B 9bd086a68e5787f6dcd426887bb5e0af23ac985f851471da61567266fe52dc254054f0f2fb49e08b461c9281a32c25a764a7b751e10fe6ccca13c2758cdc4637 SHA512 cda60ec21622368c67cc47900218ceaa4137e6d602ee5196f59dac82aa87d35382785323971cc7e4aedf9d69e0a1baf8017c5d941d05171df9e1d5eea15570eb
-DIST google-apitools-0.5.22.tar.gz 422977 BLAKE2B 1734f7e19ff90ff5997921ec1e57a29eec13f20dac4d7c84015d40f13147429ad93400a2eaa6038fdbf3ff2b5700dc1a0f6da6cca0706598b3a1eb5abba341b1 SHA512 f184b0ccc17ae80e8436727afab62a3e655ddecc37bde23dd144cc285461b80846fb1df24f21d75f06f521dbc28e8f3e9d5838d769ac52aff83c0aa8d1be66d5
 DIST google-apitools-0.5.30.tar.gz 363524 BLAKE2B ed8477c85911f5855a449abe81b465635d3cc4e08d2915de5e882608e634f3dd9ffdda929bd8b25eb3daa5922851aa9304ffe07778cdf3a3aa629e215633515a SHA512 2dffffada829b9b962c64aab22b19cd227981819128c34f3e32515ee599297b3d5e8c97152d954110c2ef27c02737d3c30c785840b9f9767068688f62dc0b5c7
-EBUILD google-apitools-0.5.16.ebuild 772 BLAKE2B cc645f6a373240dfd8d9eb5ecd3206604e99cec1477b54b0e343732b99a5e0e4ea8f21577d4c6498a1e9a7a8486cf3f82693233e7463b6737cbe540224ddd8ad SHA512 025f4583be50f927853dd96e2b6f22f840c6cb4301636297c3eb3917065509a2cdfd49b89a03b9caf0cab56ac517187b8cbb91759a329acb6a85869437a5f7f3
-EBUILD google-apitools-0.5.22-r1.ebuild 1324 BLAKE2B 0a405e8294c51afad152754c9cd18e31f4e0ce4f9f3b346b65c693760c619fbca198d32d25f74c4e92aaade17a9978cf810757471096e5818dbfeb421e33bdcf SHA512 97e700ec57791ad16b6c81d72a4d18c706aa7dd2a20a82fc7d56a87dc54c8ed19f564ed1a493bde81e8b92a1e3849d510c6a572de4a2f7f7dd1853feaf948c33
-EBUILD google-apitools-0.5.22.ebuild 957 BLAKE2B f4a0e09a1aed739804e17d3c922a90821f306edb160cb7262fddf28a0aa4a497002059e3d99630489fad0caebfa035509395aa7f81f7c8c17818c71b7e7ae5da SHA512 c3782afb5070813298da99148c64bb675bcddb197673908a56cd7ff340dd0fcba6efc4299a830182658a8bcfc8ed4585e8ae27450700147e653b7e9ea6305c63
-EBUILD google-apitools-0.5.30.ebuild 1096 BLAKE2B cd1683a3e379a8c08d91ba7168d47c0f902ab78a9a9aa1799151b13dcde3878d85f5ab5ffa88747fec4959d59ce69f49b572b6ecf2b3dcb99e489e8d3b7302ee SHA512 b5c6f2e4b5df36721f0fd825de127019b9a9a260b2894b626470323b78e8002692136063aaf4ebd29828839437025e850de59904b8c501b6163b36bc8b919ac0
+EBUILD google-apitools-0.5.30.ebuild 1090 BLAKE2B 5b6813000245adf540e121feee48a2ec40a9bc348e037e026ab2f8cf16d485c1cb265d015753be4c820fe57e5a7a3ca5212e305fb4ade1a586be0a488a6b29af SHA512 be5adf34dca5f7b5d4d3b8df01d3ea014a79e08d146b3b5676154b72b5aba04f426f69e24388ea428ca79a1832f66c436db8b1d193d19d3a8fd122109b93d054
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch b/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch
deleted file mode 100644
index cae369deefc3..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.22-drop-cli.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-we don't have code currently that uses the CLI tools, and the CLI tools require
-the apputils project, and that doesn't currently work with python3.  drop it for
-now to get general python3 support.
-https://github.com/google/apitools/issues/8
-
---- a/setup.py
-+++ b/setup.py
-@@ -69,13 +69,7 @@ setuptools.setup(
-     author_email='craigcitro@google.com',
-     # Contained modules and scripts.
-     packages=setuptools.find_packages(),
--    entry_points={'console_scripts': CONSOLE_SCRIPTS},
-     install_requires=REQUIRED_PACKAGES,
--    tests_require=REQUIRED_PACKAGES + CLI_PACKAGES + TESTING_PACKAGES,
--    extras_require={
--        'cli': CLI_PACKAGES,
--        'testing': TESTING_PACKAGES,
--        },
-     # Add in any packaged data.
-     include_package_data=True,
-     package_data={
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch b/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch
deleted file mode 100644
index 48688543a9fe..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.22-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index c0ab0b842899..2b21497dd088 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,7 +36,7 @@ REQUIRED_PACKAGES = [
- 
- CLI_PACKAGES = [
-     'google-apputils>=0.4.0',
--    'python-gflags==3.0.6',  # Starting version 3.0.7 py26 is not supported.
-+    'python-gflags>=3.0.6',
- ]
- 
- TESTING_PACKAGES = [
diff --git a/dev-python/google-apitools/google-apitools-0.5.16.ebuild b/dev-python/google-apitools/google-apitools-0.5.16.ebuild
deleted file mode 100644
index 389a7b7a8dba..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
deleted file mode 100644
index cf9076ca560b..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.22-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We strip out the tests & cli code as it relies on google-apputils, and that
-# module hasn't been ported to python-3.  No one currently relies on them, so
-# we drop them for the sake of gaining python-3.
-# https://github.com/google/apitools/issues/8
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-# See comment above about py3 support.
-RESTRICT="test"
-
-S="${WORKDIR}/apitools-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.22-use-friendy-version-checks.patch
-	"${FILESDIR}"/${PN}-0.5.22-drop-cli.patch
-)
-
-src_unpack() {
-	default
-
-	# Nuke modules that we don't need.
-	cd "${S}"
-	rm -r samples || die
-	find -name '*_test.py' -delete || die
-	find -name testdata -exec rm -r {} + || die
-}
diff --git a/dev-python/google-apitools/google-apitools-0.5.22.ebuild b/dev-python/google-apitools/google-apitools-0.5.22.ebuild
deleted file mode 100644
index d848410aa32c..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3 support: https://github.com/google/apitools/issues/8
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.0.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/apitools-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.22-use-friendy-version-checks.patch
-)
diff --git a/dev-python/google-apitools/google-apitools-0.5.30.ebuild b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
index 460f5faea92b..8401e3c8f33c 100644
--- a/dev-python/google-apitools/google-apitools-0.5.30.ebuild
+++ b/dev-python/google-apitools/google-apitools-0.5.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
index d2a106629d26..b6419d908e43 100644
--- a/dev-python/google-apputils/Manifest
+++ b/dev-python/google-apputils/Manifest
@@ -1,5 +1,5 @@
 AUX 0.4.2-sh_test-env.patch 754 BLAKE2B c44babbd7f1ccf7a9a6ed2f1885e30ec6287eb48900446ccebf1699a5afc0bcea6e5079716e8aec064553d97fb03c6e2a42286c8fb769e9eca552696633fb3bb SHA512 a8a84c65d08c7574f4e33c6e6c0b75d1153e192e86ec37c0e74754cc84f45b081b523ee2f1919f57580ba5bf6d849922dfaf62bafa00ef098cb1a835a929331c
 DIST google-apputils-0.4.2.tar.gz 81095 BLAKE2B d99c2fe8081616ee2891718fc3d00d00bcd703f694b9419bfc7aaebe75ba8cd0de12e8461dbc6459c1b7b88abf6e7af89972368c565565cb5dfb810938e4e1d2 SHA512 d7579ec461292bb01ad5b8e1b09e161c66af0e85361f43f6065b837c90bddb9711a2d56db2b73d780dc25945375d4dad2f646507512b9acfeefd517613feacd4
-EBUILD google-apputils-0.4.2-r1.ebuild 935 BLAKE2B 59a17e45f0c7a3f1a393969e64e188d18e09533a003d856faeb9aedee5d8ca04bd0adcd2a9071775e2cacad4a53cf960a4d2ff23fff3f792d6268b82a8285b50 SHA512 ee9949665b1d73fd34619c0f7d23b5e6edd418749b9c4304282a6c88f7a2cf6a4d92052d695bda31962b37797f075e92e651b9869c62a1d188ba5dfd4a986f3c
-EBUILD google-apputils-0.4.2-r2.ebuild 1133 BLAKE2B 1d496609c44c09d966960b3723cdc79918a934c4e8c4ffc5f332c02b60b923029b0ff9cf50b84b2b8ddf468c8c0a46991fe43fddd6e35b3ecb23f3b6bda915ac SHA512 3e897dbac727bf6336b7bcc5b52b625e584964dfc420b89bd21ebc9d8652666bee65945ca5c24690dbbf93e70a34e8eb2d19f6b9baf34f8a2d93ec8113495da3
+EBUILD google-apputils-0.4.2-r1.ebuild 936 BLAKE2B 7ed9930af378ddf7bc6bfa356193d640ebc48e0099092bb5e529c9b3c387e849985afd718cd1d2d0a8f6589d29678c7560e610d05dd7a1f17919c05aaca45eac SHA512 4e75914ccf50ff22fa653cbf64914e2e897bd7aa8938e3df8f57ac78e5bdeaa54ad6bd618a31a96418ac43d63e6e985540b9523e3c1778fe4a1b674edb997dec
+EBUILD google-apputils-0.4.2-r2.ebuild 1134 BLAKE2B 8a4adea5e5196a02599167257a51ea68f54094eae601b71f77f6863b9eb45d605065e732c6682da2a566fec2bcc7a401c07e4000b6457f369b50a87c51bc5e49 SHA512 fde2bd3490fe99eab991eaad1a6e69c830d8208f5c499c4d28a3b0b23f7cee3249e491c35f6ab75625194dd79143a5808d4f9706d77be25394919336ccb3a0b9
 MISC metadata.xml 392 BLAKE2B 5282cd7dbe47082409723576d76c9a8b9126ff1c9c6adca6ea6c1d07e28169a01725cd6e24e407392c42703ed848626feaec4e134ba3bc0731f9488f8593613d SHA512 7ccba7bf0fcdb9da27053154056eb947ad07ce01db7ecc41f5a7e58bf75d15e71ce08ff420ee70b8169e5ea44d48d04d529acad65c8280785e0bd21a21bbcb9a
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
index bd203bd8daea..d4ef9897e9f1 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
index 681e3251f575..5c192d080892 100644
--- a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
+++ b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index c0e74113b91e..b8a336605bdc 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,5 +1,5 @@
 DIST google-auth-httplib2-0.0.2.tar.gz 10830 BLAKE2B 7f2092d83c318510b9140791681a58bd3e436f3b5966c8dc53aa5b041e50fdc4f93c276810a0e6ca20b14a919eb37588ae1d027b5eba74f79f44a6809909dd4f SHA512 ec111fdad930bfe3f8f97df70a8bef955920ab2cb0c383d7888ff444f19e5c176dd5aabe10f9a870c86035791a2b27e3e8e1276360626ff5e430db823da5efb0
 DIST google-auth-httplib2-0.0.3.tar.gz 10914 BLAKE2B 20473182a5bd4633d1ae16101d81520ddf182706d478c066e533a2eac3e28fccf2bbaf733eeb4f7ea14d658fe29b9b0c656307bb555aabd2d1a21585e3e3d3ba SHA512 dc39626961dfc67ee56d1c74b4e37e6c6a81ec3c8ddcc24007535acc6a973f2cba5e65a9ece323f53d4dcb4f7bca948d65bde4ab55b2c002432d020cba9d914e
-EBUILD google-auth-httplib2-0.0.2.ebuild 1176 BLAKE2B 8c35d272fe67e754f73f882115c8f5a6cca784bb41834dec6f413e5255f41a145764889f20c54814ddd92df3a35a820271d6a9e7531146bdbc26dc67d05e5f8e SHA512 d9dcf08777e83ab375414db33f7e164bf6a981d480afd3dbf4d0090ec1da42cf5a40e66f22c6127703528446894216cb1481376590e591571e65ebe3f755ea19
-EBUILD google-auth-httplib2-0.0.3.ebuild 1182 BLAKE2B 7a59fa537ea4df5b954cc8852c07abe4a37fb714e36f889a8341e476d308f2ae254931d038b79bf5a9350332d3d7aa184818e63f9a7c2513d574fc8408db755a SHA512 9cdb9553b7367e32402c2236ead7841796ca0ccd548b093e64700712b0e7eca2ae36405a3555b5c7d4f1fdce5b66e69af5042613c64054a139b301490dbfe668
+EBUILD google-auth-httplib2-0.0.2.ebuild 1166 BLAKE2B aa9b6d9da543b3af2b071f4bb0fb52a2530aa5e641e521a6017295263e1a0702ad26bd24691317997b9eee86e2caa90732f7f5f5f3f272368e4729034e03e666 SHA512 89111fbca4a7728590f2f7630951b8397bc1fa49ca1e70f38e63282fd3ec44a3ec31d59db4fc41f6e4231a63d8b949880c87677f031e22fc0c536b7d72336a8f
+EBUILD google-auth-httplib2-0.0.3.ebuild 1172 BLAKE2B 9e6703ecc66f2da95677d751f03657d08ec730984910f99c3803988d2f180cd09289dfd264050d78ac3f69837aa3de3b774eab65b4197681d9de05a0774e1084 SHA512 c9749976110b648f62ea8c5341ef0d5f1e9ddf9222ee90d1e22759d1aefc3206ebd6529a3ff6056dd050ec0bf2a3191e441d4b45fe84de3b98f4176fcf5b92d4
 MISC metadata.xml 422 BLAKE2B 4aa4a1542a90ed8ebc399dff1824e77e9f695104e4e59317af95e21719d993ceea8c5ed512d15cc2d9d4085bdd1afcc70a58e2f0d7ce673508e2cb6f52d3664b SHA512 bba9deccadfaf0b663a2f6239633f20ee02838d98cfa25e4d8c399e5635c4cd0b811dbf821f18edf98b328a56a37146bc316aceed6b5b057ef5fd2cd151bbaa2
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
index e395f1623b0b..8b760f60138e 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
index 30b3605f14d6..504cfac22662 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 5076bd9af20d..f46d1866d548 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST google-auth-oauthlib-0.4.0.tar.gz 73664 BLAKE2B bc98af5a85b26ced36171dae4e9a498b08ddfb92cf557805a238d68fe8bc251c61be6f051db391f4c30fae0aacf139cd0cd88c3e42cdc73efeaaa36407c9496d SHA512 49760914c02b41b7252062c8cb99b133b342463aa2b66b42dd5f320320010425e6952009514cbf89a4704648113693b35db1d3aa3636fc1297a25e59635a7dd5
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
-EBUILD google-auth-oauthlib-0.4.0.ebuild 635 BLAKE2B 4a2c3a2f907c7c76d2a82db975ef29449a009b75b991d3c64641a0b7050258716dfe82d734b0169a323f1f733ff19b1069eb34fd3aa41a8147cb983fb9ddf49b SHA512 8ea139f9aee2435973200ddfa0c150e3d943be731288116194d9f177d31f46ddfa6a62aa7b5a29ea3d98ad7dcf4ce88b2319820957cc861e81cfdbb6cc791d9f
-EBUILD google-auth-oauthlib-0.4.1.ebuild 639 BLAKE2B fc64473c6282e6249f2bc4af62f8d912bf086bf6f8bbbdb1c877bd1fbc02505449e8ba37cd1829d1f240c07924efc07263736c57d1130c98b632eeadbaff46c8 SHA512 2f71d9cb4c50220ec03664a77efb774622bd305851d4992e71f08caddda8a6f32a297082d03a5e90fe6e205461a51aab67465d6fabc6b43585a1e9d20fe3b61f
+EBUILD google-auth-oauthlib-0.4.0.ebuild 625 BLAKE2B b0fd8bd4a51d7dd996ed27183053941c420b4fb20e0e83431bb64d4ad81b85cdf892eb5f11643292375162985c81c99c3867366a37567004218d0533df6c4850 SHA512 fa8863d1c9cb64dd49470ef75571b8bf30ef25ae9cca044cb0900871a824ef1f4d470c6d89689b908877198c0bd10af08de4db7abd2940541fac2a02a7ca2e8f
+EBUILD google-auth-oauthlib-0.4.1.ebuild 629 BLAKE2B 0cb2298c2fecf924e22458c8652d9f9d461f183444c234e4f5817954cb95e498630ebbfa4b75a2d38995cbd74b946518729bd47f6a45ed0ecd48b8fd6555e95b SHA512 41d56a3d6105833824b666862769d6a2c4ffc8e60abbb4f10f98cb598915d07f66cc34067a6537726ef6a299e32d35313d3f097f2087ce25659df9d0778784ea
 MISC metadata.xml 470 BLAKE2B 36db489a9e55bd13107658ae61a02e1ab39323c8eeda79b918b193471664adb2ffc2457324be492619a387d600e5dc72e08df323f17e0141793a12cdda79b89d SHA512 79b59e2f899a165f0e3a98ad3f3e809e264fb6d9b0d399329b19af3d2ab2c1628d99d9574fe4f9532646c648b6392a9cdbd9bb21739cf5d37b19c56438e185b2
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
index 1d783fffbfd6..464cbca16df9 100644
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
index 33d8c12b6cec..24b4e5d2dfeb 100644
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Google Authentication Library"
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index fcc31a318e32..e7c266224750 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,8 @@ DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12
 DIST google-auth-1.1.0.tar.gz 290602 BLAKE2B efc1ae38b29693f035ea9d19af83bd0e098dacb143192d77140ea1548a17dd051b344b6b34044f6d02e5bea631fe4026dda4ba7c1053535641f34aed08cdd48e SHA512 03b4021f5bc3c60671e1e528642af4682828e3a83a07aa9dea8a28b3f97c4020ac47f325c8a952f366d45196e6a9a78a78e1abcfc8d7f878f7b6369434a0b79f
 DIST google-auth-1.4.1.tar.gz 74272 BLAKE2B 8b9c8f59979688bc8a28d3f6c32eb06aa527b3cf9a515ceca51aa346d70622786292f5be5a4bdb2ca266b777d5d5fd41061af3afd4a2608a6673192ad643ed8f SHA512 cba174049a331c8c0ea5b82da0096641d975f59f1f2c3237c32b1730b4c9f9d12f3bfdcb6cc9b9f9c87109d509dcd423d0a4a4d98200e707052760c253f3ee45
 DIST google-auth-1.6.3.tar.gz 80899 BLAKE2B 71e9ef4fbb8803dbea96e1b9b3183f9bae8a9bd7e29eda1c9ee042c7abb3e5011ee4f461ddafd3295119e3a5a451892b8a38cb49702c59828baba1af35403c25 SHA512 47a3e9390428ffa58946c348d4e1a1bfe1290d6e06b75924bbacb37d5af929050690ef5c13820468de805646f4686c035b00dfe947c090d53568dd85d804af5e
-EBUILD google-auth-1.0.1.ebuild 1369 BLAKE2B 7854caf2b9f9dccf9767111206f627dae308c41e0c7aa8f373c54b6eb480bb0189113dfaff361940dd1b5199f5943691bf79c6fc707cd237362ffbf29aaca368 SHA512 fc8bde0eead54d9a46d579447e638ecd1e4cf2210c85791f5b9950a8b06800073e8e2c329de848da95e899287a3dff2eb35d91b736fba2f7433fe76fc4b0f1e0
-EBUILD google-auth-1.1.0.ebuild 1421 BLAKE2B bf24927f9542c8e7ab4fbdae0f8a867a46b08efcb8bdff10d5f606bda3815c069da263748ff2d6ce4656a01d2c65a28c02ac293ef57ebcb463b6ca0a4e29b363 SHA512 6854207612d74fe510ec9df8c124017b98dd7f695d2069b92bc03a49fc85b8f59f88014b9865da8c2b80e14771f32290fbd3d8bb10f3ffef0e94bd68c4c51fbb
-EBUILD google-auth-1.4.1.ebuild 1244 BLAKE2B 73d810b6d1a04bbe55d25d8ee11d7f67448a597dbb4f11f4fc0e1dcf76a8a54decbffd3daef0c80c45ed6ab3fbb30fb6ae506c9b7128328aafd69d22378c42e2 SHA512 97660abbbcd0f1ff6685b601b2c10eced8ab17631cc9a756593504462ecba4bf444e9d5bf00df31d82fa47c8431e49c8730ab9ed94ffa625c1d6eec4b0a97459
-EBUILD google-auth-1.6.3.ebuild 1290 BLAKE2B 6860d25d2f7f4a953311e82fac90908fce3ebc61939a1646f7edd31488063efacf5a2fa30a7ce2b924e65d6484c262ad100298f5c3f858271877b5ef89c6410d SHA512 7780b12aa3d237640e83adfb528fe38e8befc72504943aea4ce871c34202c98bd4228207970e323de6896561a3834d87841db986f223a7e4c6e906c1a2cbd50e
+EBUILD google-auth-1.0.1.ebuild 1359 BLAKE2B 58e37f1f7005b7af6c0775278d0a8220a6e3c1b2574bdfb4ad5a62dc37a2b64e1ffd52fd0b3a838e08d0275e789a521c2a84d9110a0e787c226070c3c82286c4 SHA512 ff48dd4fd546aa8bd3bb629e44c56cb91e54d0c962d1d80de24596e75d37a16eafbb611aede2b0763badf15d691dcea29e8251d9c9c30bcf31ff659dd5f7464e
+EBUILD google-auth-1.1.0.ebuild 1411 BLAKE2B 168aa3dc457ca13a4f549461cbf55562d13e6a8a3cb535f46ff93e4b9ce8fd765e5f5e33f95fb5f61e4e8d1fcd677de4dd0732636ef1a431484cfa27e14771c1 SHA512 28c9dbd0212a4b1f74b2fce51a5af9ac29be02603a0c7fb821a1b5773762966f27d045512f144040ee5b85f83c2a2c40bc4cd70042e6b2e1c802d570f3b42e82
+EBUILD google-auth-1.4.1.ebuild 1234 BLAKE2B 2bc9bd09f99cb8f08b6c34532c70208ba93528a3a8c19009e15db56ea76e43209d1a12c6ef0b9c83e8c14a8049ce70161b135079000d33f09d4e28e13172b38c SHA512 2ff91f005b1b16102be75bef040b89a7fdeb30e6b7900f8e8ba89ca6149e80e8a55e633c2452d5cc1e531aa6ad27c7d997b6d5134a2e999262fb68527cbf21cb
+EBUILD google-auth-1.6.3.ebuild 1280 BLAKE2B ec8a8c550643d8f25de5a51dd1b3d502c8156c86ff863b619af5b3c5041df20891f3606fa0bcca53dc555dc6b987bec1192db979088af41dd062bd3ac3450a9f SHA512 0136a2964f1210a729e1f2a9364ecec4f5e07672cb3a1824f8b60b98dcec7a824ed9ab67db46a3926ccdc3d5dfe263f137d78c083eee9edb7e292a4460d920f8
 MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
index 3439a9b7bde1..553ccb457d1c 100644
--- a/dev-python/google-auth/google-auth-1.0.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.1.0.ebuild b/dev-python/google-auth/google-auth-1.1.0.ebuild
index f36bfdca3b9f..363f92d4a6af 100644
--- a/dev-python/google-auth/google-auth-1.1.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.4.1.ebuild b/dev-python/google-auth/google-auth-1.4.1.ebuild
index 3d075164ca22..094f852eece4 100644
--- a/dev-python/google-auth/google-auth-1.4.1.ebuild
+++ b/dev-python/google-auth/google-auth-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-auth/google-auth-1.6.3.ebuild b/dev-python/google-auth/google-auth-1.6.3.ebuild
index 1baba96c4b41..8ab4aa30d8ee 100644
--- a/dev-python/google-auth/google-auth-1.6.3.ebuild
+++ b/dev-python/google-auth/google-auth-1.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
index f2c79eff3c21..26bcaba491bb 100644
--- a/dev-python/google-pasta/Manifest
+++ b/dev-python/google-pasta/Manifest
@@ -1,5 +1,5 @@
 DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
 DIST google-pasta-0.1.7.tar.gz 37090 BLAKE2B 55d1846a733d3d593e0df16f360a55879b7d5c88a1df410b2f86e97dbcdb01493a7abaebfa57f0f39cbe0dbd081847bce41d8862dea30cdef65d745870ffd89c SHA512 dd374fd039b7b6bd5ca9821dc8342854277cdd7b58738532cf0a39458c3021a1d5011f147c5a3fd1936023da7890636a65d4026af7da65194bde0004ec0caa35
-EBUILD google-pasta-0.1.1.ebuild 491 BLAKE2B 8c8e3c75369fc61ede336e6a13f055724c5bc92169f59e959bdf41282b5f08025ea994efdec5b8f4f8a804f24186f15c27cd7ae781d6f0ec49c3913591131ffa SHA512 3c139842f618d794a087c051f4a4410dbad537d7c16fceb830131c0860fe88cc222e740abc00113ff96b163f014be72b9a5e4e75f4c072f47df41151668fc600
-EBUILD google-pasta-0.1.7.ebuild 493 BLAKE2B c34883ec0b54334aacfbc75eb1352f167317256ceeda0a46b1959ce0c6e8760df88735f166fe82524e465a755125c4c43c6fad274d474ba35464fd944630b6c8 SHA512 f7d87140dcc34dfd5955810b0f1c36f51592596a53581bdd6b4af0916d33179a7a79fb373ff6e27894b4aab971dd5e7ad8c63e793153617cafb06630c24f3617
+EBUILD google-pasta-0.1.1.ebuild 481 BLAKE2B 97b6c1d3acc931792958e574186d793723d991449bfe3e1df5aa39ec72315a5bdb05da5450e73e05fee350392b609884ab2daf98346e2b009d38c13b8a762985 SHA512 144f0b6784b456fd26797dd432f57021a9ce92910585dbf013d9942413d8f7061699027a280c81c87505c8555e8c0c9e24f7a4a804c9442d3d6bc15f9e11259f
+EBUILD google-pasta-0.1.7.ebuild 483 BLAKE2B 0db2e7c7ca4f1007dce20ebfd1954a4091563a5cf6224393080fcc70d8a6aee04aa05ef29c821eb1ba636ecb23786334cb1aa9bd447660b809a04ef1ad820d6d SHA512 5a16313b53545658cfa15f9582bfb89519630301d55972f6eaf1fd168445091357d859f1ee1a533059de7508c0cd370195d92b3516fd38fd9572e970cd52b647
 MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.1.1.ebuild b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
index 8851ee16a2d8..1f85b6d4925d 100644
--- a/dev-python/google-pasta/google-pasta-0.1.1.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="AST-based Python refactoring library"
diff --git a/dev-python/google-pasta/google-pasta-0.1.7.ebuild b/dev-python/google-pasta/google-pasta-0.1.7.ebuild
index a99872c0eb58..bec75ab9f0fc 100644
--- a/dev-python/google-pasta/google-pasta-0.1.7.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="AST-based Python refactoring library"
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index 6c22af6e4517..71a132c52d21 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,3 +1,3 @@
 DIST google-reauth-python-0.1.0.tar.gz 17720 BLAKE2B c78a43f1062988ada715c9e1bb64c2252a3debd5b9b366df9780200717a006c5e4957bf37d81e645989c6fc74c5e5b4354c88244309bb1a22a936ef74f6172c8 SHA512 b92b822b5c59d74f7ac747e66f35eaa906a0e18ccbb791e0904551c6ecd9b904ac7602ea38333a16396ffa49638a1b4991827429c7f52311b9506f55400bf117
-EBUILD google-reauth-python-0.1.0.ebuild 1129 BLAKE2B 0830762baff14331781ab071d0952f16d1cd1f1df9a9b8b13f3ac6febc814e14b216a5e63d131097dca5b9f2c4b72210813de274228878c35015a0de9d818df9 SHA512 c5840af96f773d49dd1e6fae71fa1aaa1aecf6b8107a5223a47a80cb0c70a281c9d1e6716180f12126a9251f134804cca0f05f842179a9c37efc8ccbe9c7f03f
+EBUILD google-reauth-python-0.1.0.ebuild 1119 BLAKE2B a8dd833fbacccb46e5697078c58823f80c52b30ebb1b60dd93fbb786cea0b1e36fede555e24e067919139031871fd93eed2e671f9a2fde3740f68637bba4147a SHA512 f3a713385df277ed0bc7cca819dc94f4e2b2f325e7fbb61a5e43cd7d211db20b2439220dee8989975f1b99817dd81e33d5c1a5bdaf19b337d6b9c31956d4ebc6
 MISC metadata.xml 387 BLAKE2B 3c273fa005cf2d68f977f8556723ae4577d05998471f3cd845f7335c84c610d4d4af9c971b6ee2edcf51b621e24eaf2083c20dabad714111b2d21cc99116d376 SHA512 7fcd5ff43d0f70d110f62c197f5e8f4ed6bf3192c457402c0d4bfdda66f32ba5144008d07e87d1661289ffaf1f2b637f7467dc1a50b65cf6606c17caf283b96a
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
index df26df207def..e3130158a0dd 100644
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
+++ b/dev-python/google-reauth-python/google-reauth-python-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
index 29983a01a29c..195d9324db61 100644
--- a/dev-python/graphql-core/Manifest
+++ b/dev-python/graphql-core/Manifest
@@ -1,3 +1,3 @@
 DIST graphql-core-2.0.0.tar.gz 156989 BLAKE2B 8ff0d64322966dd5fadfeff586a73db770f02337f899c7326ea6e584c093ecc237624f116d31983960ed4683dd53b6813ad99ab1173857e828de98f35eaf1f74 SHA512 caaf1a32550a671048224f37f75ed2a374290d763f9594a5f0bcd102b54f4cbc491005bae102d648c6dfaa052b5bd06f939f8638d6c895d5c133710dc2b0ce67
-EBUILD graphql-core-2.0.0.ebuild 901 BLAKE2B ba6b78e4cf9cd482b8046cffcb68c7c1d9880f60da33a01344873c07ca51ce8e84028a265e72274551739bb2a0610b9259051dfe9f71f3b9bc99e04877e199f2 SHA512 a40cbf14a2262b826549e826b2b8dc61f540c0a5b4d7e1dd7fa1d88b8395f66c19921c13a80e343e4a967464413abd8daf02be94f9a3eed6aea098fa0408250b
+EBUILD graphql-core-2.0.0.ebuild 891 BLAKE2B 3afb50790dfb618679ab372ad59b7ca8b2932615c6b6fd2b5e46a94dd17b6988b9d38141983147a5ce7163282049b676001557e1dbcd545162bc503ded338717 SHA512 d29a222f465855d8ac330b4577e6b1b565618c92f382342a4ef904d94a92bafb4d5a0e3f47b85cfeb6bc04cedb53f231705ea2c8fcac7a7e8454e8de47aff272
 MISC metadata.xml 337 BLAKE2B ef6b015336e3997873eced370a205310ba3b98a9607c7f22497f3348a96dd3c2c0e404ef09ccf0106eafebc69012efc5d64a2384ca0c4fc42702c42d3947d313 SHA512 93e093015e1cf58ae9f19c625eee6f89186a91b35eae980edd70e6742c80f08e5f1c7ba9f8cd5f282ec88f13655e4baf7506e8bb990ee12cd0750bfec01ff0f1
diff --git a/dev-python/graphql-core/graphql-core-2.0.0.ebuild b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
index c36c0cd5606a..5cb4a2d3cf14 100644
--- a/dev-python/graphql-core/graphql-core-2.0.0.ebuild
+++ b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 45b253c09c4b..2f6ef602b7b2 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,7 +1,7 @@
 DIST graphviz-0.10.1.zip 167590 BLAKE2B 4ca344cffe042bd16de56c15ae8056805e7ea82c88b0a9b535cc42d77038d1b54f1f4102630df3b3961e2edf7ab36e2cab75aea6a73a98c603609e0df82ab1fd SHA512 49366190fd3bd703c3d85a9220a63e5a667dc35a41037a54167f3ba96098945b2331294ece4ab260d7006b260cfdd0558b007768fb5f51aededf0b2c0d302eff
 DIST graphviz-0.13.zip 181039 BLAKE2B 6484706c706941891500350c933cad537e63b8f6bd602c46d493ac211842bd9762ff25d7b97c8eda9b8f345e20712971e79afbc099087a8db2fcb3e734591b71 SHA512 3401aeebd6b19f487998aeb4cffcf9598ed31a861b6d335fc76295474512068692371b061a83fb001098010813c0ab61a06c3f2c410c9c9d108000a6b2ab6631
 DIST graphviz-0.7.1.zip 100779 BLAKE2B b981953160f1978fe62b6c2cf422fcde78cc4de80a5274fd6e59c15f8907b34c68b0413d2c538d507d43bd8761349cd7fe532744d2e5ad737f403e52e1fca7b2 SHA512 e8ba326060ff3039f74902c01cf3d96c9965ce2259d0d5a9594e399added05c7e25b0f6c4b0be9ab21c1d37bbfb69e9c4856a7bb457b545185d48838d34cac70
-EBUILD graphviz-0.10.1.ebuild 766 BLAKE2B 643c0dc2f1eaf18be5c571d056879091d98c26d88da8b31f36e3fecd5e38440469f5f0879a8f6e9e7915ccf49a8d8a9ca4a3c8419a9b7d5ae19d1d923745d3d5 SHA512 cf9add4791719e2b9225e428a2d4fb6feba57251002dccc51b2366f8c6583c41fd6acc302e9ad56fc97fb68e91d14c94a31f20c9b5fbe0e3fae0c03e77813cd6
-EBUILD graphviz-0.13.ebuild 779 BLAKE2B 6568d5dd2653360b0af507a706158e072d4b61e763a9a1421431be4e6f27a9a37efc2e566bfe1c68a1aaea2d9258139afefd242b76b2cb66f67e28e94d6721a6 SHA512 ddbe25bc9395bf2606b7d5f7d07eda379104c8f46c0c89f871801e424c95be63f194ab48856ba975a22bc71cb5a2d74a8103adc8947165dcc9ecc41bd00a2442
-EBUILD graphviz-0.7.1.ebuild 674 BLAKE2B 462beed8f06ff1c29bb64778b8b45e8161ad4822cba0562f134d57ca17a79651020e22ee1c5b94d11163b2d02d020df488c7500704e599fc5e17b29f98965a44 SHA512 8056d64f16211830a7bb2240daf34efeac8c4688e5562d362fb0431a2f597da4b8803219e29c6c4428eee3a2b04941c321bd33c3a386bb45afb18d8d7823f5f1
+EBUILD graphviz-0.10.1.ebuild 756 BLAKE2B 174a85e6edf01da3f1dee8dbcb138ab5d3c01ff07ff5d9b402f9a9c77e5b951ef829bb3cf5cf00730f51c4fa61f9f61ea8a8fff79fc13e56e6fae51269d71e1f SHA512 35533cee9b8f610ab9a15822fdcd88c1be871cb2fac4178c087de81c90f63f83d0017eceeceb62fd4e106e6210ec4ca1aecfbd5c9361c65ce0aac108aa76e553
+EBUILD graphviz-0.13.ebuild 769 BLAKE2B 333f0f358f91c9d9f5b65ef72cb0e587c6cd2d2c7704393dd8f1de878b34b8e062d46ce4728b2383ea9203c7ab6a2ffac899348907e13d31fcc6b5b100720f49 SHA512 3418a363e67ec55cac9ef7e9316e619903d637b181d08922f1062c93c9f7d3ba9b235e17b73360201f46ee55c99c4789e7ac45165ae32dd1ac568d7ef489433d
+EBUILD graphviz-0.7.1.ebuild 664 BLAKE2B d47bdd270f094443126ecda645fc81e8d0ab8389bf5a790407531a3cb13073b93cdae01c3765badff7a35c84197366da5930cf75861f5efcb965c023be985bcf SHA512 f7f2e07dfcd249b24865fbd49e407880732c07a87ae6c7dd319afeb0dbd6e36dc647d10d410fc30b262d169282b2d8d775ab286dd41e536b0d745de5645ed322
 MISC metadata.xml 527 BLAKE2B b9c6fc9921bfbde8dcde78435394cb97b88d65cd6691bffe94d03f5b22127753333a93496b206d7efa7aef31ffce26d7dd212e3f244f9d111bfc006baf4fff42 SHA512 ee156200f5de25536c3de4de57d0cdc0e01fcbf5b3ef8cd0baf15f7aeea29ce178e393c2ff3f409a93ad3dacd099664b9e72c43c259231b59668f08504c21c82
diff --git a/dev-python/graphviz/graphviz-0.10.1.ebuild b/dev-python/graphviz/graphviz-0.10.1.ebuild
index 7c78f24cce27..569b07a017af 100644
--- a/dev-python/graphviz/graphviz-0.10.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/graphviz-0.13.ebuild b/dev-python/graphviz/graphviz-0.13.ebuild
index 5760f7d75dfd..cc3d6f3144e7 100644
--- a/dev-python/graphviz/graphviz-0.13.ebuild
+++ b/dev-python/graphviz/graphviz-0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/graphviz/graphviz-0.7.1.ebuild b/dev-python/graphviz/graphviz-0.7.1.ebuild
index a54f1dd57c5b..b3c4f4089393 100644
--- a/dev-python/graphviz/graphviz-0.7.1.ebuild
+++ b/dev-python/graphviz/graphviz-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index b3f04de04426..dd6c69968836 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -8,14 +8,14 @@ DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2
 DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
 DIST grpcio-tools-1.24.3.tar.gz 1984292 BLAKE2B f9ec935f0ea8af31ac5f60909551efc403241917879fb456ea88ac3fc58cd068f0263726819f0e6500d6ca11ae38cd1799db6af4d4f822002d92fe7a16d01060 SHA512 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab
 DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
-EBUILD grpcio-tools-1.16.1.ebuild 674 BLAKE2B c92416cbbded800b3a426ee3eceaea27e99d82bee0e4224e6054e7df24cd6bf9393807f26eb74a1a6627d9a0c5c60b645f4224fceb48f1d9cd9fbdde46982686 SHA512 b892d2f2c9212d9caa2f04a2220d08babfdd01d9a7051eafa4cd57501afba4d047c6ed16ceacc3c96f99a5310c61d548f27a8e6408a7a050cd701d712717b941
-EBUILD grpcio-tools-1.17.1.ebuild 753 BLAKE2B 0b586314ae3aea59b721d1a85a87d32669bbeaad13f32b77539f764ebfa1ee53b8afcfb3c165ab5a46205358387f855379303b62f10a707bc01e9b07ae2c9e3e SHA512 e729f26b58856452a31c13929ca64cbf6da8b526482517d08ad14bf6a75396fb905216018f7f91c6c4b519f14a86582a207d907d478a759e89d21ad3c76f5855
-EBUILD grpcio-tools-1.18.0.ebuild 753 BLAKE2B 0b586314ae3aea59b721d1a85a87d32669bbeaad13f32b77539f764ebfa1ee53b8afcfb3c165ab5a46205358387f855379303b62f10a707bc01e9b07ae2c9e3e SHA512 e729f26b58856452a31c13929ca64cbf6da8b526482517d08ad14bf6a75396fb905216018f7f91c6c4b519f14a86582a207d907d478a759e89d21ad3c76f5855
-EBUILD grpcio-tools-1.19.0.ebuild 757 BLAKE2B b0e3df112d5084cecb91dd6abbe96a32dfa62edc21df0e9c3e83a83d8fa487a769418bc5de5b89ee7282788287b3cc0de04935aa64053aff30b490bbd3029057 SHA512 3c1f3041ba038d19e149bdc24f7f61f00af3b117b2bf21b8e88fb78a84ff738cb6d86fae8da1e3aff7a5932dbcdf99ef17775f057074cae11bb4ef606c61db93
-EBUILD grpcio-tools-1.20.1.ebuild 741 BLAKE2B 61959ffef1fc1d2aaffa5727048c5f3c27a5b3c966249f6a8c40fa6ed7d0fd97dc4764c477185d981b6823f29af8d0ae0bae17d510b71061d8fbe2edf2c111f4 SHA512 4cf1fa6a8e5a918a13cf4163819f65916f05b0efe3048a2a1dbd1c948c39ce523502874be2afdc42e26422ca237ea2f0f0a09a699953c5166335147430e11cda
-EBUILD grpcio-tools-1.21.1.ebuild 741 BLAKE2B 61959ffef1fc1d2aaffa5727048c5f3c27a5b3c966249f6a8c40fa6ed7d0fd97dc4764c477185d981b6823f29af8d0ae0bae17d510b71061d8fbe2edf2c111f4 SHA512 4cf1fa6a8e5a918a13cf4163819f65916f05b0efe3048a2a1dbd1c948c39ce523502874be2afdc42e26422ca237ea2f0f0a09a699953c5166335147430e11cda
-EBUILD grpcio-tools-1.22.1.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
-EBUILD grpcio-tools-1.23.0.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
-EBUILD grpcio-tools-1.24.3.ebuild 748 BLAKE2B 52cab7dc71c1e99f560f8c4c69125889bda51eb193009631f7d38613991eeaf593e2f89256d17c257d7a5063256f5af036121611397f535cba3e82ae16fdc7e5 SHA512 d8c41f2c638d1c69f96a74d19c936c98adf8d97e2191f0933db22366fa2a717c04f62a7a41a973755bdce52ef745873be61ae5c9b40f8a9e1cfdf4db04f8bb24
-EBUILD grpcio-tools-1.26.0.ebuild 719 BLAKE2B ff6836309bb28f04991fba285ca56e252184216a6ac89f90d33e010c9359528c61e37c77070de17c9fea5ad74e8f65bb330a54558ff2e6f5e2c0460dd53486c7 SHA512 06dfaf049de150848a20a387a945cdad1481a2995c3027d4b4603b6717761b435d7b03004fa29c38eb97258d77ecf3cee7b545ba1f1313f41df52b56a72b42b2
+EBUILD grpcio-tools-1.16.1.ebuild 664 BLAKE2B f5b4aaaadbdb4552eb3d7187da8e974d7a15c8b3cc7f8b280430195127f0214c504ff3f184ed8f6a5fdabf7d547346b5bf466cb487e0df6a50789437896ac17c SHA512 bed8aba68be13507ecd865a779b6955545ff4a52a5bba402f946a3da190a10de7b85452a5063679854117f021f9b6dd399591baaef55513947e6dd4835fb758c
+EBUILD grpcio-tools-1.17.1.ebuild 743 BLAKE2B 5f9b48b71bb427fcdc1660fffdc16247464283f13791d5928170cf515bdf4c46b44f8ed9d53fc511426f59c54ea5c0c522d04d1cc79a2d1864f0136e82eb14bd SHA512 8f7499dc819b17a2b6e7644e7310278e656a754bfd02a8ffaec5ef0d79b9741a36d5c9bea711835289169515e16ba6e58ee2a012e7913a6f3996a697efaa9984
+EBUILD grpcio-tools-1.18.0.ebuild 743 BLAKE2B 5f9b48b71bb427fcdc1660fffdc16247464283f13791d5928170cf515bdf4c46b44f8ed9d53fc511426f59c54ea5c0c522d04d1cc79a2d1864f0136e82eb14bd SHA512 8f7499dc819b17a2b6e7644e7310278e656a754bfd02a8ffaec5ef0d79b9741a36d5c9bea711835289169515e16ba6e58ee2a012e7913a6f3996a697efaa9984
+EBUILD grpcio-tools-1.19.0.ebuild 747 BLAKE2B bd7c47afb93a48ebc9d0a3d5ea0ccb0f4ad14311381a508b4a8d4fa7f9d60627d6629a29cb4db7ecd5111369f5bfa3b26f2cfe02656a4c9bfd11a7a00a0f3565 SHA512 e01c423da976fb56f0bbf8ac116c9ae17f4b7c63db3c7aa1ce2b3bc64da741311483811c568d4a47f1beb20c45089f05e6aad874332ac2e78c6285263dcc6c03
+EBUILD grpcio-tools-1.20.1.ebuild 731 BLAKE2B 6d9ad4280e1007ddbfb6e9e7ba2d8e7701b5ce2d512b93fb91c7255b9ca051e0190e7cede223e0b9a1d83b9a93c53fbf5424a527b2dbb9b28be1beba456e25a9 SHA512 0ec399710f37dd74ff786c92c6733aee50b9af78572ffa0465c7b417f4d410565f83aeaff3eb2a0295915f0c4f4015e94d40853874c715195c0922e8c3a496a0
+EBUILD grpcio-tools-1.21.1.ebuild 731 BLAKE2B 6d9ad4280e1007ddbfb6e9e7ba2d8e7701b5ce2d512b93fb91c7255b9ca051e0190e7cede223e0b9a1d83b9a93c53fbf5424a527b2dbb9b28be1beba456e25a9 SHA512 0ec399710f37dd74ff786c92c6733aee50b9af78572ffa0465c7b417f4d410565f83aeaff3eb2a0295915f0c4f4015e94d40853874c715195c0922e8c3a496a0
+EBUILD grpcio-tools-1.22.1.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
+EBUILD grpcio-tools-1.23.0.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
+EBUILD grpcio-tools-1.24.3.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
+EBUILD grpcio-tools-1.26.0.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
index c6794ff39729..e91e65eac30e 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
index f51fd367c529..045bea887550 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
index f51fd367c529..045bea887550 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
index a70e95e02637..3627353b6a86 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
index 5dba4c0666ea..83f7c06e49e6 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
index 5dba4c0666ea..83f7c06e49e6 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
index 6ee574d98442..97d026b22dd4 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
index 6ee574d98442..97d026b22dd4 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
index 6ee574d98442..97d026b22dd4 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.24.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild
index aabe7f2b43ce..5f5084a83cac 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.26.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Protobuf code generator for gRPC"
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 4b327f0cd867..75db13f86d6e 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -10,14 +10,14 @@ DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4
 DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
 DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
-EBUILD grpcio-1.16.1.ebuild 917 BLAKE2B e49bd79bee74d9ab000268a8141e281f6c424e07950d986ac1840dc1fee14a12cbc607e0706faccd5effa15878b2d046dc0050265486d2497d399f7b513a02e1 SHA512 9ee995095da345d92874acb40dd7b64b68e508013296d25d3c8bde98bffbb4e9e59273762974ae7b293192f94bff3f7350f407b8adaadcf85d6a7be068e3175b
-EBUILD grpcio-1.17.1.ebuild 1045 BLAKE2B b7988458aa5d2e7ea98f2df305da1a5ccecd7a409b7ec9a167b9712a14311d7a6a996e9ce3faf168df21f95f8ed00b69711141cc42e5ab8c010c65fa5cd8d9cc SHA512 f17c047b9327e242cc571a01a419e0d18e4149be98d4f33c82269b4afcbcf13c51c2d9ea3f505a864a21a48206fdb0c863d8225cf8be67c3b8ae6b18642c520c
-EBUILD grpcio-1.18.0.ebuild 1045 BLAKE2B b7988458aa5d2e7ea98f2df305da1a5ccecd7a409b7ec9a167b9712a14311d7a6a996e9ce3faf168df21f95f8ed00b69711141cc42e5ab8c010c65fa5cd8d9cc SHA512 f17c047b9327e242cc571a01a419e0d18e4149be98d4f33c82269b4afcbcf13c51c2d9ea3f505a864a21a48206fdb0c863d8225cf8be67c3b8ae6b18642c520c
-EBUILD grpcio-1.19.0.ebuild 1095 BLAKE2B 6a18ffd2597ce22aab59f8a3ffbe05b5861767d14561dde953218980ba365e6c0245ce2c45a67f8324e962b0526d6b31473f066c457f2c3dda1cb21d47a6a90e SHA512 8e2601f847cdb7785b2d5a9accc058a876fa9834174b98e92d7ba36455987a71943baec6c35fd74b00af43d07dff63c570d535c22e69a4c544e44e7469c030b9
-EBUILD grpcio-1.20.1.ebuild 1088 BLAKE2B a1f943f6d5dec36bb1239e259624fd0335a7ee488294f2f666b5319d38342f4ab2e9e53a3a489e7bb334f7d6fd2df2abde115ad7dcca270946253884842a4971 SHA512 730e3bb58cba42dd629fdbdbfbf0c52eecbfd06496c3363adbfd6805032bd6241b6d1187977eba519efec55baf3597b90d4c5a4e98da56d965ace952cfa6bbf6
-EBUILD grpcio-1.21.1.ebuild 1088 BLAKE2B a1f943f6d5dec36bb1239e259624fd0335a7ee488294f2f666b5319d38342f4ab2e9e53a3a489e7bb334f7d6fd2df2abde115ad7dcca270946253884842a4971 SHA512 730e3bb58cba42dd629fdbdbfbf0c52eecbfd06496c3363adbfd6805032bd6241b6d1187977eba519efec55baf3597b90d4c5a4e98da56d965ace952cfa6bbf6
-EBUILD grpcio-1.22.1.ebuild 1158 BLAKE2B a4c697bb7ce0f65904fdb3d2171aa8f2989939203a1c8893f31a67f3670899998d08bf24bcd7f9f1761fe8506b5f3d175ddd3f4870940189b65a62ccb7ec1de4 SHA512 ae2469b3a517c4e58862f947c21025696daa5d69e0eb7962dcfdff38ca06f0a9ac1e152afef9b59ad2eb89dfe2a0f43dd9cc1211949e9d732b68a3057e8824e5
-EBUILD grpcio-1.23.0.ebuild 1158 BLAKE2B a4c697bb7ce0f65904fdb3d2171aa8f2989939203a1c8893f31a67f3670899998d08bf24bcd7f9f1761fe8506b5f3d175ddd3f4870940189b65a62ccb7ec1de4 SHA512 ae2469b3a517c4e58862f947c21025696daa5d69e0eb7962dcfdff38ca06f0a9ac1e152afef9b59ad2eb89dfe2a0f43dd9cc1211949e9d732b68a3057e8824e5
-EBUILD grpcio-1.24.3.ebuild 1095 BLAKE2B 7b257ac71d358dbca74dc997715d3e944e55fd5318a668c1b560ea76a1d71a8cad59b8d63a5244b52363a531b1136a06731a72029f5838b8adbbec57cc79e27e SHA512 7c0ccaa5f955e8a08cedb844f687eee2044fefaa08bf6cfd0a1f1e167d4c601d9f37d1063cacad9d26b61c790d4182a7216333711d0a4729807303aa531efe7c
-EBUILD grpcio-1.26.0-r1.ebuild 1158 BLAKE2B 76b4702adb6655b7379d3515ab662673bf26a44930f34a939bf7f1cf05ac34f3fdd3ce332231b8a8ca9cdd2abe049f5993f56fc837ee1a7719c39affa07789eb SHA512 252da5df9eabf8073a017443916f33205321d915f9c7d933d5cc27af9e6ccf40e7181ee2dc8848f8c5c29558deacb8f3b207ad8a51f952ddc54152ffceff988a
+EBUILD grpcio-1.16.1.ebuild 907 BLAKE2B 469e074179caf62c01ced7a3a5b87cfdfe8fa45278b570da7b44076c0f1a8bb8b703d42887969c5490945d9df53305cd87932bc93e4dc58176a594e6d02baefa SHA512 befadb3b0cc48b7274a11fb541a692f1242c07f144d91f886785a47ef0c825285f5d122ff7f22b3c571ac0ea8ff1e333100b79a0646f7bd1c1633149a2521849
+EBUILD grpcio-1.17.1.ebuild 1035 BLAKE2B 2ffc3de9b252c02d6e2aed183e7142852036ee6757717f2219806f782cb5d2e9125aced970d67e1897b7b091c2a455f545fd2f0b2f124ff36825d56bd1a7c699 SHA512 acf1554c4d3779fffb40f618a188ce3827a64b4e000bccd60a983f969995036e59781ce154d7e85c97a5f078f670f9c172edd6216e5abe2fd0aef301f9012d73
+EBUILD grpcio-1.18.0.ebuild 1035 BLAKE2B 2ffc3de9b252c02d6e2aed183e7142852036ee6757717f2219806f782cb5d2e9125aced970d67e1897b7b091c2a455f545fd2f0b2f124ff36825d56bd1a7c699 SHA512 acf1554c4d3779fffb40f618a188ce3827a64b4e000bccd60a983f969995036e59781ce154d7e85c97a5f078f670f9c172edd6216e5abe2fd0aef301f9012d73
+EBUILD grpcio-1.19.0.ebuild 1085 BLAKE2B e9dbfd3977972d2b30ba249088a0305ecf7efb56b54bc039ec0c9867d94fcd5ab688ad20773399c7b294d2496ce380f3bbed83c06db4a42942b617a6843b2f18 SHA512 e7e332432c315312837681d16543742e53852ceb0b1bf3924b4993749e60afe71f5b733be944bcbba2cc14d4170820f34daa3a151bdbad1dcc34a7e7a4b3046d
+EBUILD grpcio-1.20.1.ebuild 1078 BLAKE2B 9e362d2e54f3c0d36cbade04242018e8166f0caa30f9344836d8e7254e01aa4f9c640183d6a76f6fc2674edcb9e31236b83a1896b812d2885ba9bb2321d52db3 SHA512 cb15f4d4e0fc66c1486cb1a005e8edac6a1a63402100d7e8dda11fedf3ea4e40d295bccf820711a618f4097283c202fc66fcff86a3849133a2433ef1a136c252
+EBUILD grpcio-1.21.1.ebuild 1078 BLAKE2B 9e362d2e54f3c0d36cbade04242018e8166f0caa30f9344836d8e7254e01aa4f9c640183d6a76f6fc2674edcb9e31236b83a1896b812d2885ba9bb2321d52db3 SHA512 cb15f4d4e0fc66c1486cb1a005e8edac6a1a63402100d7e8dda11fedf3ea4e40d295bccf820711a618f4097283c202fc66fcff86a3849133a2433ef1a136c252
+EBUILD grpcio-1.22.1.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
+EBUILD grpcio-1.23.0.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
+EBUILD grpcio-1.24.3.ebuild 1085 BLAKE2B 317e3df67c4d6472991aa3dc1521f0ed93b57f086debd2b60cee6f5a26c32e83fab89cc296cfeb5de186b0f0773d3b79da2d5e27a16c31f73efc202ad727bb2f SHA512 eb6e8f515098f8c8164fb1ac92ab8072d8e7c2bdfe58c25bfc999839c9ae3255aabac5b994f03d794303289be1a6b1f677702af38049841cf326ca0d37e5c906
+EBUILD grpcio-1.26.0-r1.ebuild 1148 BLAKE2B b250cdac59077308cad1df4c84b8c4a62725b77580727a68ded4b85428fee0925f1497563e5dbd7990895421c286fd5b7c5c3b6f998a84c842490f9e785304c2 SHA512 1ab5a00941b5c681691376e86e7ab120816e917747478e953a6aded66510026bbd0bc0909a7438b852c4eb700d48213d79f85cc0ce2521dc9af95acf894ef89e
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.16.1.ebuild b/dev-python/grpcio/grpcio-1.16.1.ebuild
index e8077ccb0f3b..c35a7691c6aa 100644
--- a/dev-python/grpcio/grpcio-1.16.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.17.1.ebuild b/dev-python/grpcio/grpcio-1.17.1.ebuild
index 6466855a8e69..7f13d32d88eb 100644
--- a/dev-python/grpcio/grpcio-1.17.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.17.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.18.0.ebuild b/dev-python/grpcio/grpcio-1.18.0.ebuild
index 6466855a8e69..7f13d32d88eb 100644
--- a/dev-python/grpcio/grpcio-1.18.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.19.0.ebuild b/dev-python/grpcio/grpcio-1.19.0.ebuild
index 2cbafa2f243c..637a144e4f44 100644
--- a/dev-python/grpcio/grpcio-1.19.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.20.1.ebuild b/dev-python/grpcio/grpcio-1.20.1.ebuild
index 292b0e89dc77..157964b30b6b 100644
--- a/dev-python/grpcio/grpcio-1.20.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.21.1.ebuild b/dev-python/grpcio/grpcio-1.21.1.ebuild
index 292b0e89dc77..157964b30b6b 100644
--- a/dev-python/grpcio/grpcio-1.21.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.21.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.22.1.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
index ca59b7bff1fd..98cf06542c02 100644
--- a/dev-python/grpcio/grpcio-1.22.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
index ca59b7bff1fd..98cf06542c02 100644
--- a/dev-python/grpcio/grpcio-1.23.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.24.3.ebuild b/dev-python/grpcio/grpcio-1.24.3.ebuild
index 4fdd980f433c..28da17b0cccb 100644
--- a/dev-python/grpcio/grpcio-1.24.3.ebuild
+++ b/dev-python/grpcio/grpcio-1.24.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/grpcio/grpcio-1.26.0-r1.ebuild b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
index 060f3291867d..376c1dc49ae3 100644
--- a/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index d31db2ee2c96..7d036357a922 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,3 @@
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
-EBUILD gst-python-1.14.1-r1.ebuild 1745 BLAKE2B 56b2a52e1ae418b7c823c0b4e451a112dfce52bfe07ead6ac77139dcb3b59407ea635d7730a74c7ddbe29513e461addb1084aaadb9d30f6c839d5787e52b90d3 SHA512 695217b951b41f866f0fb1d0d34e2c66b18479819e0cb24b4382a24982a58089e0b26a335cb409e76be8cc9a6898694245471de2f87f97e4c2095b28cb022e85
+EBUILD gst-python-1.14.1-r1.ebuild 1746 BLAKE2B 9b0ebf0f8aa4e663b40ca0f07dcbddd38707d21e378537c57815b203d67d6177d8412eede343fa4db45f055591182ee19d3446494b2c8ea6a41d33e71280fa65 SHA512 f09ac9d7a4881ef0a1db6a6ecef33efbe1105ebd53b7525ea999463223c7929e55d88b3faad968fa0e822064bce64c5842b4b3df341e8e969f1cf14121fe2cca
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index 19e446a45e64..ffab43d9f86c 100644
--- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/gtkspell-python/Manifest b/dev-python/gtkspell-python/Manifest
index 53345441405d..ba7ecd75a023 100644
--- a/dev-python/gtkspell-python/Manifest
+++ b/dev-python/gtkspell-python/Manifest
@@ -1,4 +1,4 @@
 AUX gtkspell-python-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gtkspell-python-2.25.3-r1.ebuild 888 BLAKE2B 003c5d98ca668736b8211c78d940c0312bf287783844be20e35387fcd8038eab9c0123892f1d7b537a4c86ffb6d7fe85e9033d7eac57fde64d7c2d673fe690e5 SHA512 b58e67daa4dd2a2e8c162a08e6182c7771e4aafd197defb1d664bb47e65e9618f5ee1e34df5c6c62917c87e775bb9b0c5781b16e6ea338535960427382685a9a
+EBUILD gtkspell-python-2.25.3-r1.ebuild 889 BLAKE2B acd642a9d93f6102b5cfbcd4102cda595d43ae469e4d1fbe48cb657b880ef41f4d28e47e469e762571e0144f85ea2a93dd3e663ff962f3989fe0cb75e2e826a1 SHA512 0075b7005ef03820d090ccbf3fa389d5a1fb886c6785bb9590c5426bc40ecb27e0f406c567e0fd0d94a95c397bcc3a4c6dc99d0c00f8dbe9ece2d89cbbab55da
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
index 7b984b6cb294..1ca4939cde75 100644
--- a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
+++ b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="GtkSpell bindings for Python"
 # an ebuild, currently. Punt till we actually have to face the issue.
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="app-text/gtkspell:2"
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 8d82d1ce2a3d..304fd401903e 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,4 +1,4 @@
 DIST guessit-3.0.0.tar.gz 133379 BLAKE2B c9d7c2def91dc301944b951bfa32810b9efd2348fa9a016015dd75c03b407bf3e17cc5cb93baa1d4cc5b6fcb76790972f2bf7c14af2c0cad419f6a98bdda3d6c SHA512 87f19dc1c6b4f46fa1f2682f7c3bab91cf094df06904b8d9771159f346612b9d0adef4aef55315dd00d07787319d17008e936b125941abba5b869df6a91cb1c6
-EBUILD guessit-3.0.0.ebuild 1228 BLAKE2B e78b2d04addf2ca0db959a99129f3671764938cdcc3187ea18949cfb267eaea3c69db280f54d3fd239d47d226d3d370cd98b419e8363095d171f63804dafb84f SHA512 8a6681d1bde4e686ac66c3b42299fe0aa35a69cf75cc8e8f70d5287f49e83d8890236e8022d7ad9bf95dc5dd3a9c42cb5b67ce75e4959a5a712e793dcd603ef0
-EBUILD guessit-9999.ebuild 1254 BLAKE2B 8bef5a097059e539f7931ff747f84b041a5cc07057aa52cc158520892e14f2364cd5f638bc45f9aa465b3d4ba295f689461b8821a1766d3b5dee6a1e60a0ab8b SHA512 f7a27c4264c49a61b3d127bccd57a8f19199b5bde5dc9fb06a160737b35640eb480ca213af00f375923c71e6ce54fc503bb2fcde957074f84bec11aa2ff5c5e3
+EBUILD guessit-3.0.0.ebuild 1222 BLAKE2B da5313a1a5416f0813cb6a514803f84828420232e5fa449faa45e9bd39a6c217ddfdb14088f6bd427a3b7363b668def90fbf5786e5c42b71ff44dbd331ad1b8c SHA512 d86cd91b5c0fbc0c8580750ff883227a198f9e0b73c7d61d450a8ada4af24f758a40eb3c0b39708e1a9111aeb7d1c96b8da358a1d2f7f0c47e9916b096b8a57f
+EBUILD guessit-9999.ebuild 1248 BLAKE2B da22edba32d9955b57e5ccaf022d1d7d809bc046ef8b046fdf35c1f8d99fed11f959970c80bbf68882fee6445e406bee0fc08e1b0be1dae278c5db2034fb6fa2 SHA512 00f1ef7d1d733724b02c1dacaa0c8393cec118208fb1063bb1c1af6a3bb9197647cbb4a057561af322bcd5927384b0af771ab5787988165c5c040a95b1f5089b
 MISC metadata.xml 295 BLAKE2B 446d2e040963e8316736bb91746ebaeac79cce3bf604cfeebb022dfa74fecdcca9649b824f15231a721267a0f7e6c37f373cbe9324d89a5697fea21f18761b2a SHA512 7990fc5949ac120c94d34714036f6b272bc4341c65f14f7a21cdbdcbbae210af60b3afe0a8bc56078410ff3e5b37c641f77a0a727794b90e35da91f80c9db2e9
diff --git a/dev-python/guessit/guessit-3.0.0.ebuild b/dev-python/guessit/guessit-3.0.0.ebuild
index 5d72beeaa2f7..a8d2b6d0ebee 100644
--- a/dev-python/guessit/guessit-3.0.0.ebuild
+++ b/dev-python/guessit/guessit-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index f574cfa5d6d4..81cc05628768 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 776f73915fb3..869b270ce366 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,6 +1,6 @@
 DIST guzzle_sphinx_theme-0.7.10.tar.gz 225764 BLAKE2B 37abd8b864b3c976498848f339f4761f22d8acfa7d8702e0948e61739bf6805331822c066529f6eb21d55484ddb7f16fd82dae740b1d152e398a74b222374213 SHA512 a21867e93ffc80e91b85a0fc33cedb21ba9e1d2912b6d5d6226e5ec93550564a1a9321eae09aaaddb61f36ce051017c33b750c52d609cd604a5cc4bf8ce5248f
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.10.ebuild 472 BLAKE2B 2899ba5252584e1f805b9b509507bb3edb6b26dab24de7f4d6e6324cd655f1271b63ebda741286f76f28305aec10daa69546433a751c21ebb3f11621c3ed43e9 SHA512 07dbebf23f17063a4336aef05bd95578d2d8e43b5573a9a187b570a3fbbdcb1834565425140e5f9b5080be27bad40333aa1f9adbd3c568812688d67ed3ebd526
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 514 BLAKE2B 55af3f47f0fd76418c261b386e24b2ba235ade7d0b1c262f53f757c93a815bfc24da83b24fe144b0cae3899a3e27c21706782348cd29eea532b6076aee88598a SHA512 9a704a51aeb1fae20f9204d7d148878f501571d7efacbdeab351d88a5953cc290343580f3c864a913133e01b304424ff6cda4c1f273192f3083f83c6cefb0830
-EBUILD guzzle_sphinx_theme-0.7.11.ebuild 506 BLAKE2B 941e353b7f93bbd2795de44309e0c9b2510fe2ce0b3708564f72f204ee1dce06117a7345edde3460cdf174ad9a4d854dcec7aae66f710dfddac0807599208683 SHA512 3e4d04d11770b830817a38ee29a12623abb1b877ff6838ce958d2dc5b2c7a9e714fb62db78e46b7cf76b4780619531ffec19bb4b47fa88edf5c4f5adf9b671e2
+EBUILD guzzle_sphinx_theme-0.7.10.ebuild 466 BLAKE2B bdef9988ddc510c179e61f6a79094e5effc0a54b97d692c1285af1c1a6ae7f3ec76d7cf9ee73304b1b00c47c08c28dc7dc919334f3fa49728cf8e353afb53acc SHA512 c22fca99dd099059f147340c80dc9fa89ba0255e13a52f215b8feb118974a047f18e5ca29891eee3e26af7cd33471b48d457ecc639c3ea8ec86684df62191fa0
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 510 BLAKE2B 4275d2f45c9679f194f7216042ccf72cf0be85315d180dc0298cff2912f27e0af99ada7aa60e9eb2948f2ef6aa350c9860e7f08d7497554270b11828f0f25b13 SHA512 d56bdf20c0420017e599ab6c5643fe78fc01379d12aa60e27b27595163f95f3a88a5030c68778d4e7bd4b554252239bfd770373fe9e9521324b85e7dce036cff
+EBUILD guzzle_sphinx_theme-0.7.11.ebuild 500 BLAKE2B f5cc3c5bb9c744d6b659d289b3db4dddb5bd467a191f3d4c0bd59598570604dfef500f97840a65f6bca7dc56cdf9a2d73a36d36b6a374dbcb99080523d3fe4c8 SHA512 f4b844c32abdf7bd7578f1283cc0cb18593dcda1564a5e1d13c70a3c91ca1c718778ff0c276398f5c856d1464860587c3c25224be2de245b86f0bf9976ea63ca
 MISC metadata.xml 423 BLAKE2B af845fa73d257d2ead2fd41a6ffd50b1e0c29140c3484c7199ff041b9025e9e297a1cc849e136733e3271187fb44c09a36d9fb705fceb82b6771bc29deaef52f SHA512 fb05cc6b19cdf522010d886649146cb02ac259c53e54111dcbb0eb16109d8bd1832b80e2e763d57fa425b05cf232a8b36710c9cc0cc20e38bfa548bb51abaa3b
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
index a9e66eda0e54..376ef5757d1e 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 1fc38997e3aa..6304d0f12ae4 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
index b7e91a44a20a..4ac4810fea77 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 72c400c04993..16a5fd15256d 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,5 +1,5 @@
 DIST h11-0.7.0.zip 105979 BLAKE2B 46922a67a8496254845562e46432596cbc400e788adddc5df1b84583d16a090fbc1ac6a4dab1af9d05263abb33d2505627be1325ca9c3f6dd27dd3676ca99027 SHA512 abf9b8f7f12870804539049c3bfebbbe476e394636aed9967aa725d501fff983f28c7f14b4b882c17914d00fe3e74417ff8922128d0e4e07bf042a7db6d0b100
 DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
-EBUILD h11-0.7.0.ebuild 627 BLAKE2B b2b95412719a89e06159255fe74076acb079471a7bc7a53692b249645c2fec9e4295ebf21d57e20e0afc2c5ed3f0c1e490fb7767c1b3a062ab18814b58c3f66b SHA512 5a3fddee7083749ae927fddc32ae36a7e85c7c725a6587250140df3d95e847ad65d6da263d4f29c1b7c95f61750cb3ef5f92bd66a599c22f26667530ff0711ea
-EBUILD h11-0.8.1.ebuild 630 BLAKE2B bab00211956a727c4932bd3705902b31df559c965d16d671d412123a94b0a7eac73615db2552b260ed8f10342575b8adcfa900d44a536712620187a6e019085f SHA512 29c02a81347fc3fe740cb1feac4edbf05e2ebcd06896236ceed5cba2d35b78c39953f41b6c95758cf02fd7b82c34e68ad04fe9b542cfa103ed9105c9e1e5a98f
+EBUILD h11-0.7.0.ebuild 617 BLAKE2B 79083ee1e03657eec8a60b547e9653d2e3400a344a91513e4f73755e7e69bf218441ceb1d02687e1c6435117379d9c8cf35ee3b888dc7d91c240575192691ad0 SHA512 5734f23534002976c541ec19eba76b3c9ce20dbdb64edfd9ee6ed6f78d1e61edbbd454ecd07bec44f98d2227e51d0a94dd105585db71be530620c18a0f59fded
+EBUILD h11-0.8.1.ebuild 620 BLAKE2B 0a2e602241411755dd74eca548833f0287f9eed5aab223fcca68d0a79851ff8f6771d7041165423f8bab74b41d01698445e9debfd7cdb73264562f424193ba36 SHA512 a4bf5cb5a832b30001ffe99c336d09d1e5e0f65b4f899d2e894651a17bcec697be42d11cfdf8f4e8af4ef95ef2ada0f6dbff6e3f9272eb55b0bd50532d7dac38
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/h11/h11-0.7.0.ebuild b/dev-python/h11/h11-0.7.0.ebuild
index a1756f43f79c..d0336b317872 100644
--- a/dev-python/h11/h11-0.7.0.ebuild
+++ b/dev-python/h11/h11-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h11/h11-0.8.1.ebuild b/dev-python/h11/h11-0.8.1.ebuild
index a53ffeb33faf..5ecef28bce40 100644
--- a/dev-python/h11/h11-0.8.1.ebuild
+++ b/dev-python/h11/h11-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 63a43be3050e..456172ab31f6 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -4,7 +4,7 @@ DIST h5py-2.7.0.tar.gz 256471 BLAKE2B c232eb86d00b9d1bb76903ea04bfd384bae7c9eb7b
 DIST h5py-2.7.1.tar.gz 264225 BLAKE2B ffb0b52127f6cb9634b5ac3266a36bc0003144d302bdc300fff5f6f33e52b5a12e954cc2ef9fdfe9dfa0eddc810b30ee3f556cab2a31338500db666b87e64ddc SHA512 b702e3875c2767d2fabe66601820c517671fb5fc3321334aba081950b625435a1262554f39187cd1b41c6069e2b3826db6f0b610bfed2abe5db8a4dd8a29ecfd
 DIST h5py-2.9.0.tar.gz 287853 BLAKE2B f1e5c985ec1431dca2b14490711ec7f125620e67ee6cecb56306d19cc8fd1d1c33d313f6477e98c4dbb780cc50c3a4ca073cfe69e079187f8f52a301aab60467 SHA512 73b1f59e3e2b3eceebf7b97e49bd8f5199afafd7ef29917af05ff8415c2f2129a5c59db9658944370c9bcf8fc04ab26948ee27fc6fd948a22d19cace1ce8c853
 EBUILD h5py-2.10.0.ebuild 1446 BLAKE2B 39803d4a8c4a8d1b587ef1eb8316b6ee291d528005b31dbfe9bfe60db0398c58c1c2b5a52979b89acf826a7eaee657fc9a15a8faf2748308cc9a3bf8c55d17cd SHA512 d0702b750ff467c8c163d51866424e0098b6871632e2a804eaed2421ad785bb5ae019854b0d2fbf10f707ecb19b57f8829eeaf6d31f183d496b84d49c0b9737a
-EBUILD h5py-2.7.0.ebuild 1401 BLAKE2B e64c58b3c7abfe3c18944a15dd2eff74913b855065ba24212d4250a1323237fb6353a5ce3b52ac892eab55c5bc547cb59539e1328baff4e8445a5597747bff67 SHA512 8f2af16f0265f2b707a12b77a1511c38b5e147e2fe4126fb65f21cbe02c21c376b080722bb30657e44895533d69a5b09a1d6f07d79b89e1d876f5fd9282bf2dd
-EBUILD h5py-2.7.1.ebuild 1403 BLAKE2B 1818e5fd2e43c69b8ff73c882ec0d92b53d7e80a35c6274314044e6ff02da75cc275356eb84251b5b7fdbcff6f127253f78b43ffb29b0192f12d4d9246c7d42f SHA512 9a12317504cc737db630f39665fbf28526757480177c877274ec40117e319996f40030c9b8c7b06bc7df8e47a1f9a4ae29fa1f47d54634e6398e3f9e60ac8017
-EBUILD h5py-2.9.0.ebuild 1407 BLAKE2B 7b65937e2f1c33de06bb7522cb66cb099f12e7a845f6cbc255cf9418a10aa04455a01784c67b5996363e36cc688dff214b1636c39846787b9b3b92d6f6071668 SHA512 13a9b4f5e4600192768aa6937f22e331851cf4a86104357487a9eb894af21308e3834d9855cd1f9d3d4bd0d51ed2661ff2832857d90f883b5a16b892f4def3fd
+EBUILD h5py-2.7.0.ebuild 1391 BLAKE2B 40f2033d285ecca7028d143f77d3983acc5803cef31f7a3044cc16d0795271e10eabbee9bcd0296bf2dff9b93ada52b09d7ad20db4405adbcd4c4b7a5adba6a8 SHA512 62655c2437034edb45604f71080452367e4cc7f630e61e7b267d348f177738098f1fccc1190857e9af118fc6f5bc1ba233bb4b0c845e85f0ec486a603d079516
+EBUILD h5py-2.7.1.ebuild 1393 BLAKE2B d8e68d8d932b31426944a8e602c3bfb1f01c6e500be596b58bd7a057ffb21d96feede48abc63910a1de2c546a21968f7dc84038d0699cd83aac29f73e6fa9396 SHA512 62583885e80f806f7ce2bd20dc69198d0238948080066890e82b38658f94e6cb9e95a76f978cfbd80244bf098114b0611ecbd72408805c8027abba754bbd188c
+EBUILD h5py-2.9.0.ebuild 1397 BLAKE2B 26bb7887bfdeb2232e223105154619562858ccc846d2839d65678f6fea3a4503c5e87e71a2e668cff5e8292b71a170110e2ec548e3363aa6b6ede3c2933ce7da SHA512 457989f5a5592f05771087a5c35a4f55efe5ad95730a179212decc5c52aa1ded4fda509e6e56c73805349d2f03f1119a30dd39e5e654c907f772d6d652375708
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-2.7.0.ebuild b/dev-python/h5py/h5py-2.7.0.ebuild
index 5af042c901c7..93ecc9cf6908 100644
--- a/dev-python/h5py/h5py-2.7.0.ebuild
+++ b/dev-python/h5py/h5py-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/h5py/h5py-2.7.1.ebuild b/dev-python/h5py/h5py-2.7.1.ebuild
index 05ebd1a3899a..1cad22dbb1a2 100644
--- a/dev-python/h5py/h5py-2.7.1.ebuild
+++ b/dev-python/h5py/h5py-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/h5py/h5py-2.9.0.ebuild b/dev-python/h5py/h5py-2.9.0.ebuild
index e6f0255d4861..f8a8600ad6ed 100644
--- a/dev-python/h5py/h5py-2.9.0.ebuild
+++ b/dev-python/h5py/h5py-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index b05aa9ac640a..e9f20c030f2b 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,9 +1,3 @@
-DIST hacking-0.10.3.tar.gz 41119 BLAKE2B fe43b31f356c9469925bf43ff381c1e24d6976961140e2e3f0988d2c693db87de98b27b38ce456b4fc681bfbaff428882e7fc072cd4511935585d789850b85a4 SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417
-DIST hacking-0.9.2.tar.gz 43956 BLAKE2B f4bad9ca0ffaaaf05d9f0b8536ccc72c51de4547de8d38ea31f9bae1ebbb52362d75fc286075b13631362fa00e3a7081db6a128584067896bf4daf7b32f4bfeb SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41
-DIST hacking-0.9.6.tar.gz 43287 BLAKE2B e67090fe103849fd9cb4cd4ea36065d49500448cc291ffa2c36273095a2de4a704af2f3a926aef0ffe4aa4689ef7f810f317f0ed46e9c7143039ab776b04bfe5 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4
-DIST hacking-1.1.0.tar.gz 55620 BLAKE2B 6a6f30ef8a1eef3aa1b1b630dd43e1d2e9adff1623d8db19a545f186f60ce367e4b820582893e6444b7d58573b4a70a47a30cdc8d2ce1202666cf6e1b0e7456f SHA512 d326995976c04469c9d164ff31d02471346af715730d97fee23261988100156c4598ea8968cb483e8f386ee3f94a6bdffb5f67d8a7dfc238f4607fb7fe09e128
-EBUILD hacking-0.10.3.ebuild 2129 BLAKE2B dc8ea1ef953a3e7140bce6393068dc0a9f6d39a10c5900536ce37be887d300550154ccf8609db7d3c779b2b2d30aef0c13c7bad87d7403afd6544b217fcf9222 SHA512 97c8b6238dd38e4477360cca312acc7b5f4b79467c5fa92cc5bd5ca4b47db94fce6198c9753cf3ec1081db03be7339af340d17dd7e68e0bd71267770489fcfaa
-EBUILD hacking-0.9.2.ebuild 1950 BLAKE2B 22819bef7fab3a4d69fe9d342f6ee29df70ac9e86c96126424f0360e265ccb34e021f224e8a87f2cf685899491fa6075124588adbeb5f049434b82904c4509f0 SHA512 0f6531b003d659763b92b40120f0f95658f8fc138c15c8691d30ea6f1559a312355c9f92c7b7425f68e495a930cb974254b603210b66a7fdcbe792cbf33695ab
-EBUILD hacking-0.9.6.ebuild 1941 BLAKE2B cb87554c06cba525552af3b33cfcb014a093d0526f193a22a015f1c6b3f4e84f6e710a99cabd8f1c009dd7a3f5788f5ffefa3980269c84e987f83ffa94bc5d6d SHA512 ae4d6c696bf75dfbe86fadb95ef8916731da038ecc3888a5122a8915088f7e24ee962c004cacf48fdfa767bf222a4d471cdf9701a91010a55e24390783ed0d1a
-EBUILD hacking-1.1.0.ebuild 1748 BLAKE2B 25eba7c6d7732d8dc7d332634afb860fa7135140594491cf4861c96e41d9fb995b59527d0e128d17d71261adb46fe568ac4fc8463a2fc30d3d9866b1003e6afb SHA512 fe77ca29a0cdc84f10bad23f560ed8a8c93af6f77e08f950f10a4b1f2c40cb83e9da8412e430edd5ea060a8d3e11b08147b8b2b439fc274a7589ab529dfe5aa0
+DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
+EBUILD hacking-2.0.0.ebuild 1746 BLAKE2B 1f2691e15a39bc1c36e4c98bfef7a1598b5ab33d9df134c1b3e8bda20adb140ebdc957ce525b9fd2905500ce102f450d3a608093687e11c9f49fc67668c07995 SHA512 84ad3bde29dffd3f08edfbb67ad9ca2b50e686cde7d27e6bb40815429d85873fc476e8103a296ff0c776b8ae1384dd70530377bd8618216c9d7f964facb6e691
 MISC metadata.xml 749 BLAKE2B 29b4d37179a1c8f36f3c66ec80d0c2044f3457542114dd8753b1c50303e3dc5fe499ff52d4554f434a89026c4aee544ccb5049d0b2a8e2ea98042228234de01a SHA512 723ea94c939f789ba8112fc54d2de3abea87795407ce15ea8982140ce3bd446cdca885c2680471fbb70551e275b426fdab219f1f0394b581bd495fd643f5e0c2
diff --git a/dev-python/hacking/hacking-0.10.3.ebuild b/dev-python/hacking/hacking-0.10.3.ebuild
deleted file mode 100644
index 70c5421423ad..000000000000
--- a/dev-python/hacking/hacking-0.10.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)
-	doc? (
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 )
-	)"
-RDEPEND="
-	~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-	~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-	~dev-python/flake8-2.2.5[${PYTHON_USEDEP}]
-	~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-	# relax deps
-	rm *requirements.txt hacking.egg-info/requires.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-0.9.2.ebuild b/dev-python/hacking/hacking-0.9.2.ebuild
deleted file mode 100644
index b354c8fcd79b..000000000000
--- a/dev-python/hacking/hacking-0.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
-		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		!=dev-python/pbr-0.7[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		${RDEPEND} )
-	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-0.9.6.ebuild b/dev-python/hacking/hacking-0.9.6.ebuild
deleted file mode 100644
index 82e43007dffe..000000000000
--- a/dev-python/hacking/hacking-0.9.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack-dev/hacking"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
-		~dev-python/pyflakes-0.8.1[${PYTHON_USEDEP}]
-		~dev-python/flake8-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		${RDEPEND} )
-	doc? ( >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/oslo-sphinx[${PYTHON_USEDEP}]' python2_7 ) )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Prevent d'loading and correct ?typo to oslosphinx in conf.py
-	sed -e 's:intersphinx_mapping:#&:' \
-		-e 's:oslosphinx:oslo.sphinx:' \
-		-i doc/source/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
-}
-
-python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
-	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hacking/hacking-1.1.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
index 806a3495fd58..0e24beabae69 100644
--- a/dev-python/hacking/hacking-1.1.0.ebuild
+++ b/dev-python/hacking/hacking-2.0.0.ebuild
@@ -18,26 +18,26 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/flake8-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)
 	doc? (
-		>=dev-python/sphinx-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
 		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
 	)"
@@ -48,8 +48,8 @@ python_compile_all() {
 }
 
 python_test() {
-	testr init || die "testr init died"
-	testr run || die "testsuite failed under ${EPYTHON}"
+	stestr init || die "stestr init died"
+	stestr run || die "testsuite failed under ${EPYTHON}"
 	flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
 }
 
diff --git a/dev-python/hgdistver/Manifest b/dev-python/hgdistver/Manifest
index 38152fec43f1..05d95a041298 100644
--- a/dev-python/hgdistver/Manifest
+++ b/dev-python/hgdistver/Manifest
@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 814 BLAKE2B 7c4d6fd981b2836eba943dc4d8c16eb1eea58173e6c87e88fc489223f3129e89d324a05d2895ee44fe05199cf2b4e513521a5f87fa036637830d6ebebeed6aaf SHA512 d89ceaa5bf7eafcd95f00e3119ad6896fb472eb979820231313001458000ef15bef4bd3ac5c49a46e69fc1c57949bb9f12242446af1803bed0d1f21a38026f33
+EBUILD hgdistver-0.25.ebuild 815 BLAKE2B d823c1c607ce15bc7048741fe5a0dcefc4334978aa495a3fd55d9cd83981db087745d628fe3bcf200c1dddde4985cdf947dd3d86e104c8db6a1fd80ad1b26371 SHA512 8d9af06451f190372658d6123815c2ffa288d64bd9408cc3859af4b9fe8c7387e2e184a06c576a6d4a68dbf73bfe57db43e060a4c6a34f3233f47d27e0299755
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index 65da3e47357a..5fafea392298 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index d12682a67140..cdbf2391ba74 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
-EBUILD hpack-2.3.0-r1.ebuild 1055 BLAKE2B 965eeac6519ae8db66c5b5eeeda4344a532fbbfa26eb53f89e4e3917b45dbdc8aab1fcc1948172889989d0ca453dac8f1e134dac4615d0ab4bc7d6a457040a7c SHA512 8be2c1861f979cbe1ef98bd2e0d63a30c05e998d67b3e8d932a45f6832cee508f9b0c5a532c5bf3a1937c514bdf0a7117281c4d4ce2f992ab51a3409cc1b521c
+EBUILD hpack-2.3.0-r1.ebuild 1056 BLAKE2B cbbf33ebfa283017e5fb49ffd4940c861236f6a2d0b072a2a3917bcc004be34a1207df3f06715f8de1ae2868007e66b44d001adc239a0f13a4256735c9c7dd48 SHA512 f237d70b4f76b67406c20f99bd90d912c9f6b1dffc06ab2ee062d864c34f8d612a0e4a88cafb889893338bb687b56667203725556d2d1ba6d09d61794cd9f3f4
 EBUILD hpack-3.0.0.ebuild 1153 BLAKE2B aea59b356f1fa044534bf5d46e88d3c1bd1255dfaea85a83d78f85f638a2834ed97d744bfb05dd4fb8966b3feec5efcee6c43eaa67b546c36c1ba4247b7f3f8a SHA512 b507bc9d1685ad1d44aa153886211c65b65b086ea0d7bbd72197cdbdcb4a5bf424e4868976c172b36077a1edee11106ed0f198db6ffd22975d3465a31c33f352
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 524cd585e0e9..98ce9c75402b 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index b1aaa399c481..9175d4bc151e 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -2,8 +2,8 @@ AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f200897837
 DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb0378c19f1cbe05b259b4653d248e3571e5578d7879ab3ec5df2e750db74c353acc98d1d6e8556949c1b1efb62f38c116 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
-EBUILD html5lib-0.9999999.ebuild 1086 BLAKE2B 06cd9b73cde0e8e62f5d5f6f299a503c3d4f4bac2c7aab76c838d02cc13664daf5f365832344f8ef517450a8fa7163da06f1a9bcc38108a98b3477424b1325f8 SHA512 cd069fad6f42e1754ed7cc465a1d11fe6f20a977e7a86c1cd39895c0e7c7ac6466de68fde0c760ae418082be8776221c175cadf586c0490bcb1e375a5c7890e7
+EBUILD html5lib-0.9999999.ebuild 1087 BLAKE2B fdb5dcd0769f05bff9dcbe69b72082c0e2207d038f81d4b8f5645fa98221bc500d8277260062f96fc8d33d557c3649f6d09d4c4272a6de39ab3e19f0fdce1ae1 SHA512 2d448fe5f8447d565b7019d01ba7e40723c6a46e33ff955378a7180b4c5cde7d9101abf873a79042411f5ffe020b972b84946b6b85f01fd612247b0abb572a00
 EBUILD html5lib-0.999999999.ebuild 907 BLAKE2B 53f1f0f29ccd6a236de8cf0e2b008a274ada60dbfbb6be014782ca1f52172170eb5ab172046d42951c316f20e0864088fdc9319c9f1ef3fcda22e527fabf3d24 SHA512 cd8546d1343b2af05a5b63e5ec7558f4b13198334602d0e1be5b9747103af45850107acaf13f8ab9364aee31541092fc6305f0d9c0d03dbeb8cbca201673808f
 EBUILD html5lib-1.0.1-r1.ebuild 975 BLAKE2B 818d5524163846aead7be1f617e0f8124994637e96dbbf902ab3dd2f5aff9d1a8ba49080404517a602a2d4f2846123cd59fbad893f22075b3af1fa24f043bbf0 SHA512 5893214862f1fae557fdc2f2606f00da31910a3802772a0f03b94073792fbcaad44868811f375e2ad023bb8d74ff4b3e9e2bff264bf01174b4fe83ca9331fc10
-EBUILD html5lib-1.0.1.ebuild 909 BLAKE2B e10d730c41fe478685879a467c91f671dc48cd8732642a4ca830218c10e96c5e7abc1ecdf2d40ec1c18289df916345f075b17b8911b9de17cb541f10dceb2835 SHA512 954494cbe252cb8875fb7bb2fdd7f6cbfcde2c1a7aa0b43b6c02ea51590f8faba845a14e31dd3906044c817c2176cdf733ab5df30753edc0a3b930230f194727
+EBUILD html5lib-1.0.1.ebuild 910 BLAKE2B 77e3d9e935e9c8d5b8b4e529311de6ff90a9622a534da90a3ab403d54319dbbc2ef53a294e46dd4ebc9ee1639b57ac96c366825b4d0ece0aa5aa6edcde668fc7 SHA512 fc8d52d5c1575bd70269316334f1b7b0a94e674891535842b680311a36c584aa302458345c5477237f1d2434b618ce4edab300dda4937a2b57e2cd0fc6998d50
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
index 1ca602e5c392..bdac7adf0000 100644
--- a/dev-python/html5lib/html5lib-0.9999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.9999999.ebuild
@@ -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 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
index 40b15cb66978..e4884a7de3c1 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.ebuild
@@ -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 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index 000fce09c16b..49cf53e88867 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,3 @@
 DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
-EBUILD httmock-1.2.5.ebuild 533 BLAKE2B 87efa16e7cc46e55e71ba8c4c2c23a10524697ce304a1730ebc229ec6d77a67844ba0436d1a585a51f320b03826c2f605c3e23e1a5c0869ae40bcfc14cfcff9a SHA512 6fd729aa4255110d856e0496b014d19e6a85ff86c7bcb88c75b9ed9c983235c30163f83d262c76bb4c7f974b580acf412fe30f38045ff28ea1f8b616a196e19b
+EBUILD httmock-1.2.5.ebuild 527 BLAKE2B 0cffd34be5d158ac70a937a0b6cdee8d4cac675625227c8225cb6e2dbf335aa4e2f0dbb6402b4ebc4e2b6c93475d697a348194037fa2f555a0efbf4daaec008b SHA512 5f31ad369023be0021c5b545b2c6dbb76c3778f9275443ca71059fdf0587f21564b79f64070abad40bdcfa235d94b95b7a663e496e994ebeef5d576269dc07cb
 MISC metadata.xml 246 BLAKE2B 7bbbd7b1426aa97da0217eb9a4693facfd85920a077235778070e692ea562e596cc884db84f66223af907824cd0b97f8b1617fedff2dff37ab8802cec0874cd9 SHA512 8e33ef8d63dacd3d70b04a4b0f2e206148f09bb605a51e1d51d069351b498238bfd205574f45a0cd606422364e093023b8dc40bbfa3ab0afe26ba8e052df4f74
diff --git a/dev-python/httmock/httmock-1.2.5.ebuild b/dev-python/httmock/httmock-1.2.5.ebuild
index 1554818eae02..67ab6525a63d 100644
--- a/dev-python/httmock/httmock-1.2.5.ebuild
+++ b/dev-python/httmock/httmock-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index de90294735c2..dfe6393f056f 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
-EBUILD httpauth-0.3.ebuild 632 BLAKE2B fce0efd1a0f0186425a593e40f35d4a9a844d562b195661da6aea7c6b26c907b134be05b900e6787e275eab18517f8f42461ec371963ffec61e3b116baeadda3 SHA512 dc75ed2ad9336a15aaf194b566a0116e361307a4521dc718fb1ead3398ebebb6554dd2cd3c94b2f2a3651bd3a5ebe85a5ef29ba36b4d4e08a7326e360970883e
+EBUILD httpauth-0.3.ebuild 626 BLAKE2B d33ff55256b7f6fcab2bebc11145856abd703968f40099c3a0b1e0ee7eae29d4d869a8bec995cc67f9e9ec2ca1b78b95e32def8be11d282bb61d5a212dc74908 SHA512 0863dedbd88f8ab0bfdbb53afa9098555871ea3061c7e0e13e70edb500aebbcbf9d46ec7b6fa0b1cfdde3defdd0ea297c87d8a5f739573d8c642009bedfa365f
 MISC metadata.xml 440 BLAKE2B 440d03c6243a6b43d9b8d033ad41383a2f3a1c375ad085e7c9241fc85a301ca4bdf2d1831e76dc55e6f17975e560fb90d6cd88bc1df57f31a8880068afbea80c SHA512 572f2e592e08ea0316f9df8fad23e77dc78644adb664e975631944d06d8ddb3a560724d3d241f33fd323fc83877b75506527960c4f3790fc650c88b461770a82
diff --git a/dev-python/httpauth/httpauth-0.3.ebuild b/dev-python/httpauth/httpauth-0.3.ebuild
index 7ebdcafbbddf..ec763d1968cc 100644
--- a/dev-python/httpauth/httpauth-0.3.ebuild
+++ b/dev-python/httpauth/httpauth-0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 182efb2176c9..28aab484ff85 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -3,5 +3,5 @@ AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b
 DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.4.1.ebuild 886 BLAKE2B b9e4d3eecca2d304f859ea3dba91f8e57db42717d7d37299afe97c5e68dc41035a9c31f522d0d8bd88806eb2b31fd637b9860895dc6f49b6f4af46e4c8eb4465 SHA512 90000e61376c4d32b904a19148bf61a79cf7fad83ac1ab473f3fd0226ec3de4cd0e59970567e706a064ef7ad04cf990684110b6896bd27b0a2e1fd7a8ce57f25
-EBUILD httpbin-0.7.0.ebuild 1086 BLAKE2B 056bead1ffbf8b7beb6488058948edcf6ceb3b0c7837f0ff91610c1bba5c3fa504683a351a34c5c43a8afb0bbd4d8f7ee3447fb76e63ff322e8190e8ead37fc3 SHA512 f9436dfa703520ce5a1c7788c3d65456b107c505ad438e7e3de7c38f566a517d4b9e8a955a9ae2d33f26a692679e2587b22ad32020649cb62123dc7458a41fc2
+EBUILD httpbin-0.7.0.ebuild 1092 BLAKE2B 99475f6af0c31efc6351a5b5c9a95168c6299d63337a4974ee7343f7233a7a4bf323f3829a8ac7c8371c640cb293aaeb2862b371647e6a5115e89e2a98a50937 SHA512 6766175e6d7fa820568791f9ee6a13a85f693467238e826135ace4fde446be5c57bc07e45043623c96497da8882a6d4bdb887d4d11234fb3eaba7301da7b2a64
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index 75a4c951d587..f511793822f4 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 21b66dcb757c..f7d795f40f69 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -5,8 +5,8 @@ DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988
 DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
 DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
 DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
-EBUILD httplib2-0.10.3-r1.ebuild 926 BLAKE2B 3ba91deb362386250de8a21e76b55b5aa816662efeb307f157c923299e1bdb20d6f466299f519cb25dd948a2ae9b73ebf91a94501d44dceb0a2e0285c10d099a SHA512 5af73f0dc629295f882ca340ae2b865f213f243051e04ffd45c18527e8391f65610a33240f1db6a23350dee414b6d6335f76c86ab65e3c8471a885a8e8ab4d16
+EBUILD httplib2-0.10.3-r1.ebuild 927 BLAKE2B a5bef5238db60e8b25093665a402cf24041babc69a8617402df8ec3cbe580ed975895c26aa4afe23f5fbb6b856f504baf2a0fe6a9eb73fcdb6038b05dc17609f SHA512 d2160672a075ab0aab798ecb3a272ffd1142338c651f413b742cf51fd616fa6f5b5372bf605455a5b8fdb54ff557aa83266f8d8dc0fada2cb92ca8b1272cd8b9
 EBUILD httplib2-0.11.3.ebuild 954 BLAKE2B 94dc30544e82c5e7e5444545861d2170722d72804dcf338cd214b05938077dda1bb034502f4e3a1f28261b68612935e8db9ace4209b50f6353f4ad6ffe528a4d SHA512 852d8ded1441461dab19cc6e7118ddfc90709b8bc8f31f6015aad4dee9a33e1947d2751fef051799b619d8ffd1a43ad21343992e20feec767a9c8569d12f0d14
-EBUILD httplib2-0.12.1.ebuild 945 BLAKE2B b0c5bde70d8ddea785dc98e393c7b988529cb2b0a72b49d24d611ef1b615f6732ed0486f8021708aa9fc9affe32f58cd2ee24313277b307c4668bc271e67a3ec SHA512 764c19166af2427f1bafdb9f4d816645061c3b6d06aad039b3579e9d6e240773ef64de1862ce9b4a1c6872374d19378571ec96a86243c3baae7473e74ceeef9f
+EBUILD httplib2-0.12.1.ebuild 946 BLAKE2B 642862f0dab7bb7de1d245a70763b7d74d7cd222265a70efd79ef87a24044587d6397f31593651376040c27d0a6128a2687c9117cb0c1f45e763ce324d1fbba8 SHA512 1b4f45ac272eb7a21d16729ab2ee0ac0c7ebceaf55ace475d6ff066e3a2517fe40f657a1ef052eba5109b00c7ee93af2d8c70831ca512a0db852bfc1da686aef
 EBUILD httplib2-0.13.0.ebuild 956 BLAKE2B 619e9f0f2a2965dc81313a3a3719f19162f38e1c60211a7c79757a5a50b620b1f41a38e3beaa8fb70c2f665d58f13e51e68d6e6a71293c575d9e991a515bd5c1 SHA512 2470c3a9bb9ff4ad9de12b05f0a1b4881a8eb690c91f8c37027b0cf5d3e1ce46f54423993055c6f285ddc40bd4d28faa7f23bce7af23f6afe054fc882944d16d
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
index a36898d50317..a3f238e82a27 100644
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.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 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/httplib2/httplib2-0.12.1.ebuild b/dev-python/httplib2/httplib2-0.12.1.ebuild
index c8627d19d77d..837a7480069c 100644
--- a/dev-python/httplib2/httplib2-0.12.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.12.1.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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/httreplay/Manifest b/dev-python/httreplay/Manifest
index c4a844c9f773..84194306e028 100644
--- a/dev-python/httreplay/Manifest
+++ b/dev-python/httreplay/Manifest
@@ -1,3 +1,3 @@
 DIST httreplay-0.2.0.tar.gz 8493 BLAKE2B 14b7ef227ee2184195c24fe1b219a7aec0aeb68bae9201dc41323bdcd8e74acbc6a0203201a65a2dcd2dbbec1866befe6790efb638ba6edc085d6b0da0a58e6a SHA512 0a035425241d34aeaed2ec219e7fdb7894ba09b711ccd60ca909f4f56467505bc39a8e77999a9196280883ff818165f9e4fb581e93df5d85a1dd30a0f243ea6b
-EBUILD httreplay-0.2.0.ebuild 443 BLAKE2B 7bf93d428948500eed3ea13c0e83c5e272d14f50b882988f71241598a36ea5409db376a505f933806e9df2547eb6be09c21c69cfbe14d4ce121c2897c027ce9d SHA512 db7aeb2da35f6484dceab53ea3bf68ac4c1a880092fe1c5df6bc69ea695be5b8c1bada5024ee69c292059db2e0894870c6e0b1fd134812176f8b7e567d6fe29d
+EBUILD httreplay-0.2.0.ebuild 433 BLAKE2B 38067e1b7bf5851f90c6ad27c72fe3a3b33ced73554e4a9d1b1d248f74089599952faf981bb2d01c478cb702c4084d10b3f058be1daaee3306d9b923068f9ff9 SHA512 3ef0596b5738a339b646e3d3364a693e3abb54de801210a79ff6a2120939de306c7c4aaf49e56c9ee23ce9a7ba1ecda3173d5f235f93929f4ca87584b827b130
 MISC metadata.xml 527 BLAKE2B b55e74fdcf3071d69fb63f910791d7b0dd9d7cb8e4695d46f4a9eda4aa8364aa58d0077294f33c6aedad2e4ef281d652848a6a1a20393b22034b2c98687ad166 SHA512 89795450ad897b311a286f6936928935fd19e62e4c55604bce548409154340afa6b5813b62045d6687339acb6f373b6b289d4addf11bcd0faef8c193c20fc3fd
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
index 242af0739e0c..fc6e73aed555 100644
--- a/dev-python/httreplay/httreplay-0.2.0.ebuild
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 216196ad9332..351be53c2b2a 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,5 +1,5 @@
 DIST humanfriendly-4.17.tar.gz 344455 BLAKE2B 985ae142ea5378fcceb9f5f28773ac4dcaf0ea55ef1a7269fd1840a0b7119b54362aa93c330aa62e5424cc6f329e88717b45255c62b8e1d3f9ff5dd43a3c16c2 SHA512 a5786f28eaa0ff33919d9164ff30037fef5dbf60a31aece7679d1dddf3239f5a0d27209c710053cb0ac6779c1ef39102b1441fc620063283e90ef2ae11f8b621
 DIST humanfriendly-4.18.tar.gz 345853 BLAKE2B 9b03ea0679f787e216ee78efe8feb77f83562998813718845f4d21b7ce3f42cadff0e80b96f02da3cf6dc7f35cb0714f746940cf2ac0ec8e8981377989650c8a SHA512 01c7ee50d35154fe0b7ad39662ca6ff2dcd3e0f2a2eacc62f0184102c9db1c0fd99257273982aff56710b4e59024e8c20ee77ddd10c68e427c077ed4ca7e0022
-EBUILD humanfriendly-4.17.ebuild 924 BLAKE2B c9606e6fa95529ea7e76a7db53a9daa9640cb4ba3ec1bc2d042081e4e5d263ae19693ac0ecce8de73d33896c46f6924cf3631785f39bc425fb23ab85c17a58d7 SHA512 5463f5b5b3a9ed07594cd70974cacff8237e68b66d8b591c498e9e87b975acebbb6aa343dbe3da27768d54f4ef1da2c910c0c67f27dddf9ab4121ed5f7655499
+EBUILD humanfriendly-4.17.ebuild 914 BLAKE2B c155f6780b944946acfaab51860137dd660116319cce589aca63cf45c55a1e5205e64a54ab2715aceb949ed20e88e3ef971c50d60e6bf1bd393dc132f168502b SHA512 b236b5c7e068f1420a6a5cebdd264b9e2f06920749c835b35382eff8c6c40e490269759679e59fc3c4febd33a770f174e0b6b17ffeef118b315b97246980ec04
 EBUILD humanfriendly-4.18.ebuild 802 BLAKE2B 4b4e697c6a3e6093a4973076fcc80da382fd5045c48fe36a35610454e4893667e4593aef48c73e497e20c0ea806497373b382980377e7447ca05b3df3b57f448 SHA512 275ddb5f2b049f8cc4960832d7af37b6587171a2cad65ec7403f1b7e5832ca9ecf3d91e9e7e996fc0eeac6f7056440c57a9cb9e62dde5d760befa3c2517d70e1
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-4.17.ebuild b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
index 2b7465a35b7f..9fe2f4da94ec 100644
--- a/dev-python/humanfriendly/humanfriendly-4.17.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 91fb95871db3..4085c6236c09 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,3 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-EBUILD humanize-0.5.1.ebuild 883 BLAKE2B 069b8e65ca938deb7f499949bd9bff552f112046ff7d843f955cd346849b6f0cb7553b6977b4deeb5c0e3065a2029b69880fce608f6a9e8a423cdf490f79a508 SHA512 6cabdd75522bd0de90f1c60d117da4072f4cf9714be168ff82342ab780f1b82d0009c708dc3f94d7c0f230bbfba07b4f9eb68feebb31b86bce2450b2c3654960
+EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
index b15f1b06682c..9fb7249b70dd 100644
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 37e17ea33a76..a1bd1fe48e60 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,7 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 DIST hyper-h2-3.1.1.tar.gz 2202601 BLAKE2B 62a7a9ff4e1295d279fbe7c02da6d60d97984caf8f4eee6fa69de3974913caf57d7933a991825296e96b54b4646139793529e839e492d440874aa134cdb7e96e SHA512 153c450ef918cc7cdb5d8efe61692a646925e76e6255ef46f679091590681be7d1f9319b37f6521c56207cf35e7d9e56951e4e3b55a24fe89d9e6aa28591957b
-EBUILD hyper-h2-2.5.1.ebuild 955 BLAKE2B 3edb24a84241c4f0f85761558827f49d2ad37d7a405bc3f92125368154f2805451fc86613ef94d963cb7398d9fbf1357c5526f39ade2703e11b802f2af8c10cd SHA512 2c1695211e4e05bf5a9a4f27bdd233ff32762be93d845dda690f1784b2f620021e6e7fc736f99ec94dfbf368e14d8380ccf4fc10eeff486ae282c767f4dbdea2
+EBUILD hyper-h2-2.5.1.ebuild 956 BLAKE2B 8e610db8171bb7e44a747b8edf4496b9b1e12dac689e5b57ca35941c99948a0670812b6f111e7023e406b292d59549680295e90114436ca6b6f664373a73d687 SHA512 97fd55d847419e45e41e87883c10a293ee8aef5fff953eeca524524cf6fb9b2711f96defa5a27aaad45c22808d4d9d09a7b69f19e646bcc71746951b6c6cac43
 EBUILD hyper-h2-3.0.1.ebuild 1098 BLAKE2B e73f26475184a898076092aaf35f76f28ff7986900939b520267981aac8119fccf3d919177be4a61744432db746e0234135657d035e4e2a56278e60bc1e41fb1 SHA512 ae9a01f0f89040b2037683c7b147b98a3fbec42a824a222729f100e530ccb3e0e03260d7735a8fed36419335819db2872921359009c0e2085cedd7ef899d595c
 EBUILD hyper-h2-3.1.1.ebuild 1128 BLAKE2B cf7fddf40986d8b08a392afd8d74e4fe44dd5a8778b21a9d35f821fd650805fc223411e3711348323d0aa20733d8d4337ff5833a70da3416e0043fd60727ab99 SHA512 f6a4a5deb00a24c4ff52ada9177282bb8e893cd2a1fecd39b9f1d2178a0954f7a1f820cf8510cb35a6e061ece75c95c8f24b87842e1b36df6699a3d0f037c066
 MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 65cc6b823c5a..92e09d4be9ba 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index a9f73170cbff..460c8a7807a2 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,7 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-EBUILD hyperframe-4.0.1.ebuild 484 BLAKE2B 7fc565d37e48751e60bc1f4ac5ee21bc8839eec9a63ecc7250273b340e4bfb47829500d8f03febe7d308caf6889197e950746df83fec3f282d055a69a9c62221 SHA512 1c0ef2bca52fc7ae86dcaf61ff74fdfd8fe31dcb04aed885093fd641a9d979928ad8b0e66a3d0535823e72448fccbb6455819236b471680fba03f4dc755fdd66
+EBUILD hyperframe-4.0.1.ebuild 485 BLAKE2B c2e0428f4061feff8521dd8f50a82d2807c38ab7c0e5479dd1c3dbbc352d966cf8f645deb13f430a5da3b41f7d63f085ddcf900c336ab6f1d2cfed765692df49 SHA512 3aabe5355297cb2f43d940efdbc31a432fcada9ce2fb6082c7b3d8836cc9557452ee1529cf5ec559d0d8b936fb1a621d564d61a26529a94d3b2a9e129b9749b6
 EBUILD hyperframe-5.1.0.ebuild 649 BLAKE2B a2d46c18eb5564196dd8b8749ad59e2a612fbaf4db012fe2399fd15c99aadcfb5ab2fb1db4e95ad0fede13a3fa2e9129288c39727de1091d53fff67be8d0c394 SHA512 39916068d23c3d7a716acabdc9f354f98b86df9488cff2b7fc769fba8cf1763a7591d0b0c43126734b1d71bb528eae005547ae0175a79c60047eeac981b226c6
 EBUILD hyperframe-5.2.0.ebuild 547 BLAKE2B a884a287ea54bb36757ec467f80f8926f74aa3867c2648a841d81ae81568401e1abb9a16295c0a45f8a35d1bd4bf776ed4ab84b1498c5c57d0f39be325471b3f SHA512 bbb881f1f7a19e5c612fe1efc26d991f9433a0750127e06d65651cb0001ab94b6bf768f86c70b6fb69d8d519f1695adff1b1f4b8d3c8fce2b8c5628ca19322e5
 MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index c4e8ff509c0d..503df8537eab 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 028ab9837f4c..7b657c7cd391 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,19 +1,15 @@
-DIST hypothesis-python-4.15.0.tar.gz 1175925 BLAKE2B f3e3888b3f4e542d567bdaad2582eb23bd8ab2e218f1bde82ba1639123f32e8c147313c22b15781d8986574813b5f6eb7c23ce28367e86bb304d33a23f179fa0 SHA512 7d9788b351196fc20e66e210b7d60b4ddb1507b85cf5a29de228600e07f676ccd1352f5d2ab0820b3c8c1a1e8ff145225f00a25aec5f325cc7405ffd0dfcd9f7
 DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
 DIST hypothesis-python-4.55.4.tar.gz 9004357 BLAKE2B 93fe51581f044cf5f416d9b74b82ce2f9b42e7391beae8f67debdf50494e662f07bf109274d4e29fcf3a1c1c944597cde2a4ff9e7ca65a48f1244c3205f365af SHA512 91d7d2cda32fd40d5368fdd1e60b990b8307573782d822113b6817a5c0b670610693a2f2b013f828913549946fa3dc15f45303bf7d3226bdc1e4527bc18981fb
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.1.4.tar.gz 8989696 BLAKE2B 9d85cb1473654e36a235a07d2390fc967d6d7f2944e5294dedbca15ddb3c49901b04e9277ee80ff7591aa2b81ea0e2d537051f96b685900aefab5db70d135ac6 SHA512 25d0112f7b7a13221b8b68d553f4085344f1e8681c8795fac0bcfd714400a828539298d2919d3e638979eadd5daa65ef7ee8b0b946df076145e59c8bb7058a64
-DIST hypothesis-python-5.1.5.tar.gz 8989752 BLAKE2B e1dc2720fd8500436ff0ec0fadd8c7986f279be125f8cebf376349d6c6d1d28f9225cceb2fa54ab66e92c6750832dc6d157cf156980e7f58aa7251a1eff625fd SHA512 89edc57116b3c503df2f0c6d4e60637ace6a7fc5c4ece6b426362b01a0be11e79be1e95784e24d849ac120000165ff46efd78c6cb6b163aebcb2b5a8c8d4c8e1
-DIST hypothesis-python-5.1.6.tar.gz 8990038 BLAKE2B c6f1c2974d84d60da7ab7b704c8dee96bc819de3e8a237343398c0fe74191ace9cbd23299b16189eaefa936fda87d9ee8fe171f37ff39014ba59cc421b2af03c SHA512 e9049506a7da1df40dfad5bef5f270116047f3633ff27bbbd83ebf5f93b89010446c8ccd12100b033dcbf2743f0c17aabcbaf1774aeba0efc1e7483d58eaba81
 DIST hypothesis-python-5.3.0.tar.gz 8991842 BLAKE2B 9bd5124a6a0b07c910aebd5caa3a27d6ee19d307f88438ef097b09108a6c41d4b548c224861b1aed766a84696fe494c3b50f55b0b35bf81563ee62c366a03956 SHA512 d622c6754e6162120e7bdc17f482d64e917042499179668744b26e09ba355d94681b2e1029d786c38af19c4193c41eb5fe3e4a7ecc322acd1895b8f90d2b1f95
-EBUILD hypothesis-4.15.0.ebuild 1476 BLAKE2B a0ee1cc8df99b8aa1e039860901485dcb64f529162d3364a236332483b128f2c6253d4dabcf48696e853f90a18d9ebd930ee5aaceb890c2b3c1e17d08533846a SHA512 5ab62b67f9fecf815f5bdcfa27d9102f0cd1baed8b2a624bb912eeecb69aec047ac834d1956f521f63c78cc1d7cae3cd7623dafa6cfb9dd990a948e0e9e4c981
+DIST hypothesis-python-5.4.0.tar.gz 8992011 BLAKE2B 0d748429e34360437799d043f75282153687b84c1f0c27f18846c75bf6a801797c460f3e1d22a04d52f1b046cb33d6ac34fcae93c40180e0273957ea81e3fb40 SHA512 9b168f11f9d7e720691ce3fdbff8f97d3fdfff86bdc9ab2683e58ff31dece36d57b468693fcf3b1b7e6cfc16022dd733eacabbf5bd08042ac8cca6c45050c129
+DIST hypothesis-python-5.4.1.tar.gz 8993002 BLAKE2B b96f9080f7a5b307698ee1119495cb5356ccd2836f1d3ae66077bc0be2793d5d62beba09b2a38e5486f6d0d09e95ac85e81511c5ab7434c7285608a0ae62caa7 SHA512 bf01c50ea998aee2a547132806845aa9330a3830ce2b864f0ab9e2d9b9dd7dbdc9ec4db2ef77bfb9a76467b00f3ca1c00acbba7bdea569dab3038914a598d0c0
 EBUILD hypothesis-4.47.5.ebuild 1715 BLAKE2B e11813476869c123bce76c05955412b1f6697df88060b5e9bdb205b4bca60c9042194210106b6ecb80e5465cd098821189f1dbe2c1f31d4336e7d0b2bb58abfd SHA512 54049e33fb298392b89c992bf3c73cb928716076060f4fa7b65ab8680e52dbae16ead0affdd5ccdd03550259faf5629d43b30d57a944cabeebd9751e8be41b16
 EBUILD hypothesis-4.50.8.ebuild 1717 BLAKE2B 97201f02ff2fa9b0618fe299f0859ff63065a179d145c101240f72c5b2b46ceab075b7cb20d3e5e5acfdaedb62b5c1ddc117a69e9f43ffe29aec65e57a62f0bc SHA512 60ec681c4eff1ed0d84c13353ad790ce45751eda94a55434b10d67d10ab4e7af381a9157f214bb6bd79e40f8def2ef8d098ae1dcae7f85c7fb27563afe728363
 EBUILD hypothesis-4.55.4.ebuild 1719 BLAKE2B e3021ac093126b60814311860311efc7d60a992b7b08031586e5e7c39d1ec20617fd756088d5d66a1f18ce16f96348c46589992d60d25776be6b7266014b1a5b SHA512 c83975840094233883fcdf731fccdf3d5201cb23b3c7268dde4395e8e8ac8089c0085ef3e01b47dd1e51946277892da358a847d71bb7ad243190778fabecb366
-EBUILD hypothesis-4.57.1.ebuild 1711 BLAKE2B 439cc7a17ee31d84e5bd6e006ba0776c178f86d6ff23d640391892cb746690aafd3eb2109dccdb7004cdc9651cae7386b57231bf5fdc8468e683b72feb861294 SHA512 fe47bcd1a9d9cd7d8e3d106ffff5b87005758c678440b82a9508e3233a545c9d9075a474378b9e69ca62ef511a031e58892496ca76e568f4a8f50fef8dd67ab3
-EBUILD hypothesis-5.1.4.ebuild 1573 BLAKE2B 48a8d18ca4b3b4a903054280ad67d99028e08312ceb9be6d9c996cfb22408f7810895e1139f42a0cd7f75e74ac555c03a26d78457cede9c78b15c67e4795c551 SHA512 0d38b8a3a4182ae256a9d0ebc909e95bc42a74ec439ed2c783064c1cd773444c1aba3b9efb29e76b8f0b29547fc69642f1ba134e1b7364bc314f906c59a03822
-EBUILD hypothesis-5.1.5.ebuild 1565 BLAKE2B be414de6457f2af9a6a0bceab7bdda3a560a561a35eff503fd5e57c2155f6a7833e0c181f0f7c7aa06e0a60e439c8cee60a1ce2110b5d7113e74f4d769f724f2 SHA512 092fdd3e00d77c041470acb909a4f49091a04d238a3b92f266d48cb14995092e8ff4d0339ccbcd52bdf57dcfba0b39866c30af3fca9847da9458d178dd5ec3a0
-EBUILD hypothesis-5.1.6.ebuild 1565 BLAKE2B be414de6457f2af9a6a0bceab7bdda3a560a561a35eff503fd5e57c2155f6a7833e0c181f0f7c7aa06e0a60e439c8cee60a1ce2110b5d7113e74f4d769f724f2 SHA512 092fdd3e00d77c041470acb909a4f49091a04d238a3b92f266d48cb14995092e8ff4d0339ccbcd52bdf57dcfba0b39866c30af3fca9847da9458d178dd5ec3a0
-EBUILD hypothesis-5.3.0.ebuild 1565 BLAKE2B be414de6457f2af9a6a0bceab7bdda3a560a561a35eff503fd5e57c2155f6a7833e0c181f0f7c7aa06e0a60e439c8cee60a1ce2110b5d7113e74f4d769f724f2 SHA512 092fdd3e00d77c041470acb909a4f49091a04d238a3b92f266d48cb14995092e8ff4d0339ccbcd52bdf57dcfba0b39866c30af3fca9847da9458d178dd5ec3a0
+EBUILD hypothesis-4.57.1.ebuild 1718 BLAKE2B c107b1720cdc67576b50e214afaab6274e8670f472c797ebca7c67c546ddcf6e3308ef4ca8d0a537ebc0dad605375f1875496e1be0ca29ce5c90295a43fac036 SHA512 a678071157752f4c408c6976d503c9cc68d7507beb98c29868407d9ca1ae6fd4d3d857ebf8b9a7e26de73b71520bb5f5028622138943d519518e8e76c72c38bf
+EBUILD hypothesis-5.3.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
+EBUILD hypothesis-5.4.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
+EBUILD hypothesis-5.4.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.15.0.ebuild b/dev-python/hypothesis/hypothesis-4.15.0.ebuild
deleted file mode 100644
index 80f9e91406fc..000000000000
--- a/dev-python/hypothesis/hypothesis-4.15.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-python_test() {
-	py.test -v tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index f88fa930f933..3723e3d3c8ee 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.1.4.ebuild b/dev-python/hypothesis/hypothesis-5.1.4.ebuild
deleted file mode 100644
index 24078c547ce7..000000000000
--- a/dev-python/hypothesis/hypothesis-5.1.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.3.0.ebuild b/dev-python/hypothesis/hypothesis-5.3.0.ebuild
index 963f87ee74a0..d1f7fce2bf73 100644
--- a/dev-python/hypothesis/hypothesis-5.3.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.1.6.ebuild b/dev-python/hypothesis/hypothesis-5.4.0.ebuild
index 963f87ee74a0..d1f7fce2bf73 100644
--- a/dev-python/hypothesis/hypothesis-5.1.6.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.1.5.ebuild b/dev-python/hypothesis/hypothesis-5.4.1.ebuild
index 963f87ee74a0..d1f7fce2bf73 100644
--- a/dev-python/hypothesis/hypothesis-5.1.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.4.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 6246fc7ba774..f7e7350175f1 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,8 +1,8 @@
 DIST icalendar-3.11.7.tar.gz 78330 BLAKE2B e6186f58903d835ac3357db959b6fef79aba34bb9b692128b6209b9c8139f7ed2eda81fd5cc54b6f3186d055e611f1489fcb61b1a10f914ee4c79ba8b31bf67a SHA512 445dc7b9c8c7ee2ad3345c5a4e4bca92633cdabae95f3cab63dacf549d48b7578242566d236cac8d5a9df4158387cadc0f09327e1b3e5038d223687365bec884
 DIST icalendar-3.9.2.tar.gz 66283 BLAKE2B 487a8fdf04f028de30003762860640b8983df026aa7a5ba0efe3a57ddd09c51bb406a5e58792203d3a0ee3d44186b0b6dcaa7194fefcfed85c3ab714129f6b4d SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1
 DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
-EBUILD icalendar-3.11.7-r1.ebuild 1356 BLAKE2B e29d10e11f946f541610234b04fafb587b079ff562176e99d5e5d57ed34682f67f2645b1a84c01ef2bf5caef942fef18fc6aae21e39db3f8ca277062f6cd29a9 SHA512 974b268e2d31559de1fbd389d27a4d74384851b80cd45caf0baaed1bede20e35cbdbe98318c9f9c2730ba830cfda4996c02a7a63644ee68affc33c8ae096dd6a
-EBUILD icalendar-3.11.7.ebuild 1306 BLAKE2B 73c2b8d1c3346981d67b4895c1f979da35871e17b498b58038972d54b8179feeb6ccb35f561e78a6901c650e2c81c5993ae46e0c1efc89e902e585efcacddb6a SHA512 dbf68a51d435688ba50c6e1ceb4b07ce3ac4b205674f971d6066f2fcc78fc5205824adf4cbbc45a50960efb7d60452102ddef854625e07507ec3d01d4cc14299
-EBUILD icalendar-3.9.2.ebuild 1304 BLAKE2B fdf999947a9bed801c7daa3cd8c49039c81747cc84368767170da188e1c28c93bf1568e880af99897742a2b5a60a0a68a39a114436a855226f6d24983492590e SHA512 501e550866cab0797806ece56e9f136bb456bc0f96f0ffb01a9ede0563c27ce05a4ef3c70cd4cbb9c713a5501fcefaa42ab44e387b0a1ca7158fc13ecfdb5da4
-EBUILD icalendar-4.0.3.ebuild 1140 BLAKE2B 3ae1312b2aa3f74c6a1ea0b7a27e984b74e19a75d917a23197bf8942f470cf5b1bddd6815461ee435af730e67f96a2dd42d28e0d136118096bb7aaf084cddfa8 SHA512 2cf6fed90f142962988bb773cf3e87a678412fae5a9b88f29d7db2f9efba2710bbab1a397e59da4cbcabe22f5594ae33c9decfe3c42ad76d52570926ad2e173b
+EBUILD icalendar-3.11.7-r1.ebuild 1346 BLAKE2B 502ef1b3f9df814af81453c0a33ac2e474fe44ba7272efea08d57d03fbbe902de4c5f2b3ac321f247ead99194cdd58b05e777a9f773c222baa51e930df62bbdc SHA512 c95c9c64de420606962d5a00938b7d07ee10ede38c8b028fe4a44e1c4afe6ee590e0d509ff1803d0aeab5ce8ce028663c602137baeb35c360fd82becbf22a2a9
+EBUILD icalendar-3.11.7.ebuild 1296 BLAKE2B b9056b467310d341082ed4c4ad9d5011ceb5aec515b4fc0d5a47a5dd80029f749153e7e73d46f25cf596251581b76e783ac2f255400f019e2ab9fc54a93cf797 SHA512 03650c476dcf86a7c688f91923c3a5545b2bfee69a84ba254699b08be7f0cb52b2041942572dbc776f0a3ed024659f3947518ca3d6ae5d7876987a302ef5b973
+EBUILD icalendar-3.9.2.ebuild 1294 BLAKE2B b36617107de0ac4f37e48331cbae141ee7408f0a54507de630d69b09e867d60425c2badff6ff4d8375d2af8641701dc2b9539769a563a0d73e6ea8772a95981b SHA512 4860057d47f594e5f8abeb1160990a877f9562cbe1155cfba814ca698f0c43dab89a3769007699784e17e1b3b81da670650fe516f9534fbca551e1c2e6cfa041
+EBUILD icalendar-4.0.3.ebuild 1130 BLAKE2B 82ecde8f2786382cd782bd50ddefce4a5bfa1f35e0355e0abd35358d6912a1f825330e974cc987e0cb87f6e14cd9f077dccf10209006b951fa5d0b4b5dd6739e SHA512 f10f6efff55246e178d2fa180fa020a2a6c313da30aabb986e8ce314317bdc22b3cdc39abf98644d1e452dfe6b2b56e3a7d53f68c98323e301d7f31bd5d5c221
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
index afd987ed9146..accbaf9d819e 100644
--- a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
+++ b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.11.7.ebuild b/dev-python/icalendar/icalendar-3.11.7.ebuild
index 55f6fcbfa51b..118a0d3c1718 100644
--- a/dev-python/icalendar/icalendar-3.11.7.ebuild
+++ b/dev-python/icalendar/icalendar-3.11.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-3.9.2.ebuild b/dev-python/icalendar/icalendar-3.9.2.ebuild
index 2276d819c576..048f44540ff5 100644
--- a/dev-python/icalendar/icalendar-3.9.2.ebuild
+++ b/dev-python/icalendar/icalendar-3.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/icalendar/icalendar-4.0.3.ebuild b/dev-python/icalendar/icalendar-4.0.3.ebuild
index 86719bfb57a9..f1a70391f24a 100644
--- a/dev-python/icalendar/icalendar-4.0.3.ebuild
+++ b/dev-python/icalendar/icalendar-4.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 034746189faa..b7adf92bfd98 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,9 +1,3 @@
-DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640d2c9d9b7ea05985f9eceac122bb9e5b30b2f22648506580202a187f95513fe5ab0af6632917335f2eda0 SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835
-DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2
-DIST idna-2.7.tar.gz 172698 BLAKE2B d0c92988d78629af3b87b8b4842757395c1f439f25d77614ba05d48e57d7d9a414c5be33e3fcf191f7dc8fea7325c801ff9c6f687204dec3735406f6e2342923 SHA512 34ba985862e386243f43616586e53830177cf4ba0925b6054198dfa63c085ec5c6c5b54c2b3c0989bc768aacceeef76b84471e58a16183b960dc4b8812cd1c61
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
-EBUILD idna-2.5.ebuild 589 BLAKE2B dacaa320b0bf195e3bd19515069d8ad784742895daf5b76e57053c0078c97b36cf7fe614c16d6a8ea13440b16ff4033dce67ce3b5626a94a3ae3c7e21f23e46f SHA512 da63b2ca2eda6a54decf98654a2c45183ca6dedb65d8ba26d7d537a98ddf37bf56288e392780a57fb25638ccac85a69681b9cc685b373eaf5302f681f7df9692
-EBUILD idna-2.6.ebuild 642 BLAKE2B 3ab26fa60710d7fc7054846e9d757041e04c5bfec0c09a4567da92d48936b9db6a7409bc9bdffc6f3380161fd5106746405efbc3ff7fe208352dc01609454581 SHA512 d335530638e9a2578d548b69d82b509e9fdae5ba86ed87291c6469c9e3c3a9bdb8c63a6eaf1f481df445de46bf716b2b432c256e74191c4d65840485d8d41173
-EBUILD idna-2.7.ebuild 702 BLAKE2B 95d99f4cc03d5e2f8aba53faad25e3d841768bd8c7a0dd36a1209d52e5227412b43579b0c3585b373c612a36deeaab18c2ab4089a4a8cccd1b97345ef4dc3432 SHA512 96e7d4de081ee1f4cf8472aa03f9abdf98f9b309367389d2cbff34795523285b49d963a8337c41118fd5198772faad765352f686dfe5380e0f877784ab23e59b
 EBUILD idna-2.8.ebuild 694 BLAKE2B 49a8763981ea87b579bbd940c3408cdd37dcc3b592d3ba778149f6b46477d77416fd25035570704e7a6ee2e34b7648c1f6870314aced29cc1e7982846cd94a5e SHA512 b60347ea588ef06bdaaa1332a2daf93bc2c8cc563c36b71420355c798a0ca2e2e9632fa87368a2464de58c96084a446b335a52d9b5f0378683c999432989d7eb
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.5.ebuild b/dev-python/idna/idna-2.5.ebuild
deleted file mode 100644
index 8e2fa883fb12..000000000000
--- a/dev-python/idna/idna-2.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
deleted file mode 100644
index 12b09556b060..000000000000
--- a/dev-python/idna/idna-2.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/idna/idna-2.7.ebuild b/dev-python/idna/idna-2.7.ebuild
deleted file mode 100644
index a62063f31c87..000000000000
--- a/dev-python/idna/idna-2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index e024374d66f6..2ac098f59171 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,7 +1,3 @@
-DIST imagesize-0.7.1.tar.gz 2871 BLAKE2B c458527576b9e55d7bb501667b1283a6362b408339c385c6dc1201538668d0c4708973c8b94faea7151195304eac78071770fc068a65f0b9565f50ea7808395e SHA512 61ff92167cc90bb1dcc78bb358419a526f09dc567709548bbe399694aa15dab63744f56c67bf33a940f5f443fd3a5ddc08ef9e17799b6fede1b11c0ad6a17f75
-DIST imagesize-1.0.0.tar.gz 465373 BLAKE2B aadb78abb6cdba8083c123313e4e35bc2d83cff4034357c6806c9231e6e0be570c871a5ed2e975337a91741aea6ac7643c4cfe3a19e12c184cab0b2f3f51fdd4 SHA512 1111d284cfdb8b14bc09dd0dd569434c62225f0b8da5ca5c00a740fce095c382efafcba73a4000e38b91418775518707693675c2d3c2dafb1036fc4aadb91e64
 DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
-EBUILD imagesize-0.7.1.ebuild 637 BLAKE2B 0430e648a2b4b57a0485f683c95270566977e4e492c6ce153d2c059a74a6f1d799f68aa09f450572db24ccdde26e98011e6b224fb5a094f3727db3ec930970a1 SHA512 9d610e32ee836d01f796e0cefc0302c51b3cb27c5b6651cbf8c3369ea4610f5392bd70237c5c0c67e5ca6943c6c7910190353bb57ffd4443060ac9a40835c4c1
-EBUILD imagesize-1.0.0.ebuild 712 BLAKE2B b8525e26e1b49ed25071872faf4b13e99f26618a17fb1f45979ef7671866dd213720e5d42f7804c234d4801e36830b59e720ded09f0de51b03e9e7db43dd04b4 SHA512 f683790a4eeefeb492a06dddefd7f0a9882688a0bf2f8c0d8c1548960cd433b097fa2f7c455a28d890c174b12a9fc22042a34842839c866d6b61dc8f690619af
 EBUILD imagesize-1.1.0.ebuild 570 BLAKE2B 0bb5f183206b39bc0529d3bff30092ad6b43bf7cd40ce2aa9172a7b28dd0723e63fb94761943feadf7e0a41a4608bd36bc59f319a1f9c07e2e1af12a43851571 SHA512 2c94c9f21f0eb4a9321880a9c9320c60b15c7311bf6da77615da3e0f05409e889fde581870e70ebbb597f75ffca8425b1e44dee796cd44ad74b6d617b78d17ff
 MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
diff --git a/dev-python/imagesize/imagesize-0.7.1.ebuild b/dev-python/imagesize/imagesize-0.7.1.ebuild
deleted file mode 100644
index 1153d0c92c00..000000000000
--- a/dev-python/imagesize/imagesize-0.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/imagesize/imagesize-1.0.0.ebuild b/dev-python/imagesize/imagesize-1.0.0.ebuild
deleted file mode 100644
index 0f1b5305b96d..000000000000
--- a/dev-python/imagesize/imagesize-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_test() {
-	py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7c78b3756f0b..7b461e0c1db1 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,10 +1,8 @@
 AUX importlib_metadata-0.23-py38.patch 1069 BLAKE2B 1286d00ffda07aace5c10bd5f72e4991f7853292a633d495415dc60f8210b5bddbd02b31d0547c2d4fccabee88a12fe74341edb3854f1756da9739f8368c34ea SHA512 0004fba3856134614124c5fe42935623ede41ccefc726c8ddd177749f307761af5872c627092dee126b1dfe506aa49ac9a1577c773e22d25d01f9cb99fc35e24
 DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e54f4b42eb209ac1ce00af1dad5c15f66b661b20fc287abf818d7e4ef2e92447bea713fac6fb89a98d5ea7ba93e74134e4d6 SHA512 56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a
-DIST importlib_metadata-1.2.0.tar.gz 26110 BLAKE2B 00f8a1e02c8bc0878dd0e5b1fcd11b6b30fb270cb6c528c0270a3e49dd7f27ac39c991bc442e648bc86116c6ae0772114fe60beb8b8b6274efd3d8cbc668d71b SHA512 27bdf882995f5efaf9a117650dcc36f32dc373e30d3ff973da5d9b9b160625904d165af98adfb9fa1681cdd10a88f22105eb8117bc9c682f9eb0b8d06e148037
-DIST importlib_metadata-1.3.0.tar.gz 26323 BLAKE2B a460a78856966fcbb20559c12f5da9ccfe82c9faa3745850e156a6b07db5d597138c1eaac583838ea24835e6c45c4cf8aab8474e5e15ba7de981eb1ad6b5de14 SHA512 45d09cbbbceee80a4769f2d374a3c4b511fda56a100ad1a6fc7cedf9a0cd251600c960430c608c7bcd60bdd9a0117f83025ed7b05f9f6a53edc791d128e8b0d7
 DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
+DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
-EBUILD importlib_metadata-1.2.0.ebuild 1087 BLAKE2B 10e14b865623dabaa7cdf12d5ec40a3af4a637706769273dc75183c706ba6c2397e704ad2e42d84972fa065cef7cc0d1e6021145de7d0d935f201f29f6dbe6ba SHA512 a6e567ba8160a0772357cd7464638c510c4c31fd4bb802a0472bb9b1dc0949993b6d18813bc46c5b662ac2cc251f46dbb988ee51aad69500611bbb2b75b4737f
-EBUILD importlib_metadata-1.3.0.ebuild 1087 BLAKE2B 10e14b865623dabaa7cdf12d5ec40a3af4a637706769273dc75183c706ba6c2397e704ad2e42d84972fa065cef7cc0d1e6021145de7d0d935f201f29f6dbe6ba SHA512 a6e567ba8160a0772357cd7464638c510c4c31fd4bb802a0472bb9b1dc0949993b6d18813bc46c5b662ac2cc251f46dbb988ee51aad69500611bbb2b75b4737f
-EBUILD importlib_metadata-1.4.0.ebuild 1080 BLAKE2B ea2268dbf02eac4668748e89a95042f8dda276cc7da1dedba1d3995c8c4c474b2803e2fc3fe7e060ae0393ef449535a53d0a365d34f2c662126833ef9b9d6aae SHA512 f18cc1420679cb859f9f423f0a156faaa8a082e3c5916f093178b272d2f3dd23bd9140b57351bd0b038d19aee9712be950de81873c5b507e443038fd68fd38f6
+EBUILD importlib_metadata-1.4.0.ebuild 1073 BLAKE2B f0be263465f6b9e271536e813dcf5b600e7e2f1f39a74f902e097bfa18d512e65e8b4ba2990377a23f61e4ba4dc5f84176f504d9ead0182a317ff4fe8ac17ae3 SHA512 afc41aead2f3d992a1ab4907d61ab329421297ee6e931aac7a3e641fe43d0281cfc449eef92cb4c797325180102260261eed5811f11f9597fb352a4c7011f470
+EBUILD importlib_metadata-1.5.0.ebuild 1070 BLAKE2B f6000f6bb662322a197661ed469e14d62936a63174375259f01ec6db73d526adc6a2c99e5e1efddfd03d4f07ee0145f7101ff464b8caf7a03e5fdc9ad454b298 SHA512 afa347d2336b583defa81393b0977cb2de853a72df4d6e046debb1f9f190877c775c182322bf26baf13b2389f2a93e0312f4f384c7624bfde5528563d23fc1a8
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild
deleted file mode 100644
index 62551f93f380..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}})
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
index 6c2b6ac13254..5380bcd1ddf4 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
index 62551f93f380..4ff78c4a4b2a 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
@@ -26,8 +26,9 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}})
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
 		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 6dd33e01997e..b39258c04427 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,5 +1,5 @@
 DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21e4bddc4aa80373dba47a59961183a77a338212500829440d216582ce15ab1412e9994f89486861297407f22eb989fa SHA512 b60ebc41c32f27da5a489ebd76c7fa1707a5a38c32097bfab20f355a86b490ce21acc7be157d0309a30c63b85d79f72f850587d1449110bd1a8075ca3586db5e
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-16.10.1.ebuild 592 BLAKE2B aab41c2c83b879ec2ccec28aaae5a2120bc2e88d245324c47dcfdd62a6fbfa56e585aee932a82751735b455a0a803acdc2d924f21cca98ef7673b897b601f746 SHA512 cca3f0494dc1527914bcaddc74e344ed0e0941df7d89fcbfec27dae8461dba4ba648fe4831eaf1c0ccda4c942a8a912a78d9ca7c389e2b2f87b2ebf92b016a59
-EBUILD incremental-17.5.0.ebuild 585 BLAKE2B 8fe806e1f30ee71b9aa026c8a4c024effed0e7975cbdd7e3c0b85c6f98a9366c0589f1d0608669f05e904e657c74da1534ef0d1ef3ebfe7bf2d8cd00eae88245 SHA512 b4cb8d7d9cad9db8192ad2e02dc501aa7a82d70cb555c0d1cf167da7ea24421a5866e799de3736e7a752dc362c1ff3c1196fe7ff14edcf7f469d973828a83d0d
+EBUILD incremental-16.10.1.ebuild 593 BLAKE2B 533c2d3b8e51796ab5f5639be608377ba8658027d4cf3f7f47a895380d781997879ad7318d7969cd4d415517cd675afba98904611329d4541917b2f83423837f SHA512 a053f68e0b0cdd60aa22c86d21add1cfaeef03b44031272c22d71f466a30ab554d28bef4e6bd376ebb547ffc661060e8183b8c353119d61c1bd69ffe58cc4d68
+EBUILD incremental-17.5.0.ebuild 586 BLAKE2B 89bafebe67a7e9485783a9c2a2d2ed38085d25deee60a443d10b531a3947485f489c55d79db0e7cebd592ec2b8f736d1c03f30f59108fdebda99186e192f0ffa SHA512 9a9fa0664e99d73b16441f6d944f1860c216bd1f6ab74fd86be5f2350208b004f726168a2b1b01e8c2b562e1d0614d084aa833c92f7043f5943df1ad7fef4037
 MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index b2ebcac74e2e..d9efd1c386c2 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index ec2f39623fe0..d6fc6b78a31b 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 #S=${WORKDIR}/${P}
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index 7feb023d4d03..7132b5257c78 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,3 +1,3 @@
 DIST inflection-0.3.1.tar.gz 12943 BLAKE2B cffaba9dc22444abda6cef04bc7dbd420abcdc0edca5c13bb734edd72aab631a2b50d3c37f9bd914cc8956f8afe951734db764bcced9e0837bfe75a90c527f73 SHA512 2a69a6228f2d44a5afecbd3ef51a51b4d5f63f69ddc844f4abfd6f326cb25c518403e8c5b9f98589885777d41d8fea31bacab3a5a3ab80db411960238d2f49ad
-EBUILD inflection-0.3.1.ebuild 884 BLAKE2B 9971a5c87e4885c70836c4f35bc2a512289eba2e6b430dc178bba31f44fb083285efe10db629e6bcb69a007ac72421c0d0c7e0e4e2a536de83f1857372d567be SHA512 6b8ef91f4f8d146fff7109e2a5dff36b912f93f8e37f53d84406934e4ff54bd3948b98cadc75a73da73f5ad3f749bdb12ad6bd427b9a4d51281e59fd1a898f14
+EBUILD inflection-0.3.1.ebuild 878 BLAKE2B 354ebcd50afbad7db6bd4be045f6bc9c9d8a9495785abc45f92f29c74b33b63cd32163b14d724c57d68f799d8b16ba3ce2cd018407cb0d0f76542dabd21b4037 SHA512 56930b13ffabaa2c15d48a17f88adb6ec75529d056ea387ba40686725dc77d6e6fb81bf685bf8e723a9b52b529133fa4bafdb0fa3812048a584b38cf671bd702
 MISC metadata.xml 444 BLAKE2B 8127165e52bc2ba190021733ea594cf8da0bf3f2d878fdc191cda3354d2093c239cd5bd7fffc0c2bfe3055eff103da4bcafefc215576a28cb83e852aeb43cd57 SHA512 2175dadc52b8a381bfcbcd3a390d99f8582aba44870c29f5addf25880df9336d9bd16bd2120ad283359693fef2b0e65b7cae315fe17f042c17a512ea0352c352
diff --git a/dev-python/inflection/inflection-0.3.1.ebuild b/dev-python/inflection/inflection-0.3.1.ebuild
index 512a2d3f53cf..0d2db3a146d7 100644
--- a/dev-python/inflection/inflection-0.3.1.ebuild
+++ b/dev-python/inflection/inflection-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 358397ec7d66..23e529d7fb93 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 872 BLAKE2B 033bc6d08735e612ac6b18d29126897fee8f1754eb6d772cb1d5ba42d67565e0205cd2e5d3c33ba3169019c02762285b13d2e90c04193783582a1e5880367545 SHA512 5b6e93a9af5619fad78a52deca30fd2c38c0e65abb6bcd1a2498736af34afe3784cdce06cb8f9b36588df6524a5901953ebd83016f97d67f7dbb220ad8731483
+EBUILD intreehooks-1.0.ebuild 862 BLAKE2B 982e3e6dcaea8f180527cb2bb53cf7885dc0cfae4a097d5abf62e9983cc10028de1241e3671c5a3ee1170ec55c32fee6a8cb1b57c9d18d9a14be751421fda43e SHA512 b00c5510e6bee1f5347f1b3314869391276c3502f153b7df0405c37ba1fa9049dc05f9306c73d6dcd3b3c937f25a51fb15a59e44ff281c46fa9b1a30c9f6d1a1
 MISC metadata.xml 396 BLAKE2B 8d8701c70f58552593bad0d44e6408b468d08af5d9b9bb6a2ef893a76e1f63abf805d3398780d696f97cee05f6309952347c68a9e3a7e50024ac4c504a082340 SHA512 a683537e004fa251701bd397f45f00a79cd39b20a94af709893c571066ceecd2a4b120641454a8311c6a12fbc9a7c8d1f6df3050e900db393a17b50e59e79274
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index 1ba877949d30..59f3292ae937 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Load a PEP 517 backend from inside the source tree"
diff --git a/dev-python/invoke/Manifest b/dev-python/invoke/Manifest
index bf7cd3f43832..320f0a45e7c2 100644
--- a/dev-python/invoke/Manifest
+++ b/dev-python/invoke/Manifest
@@ -1,3 +1,3 @@
 DIST invoke-1.1.1.tar.gz 311831 BLAKE2B 2918c1a03cccbd90be6aa495206a2714f45c9690d8ce1b063adc0cacfa4c7accd36dd94863a83e9cc0c05aaf889bd746c3f528fad5af0db9f64725438866f81a SHA512 2dabf88428a53f244cab45cbc073b3a91fea5dd97a7590a58701a32bfaa14a4afe5d6a2e4ff4ed03ae38e1dfecc5a7c0f811bb18313e0af1f4e116f56c5e9ba7
-EBUILD invoke-1.1.1.ebuild 490 BLAKE2B 057411e8321b2ff08b2fb928c55d7370b050abf75290e940393dff1836e2d9b7255360e40afbc89fe7952f9e665e7247991612d7cf82b4d4befcf40b826e2f7e SHA512 416058c854be12b693a1e99ab6a2636d4e054a7fa8704fdc99ed271a6a8f069b9d84dfd68430e6006a1356ce7b90c17f7571534c255d2a0ddd57f27afc07de0f
+EBUILD invoke-1.1.1.ebuild 486 BLAKE2B a295b105c26dac1eebaa90be0de3d0d591787f1247f6761af35830271e2af7a3d6e1a40902d7cdf634bec6990bfeb0de623505fd5ecb9bd3b8dd130b912d4943 SHA512 f9e0fb21f69706bfb17f6b9b18793d31f59f835d610d28b1d2fd4a742e08e8da445fcc0d8c7c5b62da91e7547438988925f3688cb525ed2b0068b6ff1fa248ef
 MISC metadata.xml 438 BLAKE2B fd7de2d82839646be57042d5db8b2d4a27f9e3f16bad202dc068d2eaf590e04952003d67614c98554c631668c0c31927a7e3a4f73ec15761a66631d01cf6aef3 SHA512 eb37fe7d88bec1255f2579bd9e60054b887c466984017501327a48a6a8ae6e3a3b3b473c850db94b0dda7bdeeb63b8c60e0cdae041fa034854fb68ee416fc9bd
diff --git a/dev-python/invoke/invoke-1.1.1.ebuild b/dev-python/invoke/invoke-1.1.1.ebuild
index 7a4b48cf5db4..76cf2bda89de 100644
--- a/dev-python/invoke/invoke-1.1.1.ebuild
+++ b/dev-python/invoke/invoke-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Pythonic task execution"
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index f57b4fecccdc..8c0b947b2b22 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,4 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r1.ebuild 707 BLAKE2B fbd71f4bfda0cf7723b3f7f0bb456a5081d5524afc85966607571c4c54b39555534bf068c88706ff0e0dfec4f2811f6154d9a539d676ad52d7ea4721a6f6db98 SHA512 043dea17c13e29db3efc4c60a632e672f10221a64f52b13e9d9e347263e8dffea37a1dda09eaa94bbe9f2f8354f9f673c0433c9b7db71b6539c2ef6c39bff89e
-EBUILD iocapture-0.1.2-r2.ebuild 676 BLAKE2B f47db82ea288ff1a7c69ef642a271271bbd20f305be859d78f3059478dc5b1059663a3d50d9c46bf28762b3d5f500271c725b5b47c826f19cc85433cd3af3d5c SHA512 1eec0701e1241a65addc55080a10ba66551d1f053c2b2b96502b8e71b1c2d780f7423db588bad627f8006da9b509c68f68160d3a7dff1f2fba96bbff7827bc1c
+EBUILD iocapture-0.1.2-r1.ebuild 701 BLAKE2B f30487c77532e1b8043b4b6bd13016c9940cd7e7376b395eb4d491f902eb209131aa7d2ca1a4007d06e1385c021655f2182a8b5ecaae0ee3ca4a11adf41e5157 SHA512 de63d2689515173304f5f88fcd5c0d25ee5817eb36ddd2a1c12e440902ad7567de63430f20904df35f97f2b0a8e34083b8e1ed33ba515b17ce062e21b377d256
+EBUILD iocapture-0.1.2-r2.ebuild 672 BLAKE2B a7fc3277657b521cdc2458757afc870d39ea08f2e67f84d30cbba48b668b261f53ee6cdc6dededc0220cca394a66d7aa7b2d02aab9a9c7f8919ff9796989537f SHA512 77f4feaa8b630b8426ada77b7bd99601434962dcfb93bfe765707261559a42b5bf773258fe0379df93c015907a06f33635b40d5a35a52fb662c19b8b85ab269f
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
index 23a082522173..fd39e0ddb932 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 5108a5a0bd27..08544c952fb8 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 6c9d9d7751a0..812e485678d3 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -1,7 +1,7 @@
 DIST ioflo-1.5.0.tar.gz 765559 BLAKE2B 56b3e26b6155cf8fbc5f159909d3a82a6c9b47251c799e4f6ef300015d0b55f54882e26534314fc3c04e20248aaedc9a35a1ff1c574cfb5dd3d1f7aa887340da SHA512 114dd5ab3ab5bbe66be7e639c2018256ff1c8ab18ba73931733dbe23c8f65631fd630f278b0a186303e288a6f49cd6df224dda462973cc258b3d07114e70c991
 DIST ioflo-1.7.4.tar.gz 834916 BLAKE2B 241026d18f8caa6acc09f312a285a3f824128d6018ab19a8704296f916514f7795b8f2359dcf46c04d01735140a75c980458d5589d72de59fc73f13c59b50b14 SHA512 415b43b66c1be479e8ba4fc993f180418f95f1ae0d16ff8c496476da7a04f6caa0f918a064c60034cd926f4f49c1112946b911b57339a76ee5b0d2564ade224f
 DIST ioflo-1.7.5.tar.gz 838342 BLAKE2B 2eff6af7586400ff562999679b861079184757c951e006d2f300ec894dd17fa9c2ed975781109f6d3bd2cabf0e038ccf81d9f9aeac742313eedaabb59b5a1c82 SHA512 886767d72c4067727d47652fba157a76ecd8a6a5478a761feb3923992ffc585addfe892027ade104c5d44a56fd1645c0548ce3b554553f58e1104864c359470b
-EBUILD ioflo-1.5.0.ebuild 476 BLAKE2B 714ef0d66796dc3623cd1c5af6a6d184efaaaa18444c1086ad01d62bc962fff4f6f4bd5f00caaa0a8d381ffb9a8a078cbf1eafdbbcebc13a9d652faed5640efe SHA512 cd285b901a283a094da35e90aa7528ee137e410ea2952335fe495a672e7f6e3f7b0e6515c4e57d3a811727d10695982c5d996f68fa37f7ab85310cd28faa69ed
-EBUILD ioflo-1.7.4.ebuild 593 BLAKE2B ee86a4acdeb00a6a2675c702cd0e8f40e445b1f1e0cf07c7e1a211feccf40f98e029fa46f8495c408f9dd975d11302d75632742b9aae2acf118e9ac83adb160f SHA512 4a0b76a61a75c07aec4143e919829645e3a7d23d788f3f7a48b1926959779f80c78bdcd1cd0a640a9255989e3447698f4072e3cfebe5c06694883fa0fdc9b89f
-EBUILD ioflo-1.7.5.ebuild 597 BLAKE2B 4270ab847f07d57d15a8a0c66a95b4281dde94637305c16ccb53153bbf357a01852cbfdb0b7980f334ee182ffd6ebc00a9f224caac5bf796513b69ec1d7b4274 SHA512 5599b2d263489cccd828386e5cacdbe403891b51b0d21188bc1c8ffb09f061b883d9e9e852632f946448390aa5b4cee9b8a527908235ce18b04f90515f1ba16f
+EBUILD ioflo-1.5.0.ebuild 470 BLAKE2B a45e9867e494fcd036fad4fe5755569acc52bf7989000052f7d73fcfb6146d3a75da2f3d7ce638792eaea5094eface2c4ad72eb72ff3d5aead4e820a862ce675 SHA512 9c17c54f95ba213a2cd94e92a332cdd115b19e2f6b1847d5ea6e59032c8838de2e8b0d6fbbd5a97f651ddb8cff163ebb5a0358517519caf810e5e44a678fc423
+EBUILD ioflo-1.7.4.ebuild 587 BLAKE2B 9ae56931dc38ab9cb82859c573b0a8230b7045b94868ddf805cb8a8a3e1a975f5a1b69c71ae04d5b370625642ee15e482ef969c22cc00472c34a7cfd9eea1fed SHA512 776519fff1b651bfe4fb67812a72752cf474a02bb5688c2ab6c4ac65885b94a6b97998fe0db7fa8dac54ed7fb7d9de6b9f2ca576b9c2f930badee31d688ece58
+EBUILD ioflo-1.7.5.ebuild 593 BLAKE2B 4cf81fad799b152a22e3462eff73819706034c2217607be7124d02a348f0713a8c71c1113c654dff333de15b78bb546374729589bfa51f1bbef7b472baef0192 SHA512 4c8130a4bf430b41c32e95a7ecf39c03ad4a079a72eaaa36c84b069e21e055a1c14a21df8187a443f515eded8e73a95e9af29b4e8ae71a99c540d50bc5dfdded
 MISC metadata.xml 442 BLAKE2B 26c46608c3b6b62389b07f8a089a0dd6ba91701b3e18758d39a82980a16ce7fd03f4a080e15dc37006919904764a4fe9ce31183d31423e2c177c7c154d2cdc0a SHA512 8d6a727c351749f21566b4085b2355611b40e7a962e99d1a0e52d19d96f3d64db66c17ef01d08b82b4031bcdc637ae0a074423fd1eb92323334d6ee36d004742
diff --git a/dev-python/ioflo/ioflo-1.5.0.ebuild b/dev-python/ioflo/ioflo-1.5.0.ebuild
index 207ea5e6768e..19f2d25a701d 100644
--- a/dev-python/ioflo/ioflo-1.5.0.ebuild
+++ b/dev-python/ioflo/ioflo-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ioflo/ioflo-1.7.4.ebuild b/dev-python/ioflo/ioflo-1.7.4.ebuild
index 96666ed9c415..adb41b2ce910 100644
--- a/dev-python/ioflo/ioflo-1.7.4.ebuild
+++ b/dev-python/ioflo/ioflo-1.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ioflo/ioflo-1.7.5.ebuild b/dev-python/ioflo/ioflo-1.7.5.ebuild
index 3a203487fa98..7a3219199aec 100644
--- a/dev-python/ioflo/ioflo-1.7.5.ebuild
+++ b/dev-python/ioflo/ioflo-1.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 inherit distutils-r1
 
 DESCRIPTION="Automated Reasoning Engine and Flow Based Programming Framework"
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 7391bc4d9dfe..d611bd9cc983 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -3,9 +3,9 @@ DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260f
 DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
 DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde7a03f6389fed2a83d9210dc8f135026d931b2ddf408f5f465b37861c9e998ae2eaac782741a0fa6ae07dd4259c7 SHA512 b0b0bae50c0819c46554f4ca2d14403a054d73cb9df7efd8bde03bd32b7599510a0e8eb7a63bd7cc6af45a035a0fcce38058b0625732472c7f252f72b88a6084
 DIST ipaddress-1.0.23.tar.gz 32958 BLAKE2B 96f8f3065aaa082c67c5468598e78bf928653588333f8f96c47aafea30c6aa5e3abf419f98e6388b9791a8f7e679f7fb31f36bb1d6a274a19b0e8ea434a8cbc1 SHA512 340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e
-EBUILD ipaddress-1.0.14.ebuild 609 BLAKE2B e38f982db23fa58da8882db6384ca7d12434ebf725682b5fe7d8a72cbf53b720378043ccdaaf5ffdefca0dbfea515cc44a18c2092f3f6070db57cae7ad7d8788 SHA512 e9ece8c60b7a56ffb104810a48f31dc92cd64c49117f28095eac181b427a79a4b3a82706a24ccc42504ffa37de8dbdca3511823c852a3df36d872d66b8e44743
+EBUILD ipaddress-1.0.14.ebuild 610 BLAKE2B 85c4ca022a8c7c2c3e67e5ab2b93e97ed0d7c9e04411a074f004d8ef883a8cf248a7e4928e6bd6c41eeee258447548442f600ed55a89a5b16e69243cb520a5dc SHA512 633b28ed71393db42eb4748801e1b5a3ac88cd9f22b04b999a8af03bb39fc175401e80d53550b8f3996364c23c7c892b711d030bc7e0bb69ea0e3ed9df0ce377
 EBUILD ipaddress-1.0.18.ebuild 636 BLAKE2B e6cbfa00f070ec144158f580eac46bf119a5eafd8e58e8486056a682483bb3a1ef9d644a99a885b8292d6c1b2f1e75b3ef7a5666fa1f8f84004d7141fabb5612 SHA512 627ffe7ee6ef48205499dc312761544edc72fa69a1de8bb020048de4176435d2b4e908730227e16020b646ed86bc2c5471ffcf7853c9af2762cfbdd95e68132e
-EBUILD ipaddress-1.0.19.ebuild 649 BLAKE2B 6e50b2efe2054650f90ead390f51a46bf96ed3cfdbb2d3eca911a8c416f73ac110dd0ac80e51d5ba2719c34ec2d7b74491b64e15ac8ff314535d90a642f75631 SHA512 37f9603f549fc95daa45c381d16fdc5f54964a1aa0e0331451cbb792269645bb651e71b56f2acddc632c1ec89bb50fa74020098b5f70698f2d38196f2845a33d
-EBUILD ipaddress-1.0.22.ebuild 715 BLAKE2B 7610440fc2b625093623b268b2bab6794b965fa9e195d773a9b1e125be613f2a743faeddeaa8dab9e8f67191341e3c9574849bb6fabbf17dfe0f3d127ca5e015 SHA512 6776a219c12cc5c6c61b109210d3463afe76184b90e7a6304a2f54ba5d72da82cdd1603449c2e223ca91912148e69698d45af014ad7d6405a5403064760a37fa
+EBUILD ipaddress-1.0.19.ebuild 650 BLAKE2B f786cc0a5e828b73ccb09fc5305cc59b151f21f3266e2bae1f4333f6d727756421406b5dc75461183a1a315ddfd56460ea08833bc2611ab5d3882a19c737874f SHA512 8f696747afe616747e04ae12ea158a164e942e1a219764b29be3b6af9203f861b62925caba4161a3258b2ed108fd2a3c25bdb96cbed08f735944ddf8c1671301
+EBUILD ipaddress-1.0.22.ebuild 716 BLAKE2B ca40b3838c233137ff7ec96bfb6983b3e7c615d8d24bc2b75af4866bc72801d1efd2b40f094c9924c27b562923b5b822b3d0ba325933f60544fe2be3aa4d1f8f SHA512 dada131b4235e24b6ea7bb506c3ccbca96b7c8a4039776130f3fb097499132d62ac65f693ca8ef339e4511250f49eceace7675164c345a92a72dcb05f32c3039
 EBUILD ipaddress-1.0.23.ebuild 858 BLAKE2B b82a8bc81d5dece59c10781cabcdfd76592da9247df14c0d4ed9ad81ff80f90f9677a354ce46ae7336fcd34bb8436c0b01dddc7adb87c8b36ae351bc551060d7 SHA512 648b235ba6321177c2369f051f53f17f89bfa86a0c588f2b329dfd6e780e4227bdf4ea824a9263fab0c9977da3bde6abceaf4ca5a5badd0c08ae7506c183a158
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 327a2f64681b..db04fac221f9 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-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=""
 
 RDEPEND=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
index b4e3574c2228..a70e7174c58c 100644
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index 06388262ce35..ef4b016f79ab 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index b2b6d51c3c0b..5e3bbb893c88 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,5 +1,5 @@
 DIST IPy-0.83.tar.gz 31816 BLAKE2B 89ca11d292ff3ed6f633aacc2c689e710c5ed43ada32e75425f653bfe87bcf6eb777d5ede33133362833099e51b2248f5e846bae82b28a6050500f25679ddbfb SHA512 6bd69d96fa77dc4ceaf119b81c19a524b871badb37665a763a055e1c8b2ce3433c6e9534f03aa64d02e559dca2fac2c4e1d09b7fd78ed79c0fded88f803ad2de
 DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
-EBUILD ipy-0.83.ebuild 1068 BLAKE2B 4e88507b78dd89be810b5e6e3820fe1d294fd67f1e293349291eb8721e88244a2648f332e502b75f335b8910d4600cf31ace92b2db8e243b65d4bc877fc91b6f SHA512 9d17c5a8f1d511d6f08b6051a15abc24062d05ab642ab54b62987b3fb3411248cad9edb9c44ed601411d1b95f05a83a0d1104ee5bbc7e0019378203875e01285
-EBUILD ipy-1.00.ebuild 1095 BLAKE2B 877d05a21a7424a19bd77333c33caca64a5be98dcc33955e3c43e42cd26fdcd29a5afeebce7212b8556bdb02defa21c72b70012e4fffab845ce05e13bf57e07f SHA512 5a889eec499c03f9ff7a9e77488a9942784f3f4886602cd7155823469d49564c3f544c85d4064df9017448a593a0a4a366699914770980c9e5f386360dcbd98b
+EBUILD ipy-0.83.ebuild 1058 BLAKE2B fd29c552b9dcff840c2c9eeac7e0401d08de9aae28db5f05138a37c20b4c3ef395a77c3162387655e306cf4692410b06081d0c3e8fdacade120454ea1d9ac9a2 SHA512 b17d98b52072d3352b8e86ce350e5d60fe7b919881f5d3c2e1e70bb69f3115784e9fe9c34d8c6c5d65ee03f4905d8e3c90903f545ad1314b5f5329cbb0b60494
+EBUILD ipy-1.00.ebuild 1085 BLAKE2B 071b877b61f9bb3862550094595fce68550babf043dcc5cfc7d60d8719011c7997aa87c17421537e30024de6be53135634665344d38b3a385c8d703ceee50f29 SHA512 d132a1cb4b8eeb00a9d4e8a10a2c8078d8ee9232fde9544ba498efe1f89582049b24a8acb248605e2ef145ee1c2bc9afd41b22e88f87effc09293169a64c8f13
 MISC metadata.xml 374 BLAKE2B 89f26050a20821b1ea3b45177a02c91f3682abd65aaeb775bf6d03688a37a6fe57b8a47037ffbf1f7deea7ede60fc1e3c95b74b76f8be28afae73ec87be5bfcc SHA512 8c12c38a49ffef811e6107d003f44cd8174bc95fc71dcc3296511e3356a0203cf12479a36c7d649f1933c6a90820c3212de25166b61eac8de06728cb8cb25566
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
index a1e459131372..7ac7cac08ff4 100644
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
index 42ba2236d026..3c1ec65b3a0a 100644
--- a/dev-python/ipy/ipy-1.00.ebuild
+++ b/dev-python/ipy/ipy-1.00.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index f3e1dcab5091..e5f58f44d410 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0.ebuild 643 BLAKE2B b70f3de80f31debc2b8cea8962f248d2d9263f688b364c4151165c30ad10de1cb938b6907e198341ba81d57aecd7444ed6ede5ede37f53bc020e1cc52afcba1b SHA512 9eedd0464449bed3a6bd527d0453c8edcc01f88ab6c053b6f02128442a9ff2b73f18f0de13ed716d891e4679a08aa6ac0d28dadbeaca3597d26378698e796276
+EBUILD ipython_genutils-0.2.0.ebuild 633 BLAKE2B 487a65dd1025cb6e3672257b7d03d9606f8fe42aaf2366f3262e9db8f95092e0ea1c632a7a51a9a7ee6d7e3f455c197a8d68f9046ba0b5246813b423bc245e93 SHA512 2c1cf901f04ec51b506a942c2c85075f1c0bc352e87d7317a0af3abb294e54971fddfc49d171fdcb916a1a5b1c2d90e6ead17d22d00f7de8c09414fb1480b05c
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index 0308a9c4a088..3fbbb3d68c8a 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index f60f0d65953f..6e636e4fc0a6 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,7 +1,7 @@
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
 DIST irc-17.1.tar.gz 90266 BLAKE2B bcee4710527d718c43fd836f36c48af4bd3b92aee202b0197be710ffc249b3b24d6bfb4f092a102ba0789325e0322b23d65af3fd5d7aa45cf0174d278b5d5282 SHA512 8c6a7d1e302ddfdb86808fe422f922a4bf088dd2890e5ca7a924ca960e603c78e9aedab202c895c555e3ad569e6be133aff652e0a374a16e3ab165100e6fecb6
 DIST irc-18.0.0.tar.gz 91529 BLAKE2B 91e7f9fe38b46f836eb902c8ce4ca04706e673a8a9372c743e9b6be3b400e4d84a0d841b72e2b8444e055a69d37b22d48fcf33c7bd51375dbf0dd4a06b3ed5dd SHA512 a424f1261a09246dd2cfd0b717d4fd9bbeab9754d1f480c870c2e131354db85268bd010ec6b7cf2c59a0c32057bb290ef3ffdcb30cca8c0d833e1497bc89f58e
-EBUILD irc-16.3.ebuild 1700 BLAKE2B a8975570c31d232e5e9bd40f68a887ca5f69bbdc03a03e05b805f053507b1c47ab19fd4f90ae78762f3104b457500986fb736766285789e06b7d09a7ac6bd12b SHA512 d377ff996ce35f5b8f7fd77e1e08bfb84e5f1b25d6f66b0fb5e0f28b74e4d17fc1e542d6209b1daf3ba6c0f89db8ea3715c4eb235d8982743baeb6ca79be7ef9
+EBUILD irc-16.3.ebuild 1694 BLAKE2B d4812f3b09369a3d6ee89e034f9433b59f87f2bf87f415c7b5f1e2389a7097a48f36f659c811a939ed8059cd825c45c0702503b07740def9e0603967c36d5dfc SHA512 6f6d8f23e945703ab76ec23f1f6958113deab9f3a0575b73b8aa6dafc3fb51fe181d76ec05e711b8015ef00b2eea9b89ca6dbdc411938e7b5bf4f6724bb0285f
 EBUILD irc-17.1.ebuild 1713 BLAKE2B e4a88b51c44a7f1ffa5400c415af52d10a9eab3563a817439f11031a8d7f2fbcd2431bdaa4b22e5116fc2d99386e7e5678ae1d7eb09d395bea2adbfc8532cafb SHA512 bd890c2e3cfb6e4d91e615cd9a556fcc574713838bac08994a32b950327a4dcc179dbba064393c171d1535734f71f89a116f32577e518f6112dd7ef0d20e3f35
 EBUILD irc-18.0.0-r1.ebuild 1686 BLAKE2B ba7de13db747de4ac4c6b590831859eb2b51240895cdcf03ea3a6028ea8a38ab64562cf401816b372cfd338b935c497191292af26b303b96d589308b5cf37057 SHA512 3768540afb7e2f5b72376d93bb3511e72d48f8bb6813508f4bbd8d302e3691a12ab318990dd41ed2666ab47116a1277c6bffee2f34e306b8a56da90851c3b327
 MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
index 9e1351a244bc..f917dce5e7c4 100644
--- a/dev-python/irc/irc-16.3.ebuild
+++ b/dev-python/irc/irc-16.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index 96fc2663e34f..e32040c12fc2 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,7 +1,7 @@
 DIST iso8601-0.1.10.tar.gz 8405 BLAKE2B e9831b9a4cd8a6fd8bb1717c182f46250017a84efc3000484a395ea2b9353a279d0087b7ad8b5ae5153b767a69992650d62efd25c71a0967c217e09cc6cdfa77 SHA512 5a3635b3daf6c5ccfd0dfdf47bcd60a0841c06137b3ee334ec024909fa24c8fe4a1da1fa253e0a5dfaca173d4b10dfd994b83a031b2a0385406ca92987098168
 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 758 BLAKE2B 2eb53e8fb32bc88e487c400e78a65a12cf81d4a5265641f024606732c3b2e509cf9b701394895798e10e0a2eaeb1764a841e0b40ee708a8f8f1e44c733a76bf0 SHA512 803d549f74b362bfbbb3987172406d4a147e16ad12bc78915167c59cb240048a76ea4b548cb6d2f2b4f2016ace38163933635238ddfa646e11ab0df6b3cac6c2
+EBUILD iso8601-0.1.10.ebuild 759 BLAKE2B 9b0029acf652d1225cef5d9b62b5327e6221980f3e84d26f4c1c5dfec6ae36e4ba5961a7e3486cb5e07802d2440e265bf0e199ae468fe9048e504439f652e572 SHA512 f92dd658480dbc7f5711cbeb2a039dd0164b51eacccd3ec035c63703d14e41dd1b785906c1c0795d7ca4d5638b3a412178349b0ab02e098dfad73fd60c597a57
 EBUILD iso8601-0.1.11.ebuild 768 BLAKE2B 7cb2ffb076f7f714e8146b50f67148ef4bbf194967c4cdadcb38232f9a6f8acd9b2a2daa836ffa75aa453676f70aae59d68ac80a170f84282a7aff9f1d46dfdb SHA512 52c304379d3782abbd74e568d6a7e9cc989f6248d30010a6dd4c87c50ad7687f6ce001b759482f66f89a25e34821bb92e08a75de9989a135064db13dd2f6f9ae
-EBUILD iso8601-0.1.12.ebuild 607 BLAKE2B e19905e0034ff361ab4f2442dfc4d42432da785464b72db610a84500c02557e94a49ac28af7d3e779531bf28be25f28ed381c6d4bc6ae9bc63e0f25017be8192 SHA512 564b721434700893bfd656d5df15d784405ba8b3d4f43cdec4a59d3522f9247fb3c7f03018db33a728115c4def205ed59da4dfe83ad12fe338693c4d999d3f8a
+EBUILD iso8601-0.1.12.ebuild 608 BLAKE2B e7e7bd22dfd0a4a97644b6bdcb73ac11564ff9a6eaa779a1a82af3979f46c0dc16bf8876dbb0aee1158d5bbabe785fd09866150c26ffedbcd22bce9ccdd0fad3 SHA512 e4aec015030485e394284b4e0a837f1c083df2e34eda9ecf48765d48d26841c0ca072b91fad8c7425b08d0f09e37a31479ffff01d5656276123e91dab801dcc4
 MISC metadata.xml 334 BLAKE2B 5e73aa36a751a0547b8c8d39ef2a9cd3c9b4b5a41cda2e4ab47850fb4ef86fc4a9fa0f819329409b6fa34dcb031b38cf2532bdd33b59db85e61953e08b5f03de SHA512 70d83069bca1f66a6229800c51a0f8a5081a23072eb9d432e07c9945500899f769217ca989de90886896371d5f7d9a95cc976048035d1d6d615fe602ee471589
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 284460ad47ff..b1352fe280ee 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index 6cffc56c9b80..b3aef30c2ad5 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 341c8d88cc59..0835ba9ccefc 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,5 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.5.4.ebuild 622 BLAKE2B 87c69b5585928bf370cf9dae784aeb35c4eaf65197b4d0e35e50edefe50f010c7bd2cd0ff11b74a54e56c13a3b7e8acd7f832834b941ff3ddadcd69414669dbc SHA512 799ca850509ad983f87b7f58e0acf8bb17409fba133f3dd0578a69ba4d9b825b80f4e7dea67337010b49531ba2494d4a348071e22940ff3c5fcf09322d08fd32
+EBUILD isodate-0.5.4.ebuild 623 BLAKE2B 8d2bc5c72d237b6e9d3668153c2781627cf090c1e753cde48f2236019520f6ba7866f79185c36d4b8679fa910822876991bdaf01c4aa84af1ea082b606971ef5 SHA512 7cfd1f3841e1e3d2c1fbb0af38a6181fa29f61896e45986eacc4731778952068fd6c7765b5c8cd0628f91dea811d34de2af879b65b536f30fe323acb757afa9a
 EBUILD isodate-0.6.0.ebuild 738 BLAKE2B 72c9ba75969b75ea3427a487628ced51efcf8312bf7b2876169b12619ec5da1413d0a7d8a042c482fb5deedd73159c3cab687ef4b6784d7e0b3e1a43d42b5207 SHA512 1e065ba0a73f7586c757d58697c1e6173aed5bc75a8facc88e1c0fd361b517867fd623f249554c6952850cf60dafb761dd97e9fcf14d2aa6cded285e11289492
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index 245bcf2f926e..f9791b517fe7 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 1f299ff4ac0f..dba2b84d503b 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -2,7 +2,7 @@ AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e7
 DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
 DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
-EBUILD isort-4.2.5.ebuild 460 BLAKE2B 2ee2fd50ab4bf0c415a116d8da8927cd34bf70e53d08f5933c186d5a47b1637187f185945c73a89443ba2d22dbd8afd79acff210ab6eb2a051c309a4a177af45 SHA512 d6d2da0180207a5c243e9203616dca78a83f0520337279ef0127c979fda14993b2daceec5c09896a234d8b05e902b44d6e6227c89969920a1d3bd92a0c86e4eb
+EBUILD isort-4.2.5.ebuild 461 BLAKE2B fabee0ab83710838eab0ddc2bb3c960ddc04f0201e40de119a561522386e5d3243add10bc04d1aedf0ee294aab1c59876fcf2238afbbdc043013095ab572b781 SHA512 a53c7c31cbd0137ef75cba1a750879304d8f587fc4b171c8a840998e4d313ad9298d030103aa2cbf74d087df535f87fc59c850aa07ade3ce864a32dc868d71c7
 EBUILD isort-4.3.15.ebuild 462 BLAKE2B 63bac068380b5466dccdafcba4f0b1e39a83e6c290b6773c2d6d099db0a021a2fe312c03628df9177292a8581f5b82815c2b9fae0988616ca35833dc5f111701 SHA512 2144ca66ebd8f57a53e2f8bfdac65c0376580ecf2da35e03510025ea840c3a238ffd9b562a8039fd119e301353900056969223de135fb30bcffb0f5c2f258bf2
 EBUILD isort-4.3.21_p2.ebuild 826 BLAKE2B ef04ada9e6d6cf0ee294171fb523f420058276e0cfa124e22a396872ea2fb8f40efd27ea8d29dfb0945930cafc9d84e35af6283d8c0463faf0c016b6cb640de0 SHA512 27f57fa849b4bfa5c7102161b97b8aa763a9f74fd17773ef7178d69ca81868045f5dc90b420eec63f44f63f479e0e81ff981597f1fd352441b47e1f276cdd328
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
index bcb94479fbd6..88be3a1b46ee 100644
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -12,5 +12,5 @@ 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 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index 13ad1142ee0a..2e304067ab1f 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,3 +1,3 @@
 DIST itypes-1.1.0.tar.gz 2188 BLAKE2B 5b24790944b130530d4bb3f0ee266c897ebf7946a37133535622f823cc66bd2d2aba838170769b326d706fb123ccd1f4ed7aea8e877b9fe0a9d19692e0c9e0e2 SHA512 fbaf82a82e0685f54eb98bdea722cf9fa230881d1940e2a74306972eb9f99958cb0cc62b858c340b649e092262793b83dcf76d11d36d04755ecf05e7a2c77d81
-EBUILD itypes-1.1.0.ebuild 423 BLAKE2B 7a37a52eb3ec367983ba5c7921b6e549456a736b7be36519c1b7a357cf892fa47bfbbc8b0cbd7b3c93455bdb44da9aac8fc98b0b72d454c3953106b75f7c2356 SHA512 1def9267e3d87cd70d8e83e64912bf924976a769e3ca10671839b28679a312f08255fb6e2ec84775f561d2c0301397131a77d3c22a5d705611cb95bffc021b87
+EBUILD itypes-1.1.0.ebuild 423 BLAKE2B 75f52c4b1ea7eb167af4d04ae4eca6a1c25569018b791d4dbae54661a06b8ef3453567c4212cdae19bd86b4db5cbe71f24ec7c4f47488b8dce9f259d3b7fc863 SHA512 55d17e54537ce87bb0a75c56bcdc8739dcf3c3def62a5d9467cda344975d3d22f12196d3039de535e171d47681b1097cb285e35ec03a9d2fb66a30283208f4b9
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/itypes/itypes-1.1.0.ebuild b/dev-python/itypes/itypes-1.1.0.ebuild
index 4a4c46fee443..76e5dd50b66a 100644
--- a/dev-python/itypes/itypes-1.1.0.ebuild
+++ b/dev-python/itypes/itypes-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="basic immutable container types for python"
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 754e31d47559..f6e551f51cd9 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
 DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e46228c7fb4f47be90471cb7a2f85e4c5b10cabe47f1fc6287383b1184db85e5d286d219def3a5f5bfca10e354510d85bb SHA512 64fd3f4155dfc64152dcfb7970c26c7e3e098b0a8282556d17be2aeb80dcac6092b6dca11bf42cda268e0ddda67f2117704c81218c4b6511236e57b1f602da47
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
-EBUILD jaraco-collections-1.5.3-r1.ebuild 1449 BLAKE2B ce170d5cfd4158a9f20a8df0b29cd85c8fc9eadc7db083454725223c8559d8bc1714dfbb8cf1e66220ab1b92bffee850ac7b982ecec116505245082c17e686bc SHA512 7013a09df735a13281b0152c659eaefbf501516409142f6897ce0f9336bfc83e365cf22266740935d5926d4e6d6adae9eebf3899e5dfe356f64a0d66654df2e4
-EBUILD jaraco-collections-2.1.ebuild 1611 BLAKE2B b24f439f3ab2af4964c1ac0bd70832581d22bea7c1122b67e97ec76b78d9645fce37d8555cc641b79a5ccf67a0f5a3fc81b124c8c17d063ff851ec3df1c2001a SHA512 efc915c23c5e2f96f2808e1e4dc64d8973cc1a37ad4c71473f69e0de1a29094bbc71978a7e56941a2273598d40d74373b7f40ad6a7fbd21456e41ee613a10889
+EBUILD jaraco-collections-1.5.3-r1.ebuild 1443 BLAKE2B a66ba6c46757c6f82a505bb3a878c628b9457f71060e82ad33fe1a29582ca5527ee915198641efce0333b099a6e27e50cee6b4aaad524652246e932c0a9992c2 SHA512 4923dc53f863e7ef112125a4ab233f858492618a3ad04a9754acec15e12f691337e429570c9ded5677553fa0eaf35ea8ccfe25d2549004e4d25ec2e8fbe5a247
+EBUILD jaraco-collections-2.1.ebuild 1605 BLAKE2B 71bcc1d73d2c0f0dc841f91af5e7f7eb52f4eee14c00ae3e4fb5fbba779f32e3fb7308e70d2633c179654e07281c0fcdeb883f853a994a6ab6d96ad20aa78d10 SHA512 727b8aecdde34c9ccbb6835d21c2e8df8824de36ce358cd5cedc914b4805f3f14eb2c1dc5aca1b7c741ca8abe53a578a733ae788dc016c16e24ae5d4516050f4
 EBUILD jaraco-collections-3.0.0.ebuild 1489 BLAKE2B 0361148a9fd2343c71727b9409c07cf00c2dc4ce4976989b5453f64635476656a3b6eab5242b68ccd2387c648cacefc4b5e9e730c82deca1dbb397163525bb3a SHA512 165f5505bbac2b44190169d64bf9eb3c20bfdf4c6205152dc8707050fab763c52e37a424457cbc2aa7fdef0e62f42b6f6a95beb70b0ad90823a0fcb6added845
 MISC metadata.xml 558 BLAKE2B 7952de571c053dd631177bfde7fa4904e4b37fc2a7ddeb3f17fb917d69d95b0103c9498f7f1e698bbfecba8c2df86616e0c7999b19e8c2af6ec83faf97fca8d1 SHA512 cf21f33decabe788873863bb42136123eb0dbf12527e75ebba2d06c4cb9a1b2b6d8e3def46829c1471e27a5e6b5d7e681272fae9fd58eed36294f90e21a92379
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
index ef88383b500f..16373fd2e8e8 100644
--- a/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
index 521e7e3fbf1e..e91d3ae0e642 100644
--- a/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 3b854275e3ab..1efdf75cbac1 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
 EBUILD jaraco-itertools-2.3-r1.ebuild 1400 BLAKE2B 42d68930b42184ff5c3ee7521c91db62acce6881469a2fc6095beb8129b59b427d649d01730e82f4c3d8c35d88462742626b0d32a6a8fe8630f22bc9ce6216af SHA512 fac80eb3ab79ea825660d2de8cb5d5361f84ed7d811a178bb37b7799e7b0bf289888692f9ffd11af39b2aae9792f4eb6278b7b669bf974b4f5d1410324477225
 EBUILD jaraco-itertools-4.4.2.ebuild 1656 BLAKE2B 4c21458f3b12ebbabcf65aa3b2ae1c1120c6f7181fdd09d08157f1be773cc2baa76e9fc53aad929f488bb3170380163d2d0d3d46e7c9096522bb44b106b0d070 SHA512 e86386d409c8cf6fc56a9663e2dff7a85d599b061cf2b43a6c3a5f3e358ac6e50137555e907b55d4dd5ea4fe4ddc95cbb876d0f3945cb42fdea9e42e3bac4b93
-EBUILD jaraco-itertools-5.0.0.ebuild 1492 BLAKE2B eaaf8c862caad50afb8a17bbc07f4d68a4f5ce4dba74ce54ee30d556dbcc3843c656e5482db292f3a98192b537d1d63539fd98a77051dd92ee6e51ab51ef4a0f SHA512 4335628e851694feabca7429268f49e3614c6b9ac690d55582123f91039b9eddb2313f4499b1f39e2c32a541ddffd3650fe6fbb8d8ef9b5c6c0e79ae321fbe1b
+EBUILD jaraco-itertools-5.0.0.ebuild 1822 BLAKE2B d6d6b79ee798fe16e3d5496c7988948fa96cfe1dda34d764064f1899d3fccb5d4383956f7ea602eed8f39b57904e7b28d165b5989186a22c1c51c37129c15c07 SHA512 05a6cc4beb266e5163231fa72bf6bb09d6784c7e8368339ec29bc2001f9b7672e232fe19aa6869fc22105da7f21d07fd696ee7fa39175b3d89aaba3e2f2740b9
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index 427399b7651b..f36262075b5d 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# Tests fail with PyPy 3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -28,6 +29,7 @@ RDEPEND="
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@@ -40,9 +42,13 @@ distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 python_test() {
+	# https://github.com/jaraco/jaraco.itertools/issues/7
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		local extra_pytest_args="--deselect jaraco/itertools.py::jaraco.itertools.always_iterable"
+	fi
 	# Override pytest options to skip flake8
 	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
+		${extra_pytest_args} || die "tests failed with ${EPYTHON}"
 }
 
 # https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 780b74a9428c..56c864f82ccd 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.logging-1.5.2.tar.gz 7135 BLAKE2B 5235566df80008270f2f28101ab5df1d7fbc1446f138eb4cb851c9bb464b741c0ebb8528d3502130b5c557f30214ec27ce1ea563e09e78776e22d37811da21b5 SHA512 3299adc9c9ca6113198cddbc34147afe1bf453edee16a2d6bfcce64e63deeaff7f87beb74ff44f092435f3433a921b19167fb45778dce444512807357bce1661
 DIST jaraco.logging-2.0.tar.gz 10356 BLAKE2B a7522fa9895784a68c8c0af265ad5a82ba27f69e90a17ba18b4a579e1ca5785ad11b7718273adb33661e45e780876b885b581af1b4518ef5322c077ed76242ba SHA512 9262575c3071f78ded2284ebef3a1a80c8ffd60addecf9b215db04471672bd892f6c6bd06a84f9a82e872adf31d45d4eb3faa2884815fcce608840821f49954e
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
-EBUILD jaraco-logging-1.5.2-r1.ebuild 1384 BLAKE2B 5e87332125522e8583b671b1a3f8a60a3f31044f49aaa0afbca09417311b482e7673e0f13c47b97161248549130d44d4f0c713b51289352d94e00ad34e1e9272 SHA512 fe4c5c76c3162a7b7f1de757cb7478a36a19987342444df848da6d1150aa48daf71203928f9e0aefbeb27bacb45f16bf1059f3503a088fb47ef142bd0702e3c8
-EBUILD jaraco-logging-2.0.ebuild 1569 BLAKE2B fd0950a3c3939ac044bbe7236b80680527f2283636af20a40aca8a9d4e713f44db3423641008eee2fe36e2622ccf1831a8f8804df1cea81c83574d12ffe32f3e SHA512 30c4372a90232f9a48730da57022cb1daafa9fc774df88be2cc9e8eaa189662d335eecbdcc9e692660f608d1f501f0224b7b582ff1cf0416c746971fd474036e
+EBUILD jaraco-logging-1.5.2-r1.ebuild 1378 BLAKE2B eb082aee28fa0499f6a418e99607cefc5c338af94f5994c138b33aff45ab4c5e2e2b52a31f5c8bdfee749e73a9435c1c44d3c4fa895d8cd8ba991e6072e6020f SHA512 67a46b663703faefe375633aad6239c41d077c547d836109f73e474b54d2acad545b4e744fb02b5ff716a716f6bc7b62bd00a160349ed586a2b21b5c1804cd07
+EBUILD jaraco-logging-2.0.ebuild 1563 BLAKE2B fad4ccf40161120aacf0a4b7c5197014b2b178cdc3371fbb2758476b7963162f8a4875e2c1d8db4151e7039b84943ddc42f388542ee8d3c30c392e802f44fa30 SHA512 0ef10790bc63eecc56c64ebd882c79e40a73486c34e4f4e9967b755ff056340b21056c248961b5d156ac5937f207768194ff0e4f65b35b712b2bb38bf66428e7
 EBUILD jaraco-logging-3.0.0-r1.ebuild 1402 BLAKE2B 54955bfa8cfc01e8d04e561e3db5ca8479801745b3eaea6906a0668d058d92727a66d742577b00fab483cacd8b8ca207611cab7af759b4e1f090dfc1dc3838e9 SHA512 057685a710de19477fcdfefd2be91bd71004985d060305a1365ce315adde539ba5fbda053aa9e8c9eb0bbb43b6420375fe8b9bf796a92be58e8ecb4235dcacbd
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
index ada9b1c5b8fc..ff7b68814c35 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
index 64dc195c0301..f2d70dae4632 100644
--- a/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 7da24c382bdd..c372d9d8db42 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -2,7 +2,7 @@ DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
 DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
 DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
-EBUILD jaraco-packaging-4.1.ebuild 1205 BLAKE2B 2f00df414cb950f8f9c32eafa7819d79229cb4016e62c09b29ab0b0bf30fab2508df5a8cdd66ec292a9bb8ea044ac83293065deae66d17c37f5b0badac40e368 SHA512 cbe32315b870fa05b36979be16b9a367706a743505c87e10165327f415d62612cdb5f42b510762ff64cfe99ef587220cb640e7960215ac0c5c6e4ebe6128c628
+EBUILD jaraco-packaging-4.1.ebuild 1206 BLAKE2B 7d28f5f5fb66774a749948696c8b96078abc5dd4bdeba1c7d028491ccd388149a5d280973b7d0b494ada69f3871312813223944380011138a7e50ac3da19f9a1 SHA512 c1edd891829647c2150816b39d8f0cd5c14aa3d8f842a9fdf5861cb26706079add9d635566adbb23ac89ab8c3a748a1ec266126b608bf9f0e7abdf41d04c1d0a
 EBUILD jaraco-packaging-5.1-r1.ebuild 1330 BLAKE2B 0722babd07ccdf0ba7fd202ad550f202afcb68673e721b62ef1f22090edda54e80aafa5335d2a6e140450f847ad9b198fb0d2ef2d0e63d306bfc60d44a4cfd2f SHA512 b39a0970eda12e343df2cbf6e21e038768e17c93d302e37c1f4f2a4a898c5ea8492ece5ce526172edca8772441179c4d7164eda306e7869d124803223e6f0d14
 EBUILD jaraco-packaging-6.1.ebuild 1612 BLAKE2B 7b13fc1abcb4e53d299f409435acb643ebfa199b2036944f950de499eb0b58f579dd8c5f21c94803a85cb33e148d924d7f664177907443e66a378fc6b74b304a SHA512 95e662c374f2a49b7ddb3520e60df1ed4b0deea415005240ce9def7be4e856e6de4b55d5f0db75ef8f66e12d84e4b44fa5e462c303e32066bf4e1f8337fb3446
 EBUILD jaraco-packaging-6.2-r1.ebuild 1727 BLAKE2B 1da0a864b60b5300d3bce4aacbb8d3e582e327799669ee108a6d11a81c795bc1def655c9ebe89cba7d0d89266a966b6794182e542360d983fe616a72c68a3368 SHA512 09be3398abaae66b5ada39e9e7280f1b2c1a424ab1592319ea8e721ff3d6b32b63747a8f89bf9a7c323c6be336449ac0bb94c95c45e87a0d74faf2dcc5955b63
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index 4f939ee5b58b..81a607aa5aca 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index ec2bbc6c45c4..d49ebe689d6a 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.stream-1.2.tar.gz 7696 BLAKE2B fcc1aa8d26da17635b9ee7c68c278ae572cbe36a108cb30f5eb98c7ebfd2255aad499bed38ea044b28e820646b92e64602db0e2cdfc430169035882f7b6abe9b SHA512 47a96c1de12eb64e250c85d97429218606dc9bb212cf7b97e579763dd901ee063711c00307b7442be400856d3fd4e5994afbe1cb91a99e233541ffd7ff4024b9
 DIST jaraco.stream-2.0.tar.gz 11061 BLAKE2B 86cc9958e11421fe839551e029f839c16a12b80d329466b44224d145be6c2a15a63d03f426a9b8d1510249ea6c129e892dcfec41a32dd5c3c3a3b66acc21030f SHA512 d379d07772d739abb275cfc8ed7809583c728af695294b9d12ae1276add360b9559de64104cd20d05d82a3250237ae1f6eb23420970a95e9fdf6346ef9312331
 DIST jaraco.stream-3.0.0.tar.gz 11838 BLAKE2B 9d26ff8f78a3f090d79ccc8cbc41819a8290ebdb7770f56a57938ad9311ca1fd168d633fec78ee102c2c08156c9e0ae6f521dd5cafcb9df22928ba9f3f832734 SHA512 f2ce7e65d9a3bcd81985f45d03f7cd56b2f2939f13a423b8b65714f19eb249493d89cad774460dd08c1345124d3d10f85ce6875b5f7049705f993c0a3146e5d9
-EBUILD jaraco-stream-1.2-r1.ebuild 1435 BLAKE2B 8986d650dd0cc6d70a5fd7dae35c5443c7fb5bd60b915e68e2321da8526f72e7726068451861b0a72f2831f20a424bf9157b46d5d7005d7cee6b95664db2dfed SHA512 a1cf70172428b7e88aa68195cb3a86179cfd0c217a2116dd3530f4bf1daef1503cc2bbfd66a428132b44c95e6b6e017563176c5173aee376413015b9640bc98b
-EBUILD jaraco-stream-2.0-r1.ebuild 1624 BLAKE2B daabce62193a4fbe1625ae6d918bccacc64bc9774a89318e171b7a3eac9c314882b0f5da52032ebbce2433c00a3cd5758a6f6507fd513b9d80b7c4845f3873ef SHA512 e434fdccacc9fed40e5cb0ab8db3e50d641f5bd89c05a13baf1181c95552fceaf45c98268180393a52d45e24fdf4d1cb8587b3568c1f75fa4021084d8803a39d
+EBUILD jaraco-stream-1.2-r1.ebuild 1429 BLAKE2B 9f7b53269d8cad1240acca7226e18ed742f803b9c0c4f1aa2c39f86245f84f39c1665c0e95849d8f3d02e3a3c9c2076e95639bdac1c35a08d09fcc75cdb4e794 SHA512 daa807726fcb22377a10e90bf44c0c7d987e4f3fcd16e10c5a095e9b1dabb47e129b5dd21dc816552abc08c82d2d6c57a23f3c44ca704b5110f535d70f3a5d59
+EBUILD jaraco-stream-2.0-r1.ebuild 1618 BLAKE2B d1711b1886bf2de2fb2ab0362212b882d14b5d2f0ef1dbb23033fb38149aaa67b73b899058bc3dbe58c159bcfde3f473b6ac0c9309d73a5d200e76b3f3969f8f SHA512 af728cc4ecb30b24e63d1d197eedd6aa1b77715813a07faaea6b6c592e8ee609654222e898896d2333b5a0c4ca9d29f548a8d6cde446fd881ee31640d7bbc5fe
 EBUILD jaraco-stream-3.0.0.ebuild 1404 BLAKE2B 0394e1c75242e107a6d92e0a5ab35f48ce50a631542f9621794d4fbd40b372b7da3421ae517d1edf91777f5e59879f7f13e7fa646900118081204142af3bedb6 SHA512 66b5ddf6f945d3480cc7db8ffbced27444cfb75fd3492caf673d57cbd936fa118fe25c0836d96021bb2ce7230d9be35c369a3b7f531b76ffca0e17a3df1e0410
 MISC metadata.xml 602 BLAKE2B 3875bfb93914028b263ef5b6f7af81ee9f3fc08f1217537363a02b12e69f273ad9344c5078ea284ed5edfee1389bace975f2745379c3b4b17db4fbeee4045494 SHA512 3a6635e6f38260c76979248878ff326451273bab021f3e85c23a0ae7e29d71daa53ccfa319c8d8457faa00c6fdf5ad3dc68e0693e951ecdd419182f1861a36c0
diff --git a/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
index 562fb71de447..7febc3f3bba1 100644
--- a/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
index 6eb049a889ed..408604edd5c4 100644
--- a/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 9fc0e673c78d..e3d08969ea39 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
 DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
-EBUILD jaraco-text-1.10.1-r1.ebuild 1404 BLAKE2B 9754edd503adf9b7cd5b3cf04acdd3a0239d1769552dc34fd57e0db373e1707dc9837a1c0f4a5d21e1143ad3e047b7d3635f42c257ec3e2aa5894a77fa4a2c85 SHA512 bf8eb3b1b01dd2acaf96d2d50e5927dd2a95347a604da2dfeecbb586646e0fd2e99a69f50d163bf3d2a08761c5f600cc54bc9f17e5ede08ac2995b87931ded06
-EBUILD jaraco-text-3.1.ebuild 1645 BLAKE2B 865a3ffd140fa0b139d53c8047001a8f67a8c39f02262c85db5e6cc87770df7b1fe278c77c0b5697833b40378090f9c0ece0fb45d58ac9823eae24d99995bb9d SHA512 4b669b9d94290319228e8a8d34d6a75f7b9f8f3ca4f351dc83e438d2b3e00992a07bbbe62c709088b11a19f62d11dfc31e4151e6fbd4d836969363bc5c6ae97b
-EBUILD jaraco-text-3.2.0.ebuild 1469 BLAKE2B 5a9248215a50592d7fb5c3958081477de1b5e206bb3afed8f54163493f23f1379bf90a29219fa48ae26be7e9ca3d694fabc47f50df86734eeebb388223deb6ee SHA512 d5a43fc854448b60b6d77721ba3488c723ae563bc989fa917de859d2c79a4d055e0d1ac37e78c901f770cedf9edc2c42dfa74af839ef39802de6a1f2fb74729d
+EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
+EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
+EBUILD jaraco-text-3.2.0.ebuild 1463 BLAKE2B 744496adc6ba4931fc37d963f7d010ed35ab5bafc493f71eefa3459dab4c71965353199de8c27ed0d154d98c153577476416e199a541fca8126da4b88758b438 SHA512 ce686f2311e0c102baa1c50561305b7133bd90cd10e1eb8a11c9b1c6d495e2dd3a3186a55e677d0f1edbf3e1aeb321c5f9449c3196e0d18abb810c42c3a4bf3c
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
index 3a45f1e7241a..5609a83b3be8 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
index 1c18dab01a72..728ffc4387a0 100644
--- a/dev-python/jaraco-text/jaraco-text-3.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 6c67340d3efe..d285b5395113 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index a5d0cb8c4e6d..72ba6ce144e6 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,7 +1,7 @@
 DIST jdcal-1.0.tar.gz 5677 BLAKE2B d45ed1955cc62fceb07dae87ef4c97714ebaa9e5462d647b7f09e87c1f607d04c488f13ba74272e0783ffab218513e87016e0bce2bcf6c00f2fbff0a291772ab SHA512 5e9f865a3c9a123a56d084c9ddd325cfe6c246e1a9162bb8f000abaf7cdf376b1e38f7c2a97f14a13d2f4b3f3de4e7e3773a903f905685ce76f541b50134a408
 DIST jdcal-1.2.tar.gz 7059 BLAKE2B 6795e5511349490bda9df4e47566d3d65d9a69f654466d6c0090cae3b21e4be38090e2582b753f5eb04fbfc4ba33183a69b4e658ca3125f6105fe0b55b6d1d4c SHA512 cb7805229968cb9f5822e97c255b3666e50ac424725ece20ec3b980b87b84334bc13f2e772a4be2a0341b31f569edc11779796a41ae22d85cf822f9aa0a471af
 DIST jdcal-1.4.tar.gz 7545 BLAKE2B 20c3e64a0c1a2cb2078c3058b38a7ae7337880703305ff26d4b0990f4efe1532ebbf8dbaf666a656f7d0176011b651d96853db0c0713356f46191c849630a041 SHA512 d49ac3cb4241556900c0a4dcbbea0ba621206cea767e272fb994c7ec76edd6859b184cf17ea5f9a42ab2134a5be13bca4b6d74021d627584576c01f2cded438e
-EBUILD jdcal-1.0.ebuild 419 BLAKE2B a17ea4246c3b79a70989e2c12ab82cf13206c14f8511c62b70250bcd7bb923c6f267837d429d0ba77c4f0a4420253cd89bab35fb7e424d5de950882449c8626c SHA512 7ed225cea5c5b3108146c9b343425cdcbcbda7a1b8073001b48404c6251018c69935bcb8ffebe1704701d73927163900f036d373149b24e10a8367ad1dfb804c
-EBUILD jdcal-1.2.ebuild 421 BLAKE2B 438f390cd9fa673236ef215e14bc50a64c33f714a405db27518594a80aef76d8a127145190fd1b8b068e455d724f6eac325b526b1679a5bba13ac2c745794b5d SHA512 13c8dff8191f7ff015353275288756849fda6357f0f6850954470dcbc3ae7a0f020685c477e50da0b5dd5193eb2c1eaba95f8386e017b1a239586b87cfdf0f09
-EBUILD jdcal-1.4.ebuild 597 BLAKE2B 3be3797a1aecbd04aaf1c0a0d17a8237c762d9f143049b65b67402dbea4680bb973f0e50e77bd11942521cbb71ac857e3b7ec1f8bde3e1bf2e2d549f09896731 SHA512 e4bb5b6d2957e7161145dd48bcdd2d78485274372853991fc82d32fa09cb13f5006fa20f75bc14eff3005eac3fc522ac4e86dc61d7cbc8465a94f01fff7cbd8e
+EBUILD jdcal-1.0.ebuild 409 BLAKE2B 7d8d51dc2e36f3b2291529d294608af0198f539aa54f90bd58c1e031760bb56bdcb213edba5c5e04eca1226fd86b60b0c90d27a075b934c1fbac3a48d1cec845 SHA512 aa7123c201c5325643badd39f460ca2dff4c0ca70aa17550e5a77eb70f6ca94c3b0c124eba2f4cfb1fb6062a7cd5ff70c9f9e7724dff6301bddb0014d3b29b5c
+EBUILD jdcal-1.2.ebuild 411 BLAKE2B c5d77c76881a598a84953c263af7db51ca2a7d60f8f1da75cbb5d33f7025f110faafc20d9ad32cf86a989fb395bc751db12b6eefb1aa87769519bea77e24bbf2 SHA512 ed97f89f6d9a6eaaefdaf3b01ccda1a662f9d9c76286ffaf6d945c6adff069f89901c8844005a7f3757cadb19e14feaabb6b5a6ded1374ebe358fdadafdd409e
+EBUILD jdcal-1.4.ebuild 587 BLAKE2B 0c19076fdc4120eb13d4196c9bb23bc0595863972768d70579eb2f75e44781c8a4a4d779877f964f316475688fb39300550cacedbfd066aebf672b625c5dae2a SHA512 71a71abe3e378b2bac09e7ba639eb41c67807c6597495b6b3596921619f2606c24178e2aced39774de991a287371a1585425696f0c3c22945afd28791f9bf66c
 MISC metadata.xml 369 BLAKE2B f0096e762647b29c559df839d2c8cef8c42c846e8b19ee151efc141d72270cfe31a5e90eb0545f4a9b79582f1169e1f8ec797d918079630ca4424e8d3b6bc113 SHA512 dd32db88be812a5a89482abf0c22de65201ebc26b6caea99ef3cccbb170273da086b9b6380a7e8894574c96b03844a76256498941d9821cedf817126d6594a8f
diff --git a/dev-python/jdcal/jdcal-1.0.ebuild b/dev-python/jdcal/jdcal-1.0.ebuild
index 07f45c5fe3ee..4ecff69972a6 100644
--- a/dev-python/jdcal/jdcal-1.0.ebuild
+++ b/dev-python/jdcal/jdcal-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/jdcal-1.2.ebuild b/dev-python/jdcal/jdcal-1.2.ebuild
index cc08f2532a32..25e52dcd7152 100644
--- a/dev-python/jdcal/jdcal-1.2.ebuild
+++ b/dev-python/jdcal/jdcal-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jdcal/jdcal-1.4.ebuild b/dev-python/jdcal/jdcal-1.4.ebuild
index bcffc2cf62b3..70a2b7c71525 100644
--- a/dev-python/jdcal/jdcal-1.4.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 50f273331609..ae41cdecf26a 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -4,11 +4,13 @@ DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01b
 DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
 DIST jedi-0.12.0.tar.gz 354329 BLAKE2B ef203f2ba57a90de1e16b80c8786fa25d6d459244873dfb22044aa6d080435efa976daeb80949c3fba41ca2f57feb5bfed255b3bb490e17b40b3f13dfbb31e14 SHA512 3e8280b16855cf2c891666f0fb02ac30d801279b72b5bcb64541ef7c152d9f9b165015405ee291cbccd6c9cb3c0481c24f30e6100cb4463888153021b946f16d
 DIST jedi-0.12.1.tar.gz 356736 BLAKE2B 515cbc27e065c24fb2cebae5a3807d2e025f22110f3de60d26a74475eadc985bb32bea60b691c580473fffe2fdfc86705187dea1fb730ef3f510b7bdb52e0d59 SHA512 92f9ac34abf908a8143dff360400dd8d6643dc3502bb7973f92bd05db94c2af151c2063f2de0481a14e26d11c009cc39c46189e1ea31d274b80802e3a10cd665
+DIST jedi-0.14.1.tar.gz 860206 BLAKE2B d1234ceb417f531c5a29908843a47bec5b198abbc848248517f2796d95319e2d930f7c01af9759cb9a3d44a28fb73c4080802642aea1be32f16689e76c1a49ce SHA512 d68c350259921792788917440c9dd6eb923c90eb1b8d0e078a6d428fad852c4d6bbdc74d8caa88ba5a87db344e4b372dc9cfc959d7bab922888d70402fcf4776
 DIST jedi-0.15.1.tar.gz 412356 BLAKE2B a7738e8825b3f578db5e64d50cbf65219b4d2f2f81c45cbae9e3dbb858b0e1ef26d76972c112bfae839daaf73bba0d00b30b5708404d16b0385452500a1c2d35 SHA512 0f6e0185f3f10dbc000f09ddfed7b9596fe5dc270682544173dc156d505618ea14f1f44ede5d2357745ab8ded0b15b2788d064ca4db39fe70196982dd0a16893
 DIST typeshed-jedi_v0.15.0.tar.gz 466890 BLAKE2B 7c4956c60646ecb7f21704e3ce95cd38a44e40849e4efba352a0be11c4511fc28d77f32308a3f136cd72833f937f802194ae57f1cdf1d53ae7824ebe4f4bc323 SHA512 46250822eb4aa20203db9b99626e33f2b60ec77072e20dbd94219d782cf204e2cc5a94579b1753c634f931445ad4ef9f0bd7ccfed287d86bca96b945d2eb27c1
 EBUILD jedi-0.10.2.ebuild 1006 BLAKE2B 9fbafe6a0c6e6e77a56390c749147a8a2b283f6831a6bffb81f8882926cc6f0991bfd3db73c67ecbb4d36c09c78bcd83b0319f5777ce091a01cd83262271fa8c SHA512 92e521a5e1dfec2dcb62887532c3640df8ac8712f6abcac93ec3162d046a84442e1c44099386cbfdb7301eebf2dec152d20cec7bcd7b3a1ac11b73dda0ad23d0
 EBUILD jedi-0.11.1.ebuild 1165 BLAKE2B 42b86c5cda3a5a4588ef62d698de0a6c6ec837ad9ff4db5b3327cb129ed14f787e6862ad6485f869ba7755b3eb252ca992a7558062b0f70e79058c0301e5a180 SHA512 b7c458df3115c25bf312751d2c93a70a8d47930358c87fbde01be9cbb0dc022de57144c3a8913f7ef77de0e68fd35d18a05a8a0ab270c5ebcda2c246c6512140
 EBUILD jedi-0.12.0.ebuild 1028 BLAKE2B dd6fec316193257b72abfbc385a170355056f640150683e2276ff632813c1a6fb14ff57c0a1f2f46611e1dec17b41d5192f91df8fe2d1d9dedbae2f03eed0b4d SHA512 41adf08f95c8760cb798a86772d14adc3b64ff08a181368f45697f37f6746332e00efd54b0c5e89b10b7f3bcc7b15ee1eb66f5b7b57622ce2a33795b20bbaf8d
 EBUILD jedi-0.12.1.ebuild 1763 BLAKE2B cd23e9619d02c9c7af5567ba9c5efbdbf1be6e8be33a8c4aaab6cc77b49ed93297cab094e7ff339311669564006387b647ec729ffb282db8d49fe95615d383bf SHA512 97f2a9f8e9af4e75f87f3d890345b07fbe76211df58dd0bafe0496e99c40914ae224bc8b8c33154d91a5f23725c63cfc303729d6082da38c43ec8abea404ab76
+EBUILD jedi-0.14.1.ebuild 1790 BLAKE2B 0696bacc490bdd0b31ff6d60864d1c576ab9bb7b1d499a2187943e5130385e2472dfb4c363c5115bcc77b20d1198da5691d7813da5fdcaaed1432c2a9b436c1b SHA512 f34573660b9171eebdba6f39b3dd92968b395aa0def4b56b116d2f13213116b56b7c68d513821044ba6ecef60e81b49d103de29fcf8581e3ce4a218cc3735ef7
 EBUILD jedi-0.15.1.ebuild 1888 BLAKE2B e61208594a9825809dd6069baee3fbf9867742b1aafd42ea6b61a151d44f62329986faec7b8f26e58e4b0449ad55cc9061481b16bf43d1f1a413c16af042cc21 SHA512 49566fb478ca4d726abf7babf14d6887aa1dab3e6c9afc0a77a58069ea691ef42570fb9f2b98952592edd0c54cce8959e71676bbbf23e0ff340a9f3b54d3bd5b
 MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.14.1.ebuild b/dev-python/jedi/jedi-0.14.1.ebuild
new file mode 100644
index 000000000000..5a24e84331e2
--- /dev/null
+++ b/dev-python/jedi/jedi-0.14.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Autocompletion library for Python"
+HOMEPAGE="https://github.com/davidhalter/jedi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-python/parso[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# speed tests are fragile
+	rm test/test_speed.py || die
+
+	# 'path' completion test does not account for 'path' being a valid
+	# package (i.e. dev-python/path-py)
+	# https://github.com/davidhalter/jedi/issues/1210
+	sed -i -e 's:test_get_modules_containing_name:_&:' \
+		test/test_evaluate/test_imports.py || die
+	sed -i -e 's:test_os_issues:_&:' \
+		test/test_evaluate/test_imports.py || die
+	sed -i -e 's:test_os_issues:_&:' \
+		test/test_api/test_full_name.py || die
+	sed -i -e 's:test_os_nowait:_&:' \
+		test/test_api/test_full_name.py || die
+	sed -i -e 's:test_os_nowait:_&:' \
+		test/test_api/test_completion.py || die
+	sed -i -e 's:test_import:_&:' \
+		test/test_utils.py || die
+
+	# don't run doctests, don't depend on colorama
+	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
+	sed -i "s: --doctest-modules::" pytest.ini || die
+
+	# no clue why it fails but we don't really care about .pyc files
+	# without sources anyway
+	rm test/test_evaluate/test_pyc.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} = python3.6 ]]; then
+		# our very useful patching changes libdir for no good reason
+		sed -i -e 's:test_venv_and_pths:_&:' \
+			test/test_evaluate/test_sys_path.py || die
+	fi
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 0a90b8d2e9d5..8d555627e938 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,6 +1,6 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
-EBUILD jinja-2.10.1.ebuild 1615 BLAKE2B ce26d613bfc8b5cb168dc04621920f4501b72c5ef6bbd46ef886921e91698a31342abddac5e555b9d462f37d898c86c715ad35caa387f97aebd3b0b14dfe1328 SHA512 299f2c7aba212fa32d15c540882e41fbf770ec22fb71477824b6995d5efd25c7ed7ed23127331ee0e5720942f14450dcc37f0198e2710ddfdaba895e9684fa38
+EBUILD jinja-2.10.1.ebuild 1616 BLAKE2B 6957dc33aebb826cf0465c4cd1ccc79e30ce28823056f934742146b703e29d03b319416703a5b0e7027bd1b0722262eba84652afacb4dea0fb420dfa6447da5d SHA512 7205bbdaf8494f09ab46a3a6e0855ad4a7d63e6135213cb7ca714dea1b2b0828119004fa3e1b607e8fda090e79660e05d8c223974b5a24329f2f6f54e797c24f
 EBUILD jinja-2.10.3-r1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
 EBUILD jinja-2.10.3.ebuild 1751 BLAKE2B ac3b07a4cb7036cdc59e610f0c91f9d54e90954d5109217c384ad472fe5dfbc8392cd448dc1b49f0b40d39e1b7cbf2fc32efbb59810d2b204672f8744ae216e2 SHA512 7a557463a07e567d9261a63f0d8305784825449ded2a6cf2553b4260c585a4bc24ca6be331306c4ba9300797de351a1b3bef2d1d0375fed919ebd2ea36e95ab9
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index a608230ff660..14b1bfc2dfef 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 80a4c3e4f9bf..6065bbe39096 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0.ebuild 637 BLAKE2B c8e52dfc6003c743f9a4771ece7d90798b205e348a98cbaad75198deb9c78a1d9de08456d37379cc86e938648f7b7c0af7ed7cdde6519e89b59dd7308fdf482e SHA512 f2bc435c5fd3475d2565d96be1e151b10204cd8e512978e80a44103f3e25ebe9c088425d4f0ede64940540a1f3038733d8e87b81627b5808b5d394babc4d158f
+EBUILD jinja2-time-0.2.0.ebuild 627 BLAKE2B 79b4a34ab80605d7a924cae2795661a81db714da9a6d1392809addf98e30ce439a88784c7f8aeedcc016b164733995bf0bdac04bdcd3610277da0c7529129318 SHA512 a424789f22bc7658744749957509fe3eb75402f3e3eea7c8d8b0ef4f8c2c6ff9f10b5e80fd5142372db732917c512bc586a0b5b9d2e2fe414d749ab747e6f419
 MISC metadata.xml 375 BLAKE2B d28fc82eb5b6b82faf9e3874182b44290f10a1d2c2e7bb58e32cd46c6d724028e0bdf27670052f1665655ea0843900a1b978534ff8b32db986aa49531d4db76f SHA512 23697fa9d297ce1deaed947d2f5c98cfd85d9f10e4f703259db15d6deeacbed1ac4f297eed4b58d07b23c798ad738680c945395dc68f15cb0d083f7acb6d99ce
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
index dc6fc327bf8f..eed27c8c8b51 100644
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Jinja2 Extension for Dates and Times"
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index 059ab705873d..791de368e1bd 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0.ebuild 593 BLAKE2B 23e938ccb95f2e1e9e8327a4f6baa748d3f712d409ce9e119f780e7e54a41501e77b6e95fd85223a26dc904ec5b2676f36bd42b3475411b0eb022b1c29f5a8e5 SHA512 b7b9defdc5b660e422286f2f3bde24767be22b700d69796a49a5aaea922d21af73dad4df977d9f9faf2a82b5d6b72b6394ae96221dae2452907f643349642927
+EBUILD jinja2_pluralize-0.3.0.ebuild 587 BLAKE2B 986a8a1112293ab311ec7512617835cf8bf69759203d90764a4440fc651570fe66c1b43f00553f80ebebda791474c0adab39bc388c5982251b9d9752d643e75a SHA512 f87e1f5add21bbc6357d17b13fc7af459d29ea8ac83afbff95fa0f823e3518230276abe311a6f6724c233885a46005cd00600ca7e1701c2238554b413906e98c
 MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
index 4eee89a2d341..b14133548576 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 2b0739c08e18..b8ec9c5958bf 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,3 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
-EBUILD jmespath-0.9.3-r1.ebuild 617 BLAKE2B 31230317294a2a4efe5c1a247c33a1dea4a39da01aac8e7e7408c55130b5997bbc2fd71e90c6b26395054a537453f2b4c3df49030e197e2b0b8bc68cd56eeab2 SHA512 df9f1f5c06e9d7142483b91eddbf08ed54b1623d45418da7df4d3df20c4745aaa510c4aac7f0b0b75f9fa3e21bf74bf40e484f4c8aa1f45b2608ec3324fa7370
+EBUILD jmespath-0.9.3-r1.ebuild 613 BLAKE2B 6c7ff096f1a04cbbb769813a78685195d98d03d3b66b0765514224290b4c0949d06fdc46578e86efe86e7631845ff8bd916a9faaa1e99bf924aa2537e1a81565 SHA512 f08868716741ccef0e9fdf3842145415e9ad8f92f64f36fd0477b94555011ce987fbf45c59614317161f159346b6c473591bd6096a310a5613e3a3c8ab92f882
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index d174211f6b6a..ca2bac2dfae1 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 70c5771bd6bd..d4e0d81ddb48 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,3 @@
 DIST joblib-0.12.2.tar.gz 289249 BLAKE2B 247a8bce753ece235877540b829bdc9546b3a6d7610b09592217bf9d47fd038a5e75f649224b76832825e77d76ae46443984de3d83558cdbd4d816d8f610e8b0 SHA512 9bf93c89681f59d17e735c228d3379df5dff67b4365b59ddea1a062f9547c376e5870e4ece83af8e7cda1ae30e2a2893a4a009e03b7fec798d3574e8ab060267
-EBUILD joblib-0.12.2.ebuild 1152 BLAKE2B 8783121711430cc68b5e32725c6a43cf677e30c4f89affa3f4329ef209d920de5061d94e6e053d5dd2b4c1e619e65c2a4df1cd5aa1b931ce107308b76e75d1d9 SHA512 bb2d4b113099115907cdb2c3e378a9609f2ca83e2d13e75e0fafc881cced47742f7be49776b73490082b8daf0b309d7aa4427b1774bf29e9d0bb57b424865c2b
+EBUILD joblib-0.12.2.ebuild 1148 BLAKE2B aae3982a2bc02c954a4b2c094fa292c2437de7771da9cbe2fc8aebb55b8cc7b96bc0e08b56ac0a89306c7eb56a1633976cc43f18f93d85d34907d46e705624e6 SHA512 649979fa9645e68c6cc2b407a53564ce70b57333cad498e5b3c4a8b812ac4f18560ba599c543c3818a2d616491f63babf0cff12d23710a5fd46fad136a85e4c5
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.12.2.ebuild b/dev-python/joblib/joblib-0.12.2.ebuild
index b146494cf10e..93796a110918 100644
--- a/dev-python/joblib/joblib-0.12.2.ebuild
+++ b/dev-python/joblib/joblib-0.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 62566ea17adf..5099d30de36e 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
-DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 DIST josepy-1.2.0.tar.gz 53130 BLAKE2B 1308ac60d32c65d8117e87474ed178f3e582de1f5bd958f31cac9a5837e0006a64291f9b8752ab1282d7f656d8931ecba54cb311888106618da993ab5bd773ff SHA512 1e746cf8e02c86a728d1a502000bba3c7db829f29dcb49ed40c7398d2ec904e830d267c60b444d57c3cf44d6ae829d3f3f4fd4288dcb3d5f47ab96d06a2d6bc5
-EBUILD josepy-1.1.0.ebuild 654 BLAKE2B 61955f926db2ed79b94f9a272a10fd5be466a2e9561277aec72bd665cac6e2eb31e57ea0f897fb65b6c2c83ce9492b2101bfecd063919af341c60b54fb3d216a SHA512 bb6b6fc21122b02a565eafd9a05c2389f8e696676d811722f761ee1e1aaa72ba16e41156956513f388d792239c5bc3f90966ab9ee5bf3ab377706dc50033e1f3
-EBUILD josepy-1.2.0.ebuild 664 BLAKE2B a245bf284cb179f5b766685e5d90312e71dea37b0f455d49da4bc33f8d7f0efa23901a78d3a0df9575fa04e1e67ea44074a7edc48cf66cb844c3f97054b09a12 SHA512 7c357aa5e6c1ea875eaa4bf608931794b043bcb16ac40c886847bad5afea8441c158608dd4af2b6e71760dd2d65590d0ef808e0927de77762e6179bd0508bfbf
+DIST josepy-1.3.0.tar.gz 53279 BLAKE2B 7dbbdd97491d4fab7a6f086c47458e2e34908ee4377e30138a64a42b81396cba72dc0f8483d21f4f7499715eb49f9503cc12b08cdc270d4cd6fcc05a6888dc8f SHA512 176eea34bb7fb75e192d6792c15581a42a1d2b986bc79ab49f72b16ebf8879e9b11db0d22fbd49ff5a9b85ab7cc45a0a935d06393273233a272537a861282f30
+EBUILD josepy-1.2.0.ebuild 654 BLAKE2B 9995d3a757f9213792405a94ec24c239c246c232e9302daa21c05642527c8f5a48cd3f2d1dc696a3aa57c38627da51a5b3d89761385c994ed1281edb12568057 SHA512 f2aa7f2eb94ddd07e9da118931a25be104f752e01372e22cbd76e8377447450eb429be8d84bda44e65038ccdc18fa328f14e327ac42a3a6f80cf457e7f02b8e8
+EBUILD josepy-1.3.0.ebuild 666 BLAKE2B 463e56eb10740473cda96bb98f332f28f011f3292e806457d54a438d2696e1644e248ba1e8ec79bd1c248fdf9b3e5b6120908aa8a61528c1feee09c6b83d5c81 SHA512 843db6a19272ce62a112a07a97ad7b86e8da935bd0ae4034c3f5679947973850fb2717041186fb590d517637b0085e931ebd44ec67b32d380b0545b83a5efc6c
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.2.0.ebuild b/dev-python/josepy/josepy-1.2.0.ebuild
index 34d9145537eb..8f7ce5c780ae 100644
--- a/dev-python/josepy/josepy-1.2.0.ebuild
+++ b/dev-python/josepy/josepy-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
diff --git a/dev-python/josepy/josepy-1.1.0.ebuild b/dev-python/josepy/josepy-1.3.0.ebuild
index c2fe54ce2679..6f18a6d48274 100644
--- a/dev-python/josepy/josepy-1.1.0.ebuild
+++ b/dev-python/josepy/josepy-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index c532876a5e49..f34ba09ec586 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,3 +1,3 @@
 DIST jsondiff-1.1.2.tar.gz 7803 BLAKE2B cbfcfdb2c6c3bb721b4db43aca1d66649257db2cd9feb9655015e621fcd90c72af087696b9553a10ac89cdaf5f23d8748463e1a13bdb19207e34e12e66629544 SHA512 ca96bb80a6f7a34c8c5bcde74856dc1c4935b3e2979330ecfc33432aff83968e671b2aaf310c77f2c7d431be1ae6e20a960879700ba3c903a09a48b23d4c0288
-EBUILD jsondiff-1.1.2.ebuild 848 BLAKE2B 9981c72f2f403b6016395d5b1e88dfb6a23934be5a7b1757cca8ddf188b407f9a897f5c26f53f22ef2b4030d53192e4c0ae819091773389f876c2b823b39ad1c SHA512 f65798f2e7101edf3ec99866f51d2e54ecbbb2c75052cc7bb93d3391d09dbf1f2c379a0cdba54dff753be2acb1ee800e709533d2b2cbc09953eff64584f059d6
+EBUILD jsondiff-1.1.2.ebuild 838 BLAKE2B c38af15ec5c351242a7f9bf8e36109227cdd99a199ea5c9fa717bbd13367bede5de618e72f2b0bd0699031751c3079f56affe5a6b44d3caa0050a0cb432a9a88 SHA512 cd6f12b55fbcb8421ae5c67115249ee55d101bf89ebf687298e1136665b6047a65e29a7036a1937505f387708e6fbb9f3c985ab8934c24ee895318c6070bfdcd
 MISC metadata.xml 435 BLAKE2B 3ea5af8e9063a07c6d3d93225a712395a351a368bf689e512b45e6225e23a543771839e756ee53cf51142b6309f0b1ecd20fff6203a69ae754c44893d09c5274 SHA512 d1b50f01a0a5f2381fe41e4da073fd00afd4443a76d692c7a2227e50b178e9b990c4c40b72d1beeeab7cc8e5f1a9a52beb758a5adbd088eb787b9f2d08844eff
diff --git a/dev-python/jsondiff/jsondiff-1.1.2.ebuild b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
index 9e632c5023db..3a6231ef9c84 100644
--- a/dev-python/jsondiff/jsondiff-1.1.2.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index 013a48be7498..f093ed13eff7 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,3 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
-EBUILD jsonext-0.4.2.ebuild 583 BLAKE2B 3fa51e13ebf412ce12135c98b5956e47b7385d7d2bb43aede1e525978ff84d0d6eb46a209f64af4a148b77e4b75b54943e320a69cee0f02ffe73eb34db701208 SHA512 5cdca928767b337f6902e0dc01144f345ce0222a35a22fe04154a424b928ee18bc90e2937f2a106a1bb4e25d554083f10a369dc37a2655ad89c06c05bb0d98a4
+EBUILD jsonext-0.4.2.ebuild 573 BLAKE2B be761a9cc8eb3bdd76d593ee091efb68a4b280a7d3225f7cd578a10fac8238440d3239ba04479c6432ce22220541379f713f1f1dc2701de97e9baf2b6ca768f4 SHA512 a655d678df15545691b8facfb7df52f71ffe29cf0a7c4da81c494c02bcf298e2652700353a5ec11168ffff43b163f2d9ff3edb07898e48951eb363d876f987f4
 MISC metadata.xml 478 BLAKE2B 917cd38f6d39c8fb63724e545d5a0d76a173b83dd43543dcc0400799c2cfec8966496e8656696947fff61f7fb25cdc4fe64ee73ca787d9072acbbaf376817a9f SHA512 819a01efba7324a2b5dc6829a882b1d8ec22588a0b615abf44a83b1e1ea517b463f1d01fae40c6fa3309ebe15f2797065575e9b34dc53944d7b44f860b36a6ed
diff --git a/dev-python/jsonext/jsonext-0.4.2.ebuild b/dev-python/jsonext/jsonext-0.4.2.ebuild
index 5959457d7f79..20e93cbdff56 100644
--- a/dev-python/jsonext/jsonext-0.4.2.ebuild
+++ b/dev-python/jsonext/jsonext-0.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index f4ae664b0742..a3830510973b 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -2,8 +2,8 @@ DIST jsonpatch-1.13.tar.gz 15119 BLAKE2B 70ddb570451ac1f3d218de0f79f0a639eb922ce
 DIST jsonpatch-1.15.tar.gz 15544 BLAKE2B 1b9facd2a88a997356aeace8ddec9011f4f3c4df812fb157cd22f1210ac2e2502e8b9e18e02ea477c869758cdfc1dd0b6b4c8d76ce59ffdd68d4db14c550b572 SHA512 c5df880764b14a2fb60bb46e319bf006644ce1472d0413cf08ad151cf386e5be9fec197fd9efe0bfc3aa22dadf4078344c11211c1e8a3d5cc3ddcb998795dc91
 DIST jsonpatch-1.21.tar.gz 15208 BLAKE2B 88af93bfd7c317319d958bc3386f9551279af2fa9631c24c49231eb67398fd80f298e26957f232c9705219d4fa7033bb62f98b5d5391f6eb9f53113a1d351876 SHA512 dc902b750241833a68612430f07007080ed56dce8a7a4bdd1c042f944cd6cfdc03f4b422cc6bed6bc3b21ea390c5a281cd08181e27d6b57fc5fb657787c1d740
 DIST jsonpatch-1.23.tar.gz 18162 BLAKE2B 86322a4de88d37eb674d28425d3aee4ad3b589c724b124f37f16e8303200c742404512b9c675f5b5eb8d8f7916469ebb7915bf289c8190092bcf48a1cb9ca7a0 SHA512 da612fc043e351087fbda26cd5686743107dafca1223e784626c39113dfb4770647db1420e9ab9eee93d12c608a6e0812f0825229ab092962cfb390b6b1795ed
-EBUILD jsonpatch-1.13.ebuild 787 BLAKE2B 0fd66d85f737fbbee7301fc0c511ad171bdd5e97d217eb8df812d99f6fd62d9c07d568aaf59f4a739708c43e539810e566dbffe9c75c8b2a700433b0ca026615 SHA512 3a4487cd3430111ef57f0659cb209501820923e973d4dcb2f7c5427e883acb5f7aba272b75f21e64e1b8a4bcf72a2b59d2f4ca7796e9fd48da6fda62ee747777
-EBUILD jsonpatch-1.15.ebuild 795 BLAKE2B b096da01e4aae53a31354d1fe6061e05b091e9828baad6abc833731726fe0a594781a98a66af609f141a75277f3da205ef77c7da103517bf6914ba2af7066733 SHA512 2068f5dd62aee8597350bc4a3fcca37f7f7c207358f0acaafe37bde2e9a5f5d016239e114cc2073a094511b09ada5c1736b5fffc30206dcf141b42bb14e61a10
-EBUILD jsonpatch-1.21.ebuild 784 BLAKE2B 1d9db9a78ce21adbacdc3115ebd6f6be9315db315d4b36c81660d1ce301f467757db071e8827e78e158eae928c15ff45a2817207eb0a697c8468ecff32ee1fea SHA512 611d7c8ddd08e8a8f69a08563b26743c92519d45c1345866aefb189af470bafe3c2662e765c9ec366757a6f349e20833d6121a9b092925aa81d78022d0b4831b
-EBUILD jsonpatch-1.23.ebuild 788 BLAKE2B 7cc1254613f42e75b30f4279c4677f85040104219325ae794c44c0a431bbb390ddb45fd6a4bba7837f7d37c277bce3fe87d5eacd72802b0f1d4f2ec0c0da20fc SHA512 cf350aab9bb2e994ef77618feb3ce8adbb4824eb4e67738bed901b687730f21a9910e3abf27747a7f3a7fef52455de7c99e8a08e05510a6acac166e0e7effa87
+EBUILD jsonpatch-1.13.ebuild 777 BLAKE2B 86cf49b52feb30babdf942c5b3b01c11d9f9056fbaba6d1effe30fe967beddccf124e67cd271465a7b6eef43fc8aa2bdb318f3a82d4a4d798396772aca507273 SHA512 9d73f5ef2398d852e0c58b6aae2d9e193b429cd1263a16316d73518371e26ceed0b21d372b9f4d87eb2850b35c8a3bf9aec9e36967cb1f5d49d305c991cf87ec
+EBUILD jsonpatch-1.15.ebuild 785 BLAKE2B 33f20edae2640e71f863f66d14344d1b90e23c9d06e3d0e41b41439ec50c76e26fa504f269ac7031e28a8a429979a2ea786d7c94786803bf0ea9ef3115dd0c6f SHA512 7ab4d34cfe7ac230de8b0b42bce542ba44484f076a0ac4beffbfe7d94fe8f449167de5782fd43e21342a79e8360dbbce41eb4090722ee03b0980bd6f41d797b8
+EBUILD jsonpatch-1.21.ebuild 774 BLAKE2B 8cbfee34ff4c75b6f19e8f846fe9f1e30d2b1f5908f4411851a9b94c8e5b2927cd311242048a56f0f28be78f3cf6ce0149183a499d6104de83fc732539b2f0e7 SHA512 385014b9a2daa57b69c99c47b5fcfa8d48188bbd91bcbc4fd76ce9b67efe7f12defa1237c9ed6e2f730219f9ed574b8d4f1d04aecf6fd86351922d13f5c0be6f
+EBUILD jsonpatch-1.23.ebuild 778 BLAKE2B f756f62785db7c6c87a97a963779937d644c3318050c51e130f3b5e83f067b0c7ac80302bd5686b160e1900f1e9083754097b1ceac04eefc42c3a75e314e0a9a SHA512 8b38ed2e312198f1e6656853e1b5bfed39dfe3a83e9488a417714fb9a75400aabf5a9bbd2c9dace59dbf776689a84433232825da73bd0d4fec7cfba74bce1d71
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
index 359b638f6b48..f4ec5d6600d7 100644
--- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.15.ebuild b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
index afc9c529f93d..1f1c237810f9 100644
--- a/dev-python/jsonpatch/jsonpatch-1.15.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.21.ebuild b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
index 858be7d7a100..a3c42315c2d4 100644
--- a/dev-python/jsonpatch/jsonpatch-1.21.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.21.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpatch/jsonpatch-1.23.ebuild b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
index 9076661a498a..0b8c2f80ac12 100644
--- a/dev-python/jsonpatch/jsonpatch-1.23.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.23.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 RESTRICT="test"
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 5bc03f3e7e00..7fd4340ed8bc 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-0.9.3.tar.gz 60489 BLAKE2B 4767809a3bd5816343e9081bdaf45cdec8dfd1e28b832675e01ae415c1ac081d0a84e2827051520999d11d0dc28a62bdd09285cf384fff0f941d3a571064e2bf SHA512 38de2ab2c15e0e28323a8cc83b0c0b0631f2f678f620e8738fee19c71492f011aa7eec428b859574a0066b9e24a08bde911a283736757964035befe3042f2e06
 DIST jsonpickle-1.2.tar.gz 74693 BLAKE2B 65f9c18b8693351995f84815d27f2d86ab65fe7a620cda0d346b88db56de45ff6aa21b7ae941e8820e16e184d9a5ac55d56caf112f3930083e63b50751fe2dd8 SHA512 0a5bfb2e77175c9174ee1783301c613e25fcfa60f07e610206d1e1e34053e90b21b12bc1b1045dd03ff2d4efe5940d85d852800037ca01397994c022f0ffb2c6
-EBUILD jsonpickle-0.9.3.ebuild 1563 BLAKE2B 6e8d9bdbebd50aaacfae7ab4f7d64a478a5dfb5d52416e1d8bcd50932a8c443c26c2525581f2343957046449eadae5db36298bf7dccea121c5b4b23e163e43f2 SHA512 e81fc0a4cc0f1d273f43e24671b9ab140802a7158057a199d1ae3714630cf26cd7a9554c65861d59f0022dd012a032a80070f77bfa09b4c241fcbfd0dd9f4140
-EBUILD jsonpickle-1.2.ebuild 1557 BLAKE2B 23ba29e4d041c23e27b3778b87e15d7644267221dc8ba011712339608966ee4df17be19c5f50b14732e2daa2a6d09e7fd84559287690e6d780e1274ebf4972cc SHA512 d10aea6c84661fa6efd324791b3f977d43342161f346f3ccd0c4b2243d65a307b1563a2a67db1e6a6817f729f7e75c409e666bd0d9f42c81638a03e7c022daa0
+EBUILD jsonpickle-0.9.3.ebuild 1557 BLAKE2B 14723641c7d767171e546f83c6e81c1d3a0c1f6cb3d41c9585895a54679760a8ffe50f544ed28e8d24713a9f18ae46c0f183512c0baf21161cca359cebce37b1 SHA512 4ca280257a20152fa2498e354d654c267f77b28ca17f61848bb0489e939d66ed629e1431badd53c700cf94a9a12ce2867df304850c62edd0c4737592e22c6e3f
+EBUILD jsonpickle-1.2.ebuild 1547 BLAKE2B 61a2f3573ee84885a966ef3445a0f8a5cd4f389ac524293b44ebc94c0d32195181325a123defc8c5fd7ee442dcf4550071f3f7e5bc74685217534b9b73f89706 SHA512 3c9deb4cbb173cd41bf3c5edb6dcfa9a1b69db77f1cafeff3ad0e3f4756701edcd647a937600e867237fb7d8997a720cbdfebe225473bd70d129f36fd964e976
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
index f3ab073616d6..96d0e161df1c 100644
--- a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpickle/jsonpickle-1.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
index 5e9f42cabf98..48d7956ab09f 100644
--- a/dev-python/jsonpickle/jsonpickle-1.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 32d4986aae45..bdcd3b53ad3e 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,3 @@
 DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
-EBUILD jsonref-0.1.ebuild 561 BLAKE2B 65146d6e7161f2bce50abe01f4baf5b523048359406543030279b1145f4051cfd9c326c503e15ba00c839c50c101dadcba1cf0bf154e4aad74184f8525cd368a SHA512 8ffc298e654da6cfb01ea6e719c291a5b156bfd7f829c5adffaca9d0bec8e40c7171090b43af0c1323ffcd910c544cc10119ac9bf21df9fbd71f3b658e3b93a3
+EBUILD jsonref-0.1.ebuild 551 BLAKE2B 6a72afe66163fcb6f51037b99af20eef1f905846fc792de83f55ac14a810fa3c8bece11e54dce3e64a49a8171b4bb4c2553d323ef9c5819ab6e034bdb02d6b6e SHA512 49666401f4217800f89b03651b389000e1bfc42f7eda02dec9ad8e96140aeae703e8f8678698b91a37b88e9d5b3d2080e4a2486165f2205a08dfe76abdd7adb3
 MISC metadata.xml 772 BLAKE2B 48b8cc40f83a1ba2d3a4d7e6eed3fed74188b8a9ac8592009084eb692bc2902896692f125d986ef6418c4b1cf68abcbde0648cb3b0ec7a6609d40387105c0ff5 SHA512 59433a3ba6fbf178eb55dd21ff25e503235065d312a930818a85776079d0cda7d0a06264f83452302fa7897ead09c6414e53e7554547b6dc58d026a93dbe8d29
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 72b6299b47e6..a337ababa986 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7})
+PYTHON_COMPAT=( python3_{6,7})
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index 6e110d9ef9c1..087bae1477f4 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,6 @@
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
-EBUILD jsonrpclib-0.3.1.ebuild 698 BLAKE2B 4b0343079ea22baf7a1a5067d8e10fdde867d2c4e607ab739ecdb6f1f2024de4db9e98eb53189ddfcf3e970faadbabf2f66428e96b54540360ec925f42ef7981 SHA512 a82884c2eea22dfc31c4209364cc54c8993658fd7c087153f2d9bd37222d4bde318fef59b3bc5e12fc791ffd4f3d2b51ba74a1a154ea09da27d905502d193bdf
-EBUILD jsonrpclib-0.4.0.ebuild 769 BLAKE2B 3d9b18049ea7bada9b1fa8738d16d614ccdb7c9489bbc415f0a26fe4ad957c1398873be4574a4e3d3ced7f86790c0bd8203f128ba4a0518def4e66423e062bdf SHA512 0b03b5e112181815feef75603059dc370ba0cbbd510403431f2b57de9417e251b2fcdd9f2881a5f8d4dbf2cea07bd6e7567d16d213239b2df47567159508edfe
-EBUILD jsonrpclib-9999.ebuild 764 BLAKE2B c50c1d6697800cad7dbe22935d1157c69142eadc872dbe1b998e89c19e598aa0f309e2c9dc6ac23ee7b814a6a5cb3be41ac78ac74db8d15c5206ff8fd517d103 SHA512 72a2236b8a22c986f0138def4a117fcfe3a61e1a187bf91f92360a6ba459a2a4bc03ddbf8cbc56df53c6de94eeaf5901f636baf1fe8da0c8ca7e156777fa84d1
+EBUILD jsonrpclib-0.3.1.ebuild 688 BLAKE2B fa79b85389af35793ab4aadb36ce457d996782306adc0c49ce74391d1686791621ac31e900f6f7ad1a709dd51524d3035543dc7eb8289cc509e202122e02bea5 SHA512 6906bc87e4f82497bc066a8c328fe103beb63a216bfa12bb8746356d21ece877af5fecbc90a39fa839d79bf9da992b1ac15ebce816dd80d12d22ebdf91488b2d
+EBUILD jsonrpclib-0.4.0.ebuild 759 BLAKE2B 714d21e620e86536ccdb409b3cbd78dd8d1d8f7e0a31f0c18ede5ccfc2bcac6b0ebab2450bccf01c50ae5eeb0c5958527873b54ac45587a077df8c5b4c6253fe SHA512 1813e5fd417dd362271bf46afbac4d15bf0748daa654cc60dc521df582394b0c55c3b1cfc924604949dc6870a185a4ad0e81bbe0ea51467ea4b0188c0c9e797a
+EBUILD jsonrpclib-9999.ebuild 754 BLAKE2B 673ee6982603f06789bb9180006adc269ab05c00ed91af8a367e2adc705f1a45c0fa2424fafe44e9c4a741448f0ac5f44bc0d8502657188249d025911f7d7410 SHA512 3a7badfe2c8731311549a9634603024935e8503ede11ca42f4ac3371ad3f5eb4f7915faea463350575e33aff1c4d7749b5f618594373d962589e45839a42005b
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
index 4b06bc13c131..8ba5623f22c6 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
index 555604f61900..39a56fdc78b7 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index 7ce2952d724e..ec15474a0929 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index fd0c1f49006f..796bf049da9b 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -6,7 +6,7 @@ DIST jsonschema-3.0.1.tar.gz 120834 BLAKE2B f99d77847a697bb28bac39b7b9a2c6c80cf9
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 EBUILD jsonschema-2.3.0.ebuild 687 BLAKE2B be0d1616cf323f5a1b478f6a98c712568f3b58313757052f11405ed319426073a8b7ef20cdb85ebe1d573ae0de02d53fa1b282c813d9e351f1819c6d47e02cbb SHA512 e3c5679eced94600b57e78da474abeffc6076d4bd445fde7db1b33011366e82c378b4b8674ac8128c1a7f29e5ead348e195ddb5e8e1c241e31df59c9175f0e3b
 EBUILD jsonschema-2.4.0.ebuild 561 BLAKE2B 3f941c12adea187348f4ba79f22c1608d5e02f8407a5b126535cb0399d5308e74816c47fbe1af15357f94cc6a022c0bf78ec25d7efccf4559945d8b74fe83cd5 SHA512 2acf14f52fbfddc8af7cde759fcabc87c17293c36c5a2f47dc3987543cc3b8d3193a5dda2cc48b7673ea4840b25f867410b98aae5e4dd6cdfccad26e5d165ae8
-EBUILD jsonschema-2.5.1-r2.ebuild 1022 BLAKE2B 61374c73558313637e8f6208ad57e5d177793c75ff3c605c99f482ebd50a4d0191a2ed4f363b6aa9a572699077405db80e0296b282f975f621895c19978546c9 SHA512 3233bc0c828e259509ca644c61302c95f8dc3461b01c9a6ba59297a0ddb12f8cae9e6c9175c80f4dd8a3ecec641a7632797d7e42375eb145f79bd30ffd8769df
+EBUILD jsonschema-2.5.1-r2.ebuild 1023 BLAKE2B c436332469692366bf1437481ad262d25c8f78b17aba0c307a4d48f704c61ecad48499d8817a9ee4c9b66c3d6c6f16afb9f903162323252c8d62067c73cb4a6d SHA512 ae41f72e9810aec048ce0144989e332170f5efbfff153cea7a87f1d7e15265e04b80e1c110055ef64ea1c19490744a78d00a887555182e3611cf5928c74b3f93
 EBUILD jsonschema-2.6.0.ebuild 1041 BLAKE2B c9b65b75e69535422ca41678e6eb13681620e37a5855b3ddfe342a21d7d444dcdb20506157e1b2469edede08a2ffa956bdf30274aba574c947a5ec5988cd8213 SHA512 523558e3897420e3b8a9d291bd8dbe609105fc8832cd0a84101ef286387f66ddcd06c9f6a1238b18d8d84c85f391248a018cad66b18c80c88fb7a636cd50aa49
 EBUILD jsonschema-3.0.1.ebuild 1193 BLAKE2B e794968d6e67e80d03c011d473952620824554969ac9060d6533bc617667d6581313253fed1ae1773656f9177f70715ae1a794da8898244d97ece6ee3744c70a SHA512 36d9254597100030ac1ac974f95a682a1421a2f4352a07af018a16222282ee206de665e50bc52ee363a06c1b35e6422de601f6b9543ec34a6374d4ab58379a2e
 EBUILD jsonschema-3.2.0.ebuild 1559 BLAKE2B ae91d81dcae4b23de39f30c9d9d4458ed56719a954fa3fe331f3b544ac801a4cdceda5dcedbff711ba5ceb0f0a3c469479cc8531e9f540045c74453a9c08420c SHA512 7b3bbfd6998b1002ed30e16ca60e554f9b797c1a90bd795b279780f6b3319090a96b56bc0ed742815ee716fa4372bc983ab01a4b1c1002fc24240ceb66869d13
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index a7ede4fdbffd..9e31994522bc 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index 6fcb234d276b..a8afb0a91b35 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
-EBUILD jsonxs-0.6.ebuild 432 BLAKE2B 04b828a6edc03cdcbfed626682fa83de1c9570d72ba3eaf368f5f216bb9f86915daa96f4d0b3fd804bb7f4b7b74e2fde69f66e25873cc64b3be066f6d8ac6420 SHA512 8e8aee5fed57fede360b869e1930b9b60bf26c416fbe26e3d9692609a58c132b8b4ecd0c92ebb4ea2f10c1b8f9dea267063e9eff23eec0cac053933c60bad8da
+EBUILD jsonxs-0.6.ebuild 422 BLAKE2B 0ef142334f79e40b12789b6551a489cc6ab753d3ff19cf2ba352505544dc197e47afbf14128039f7c50f96d114608d8e01020ecf151f15c59d6832449633bf2f SHA512 8522f881a8420b616d857f14d9021b02202727a62a8ff073a257a8af70abff796b36287d0e112d5a0ce19f752ceed0acdc4fd227eb406eaf453550626ea97317
 MISC metadata.xml 364 BLAKE2B fb2eb258477bf4ba6b46d289e3371ae0b5789749c410b091305f0d626509d297c923ac33493662010ffde395d914871dac995e9c66a7dafcb487dceb594ded5f SHA512 64ef116db1ad26b23d117237d4e2a76d9bb05aad9c9a0885e5e22b93aea2eef7187feec1566541b0cec4451de43d24668e6948d3378035e0217ac2baf4c3c849
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
index 2a5c8d589155..9064117d1c47 100644
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ b/dev-python/jsonxs/jsonxs-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
index bd6260e3d9b4..0d00c23cfa15 100644
--- a/dev-python/junit-xml/Manifest
+++ b/dev-python/junit-xml/Manifest
@@ -1,3 +1,3 @@
 DIST junit-xml-1.8.tar.gz 9995 BLAKE2B 29dcd9053e3d02dffce537318458f9924aff78df2f465ffb1a92affcf84734c81cd9a951523fa8b6edf09e871acaa426d7a755ae167279c9954660737a44062c SHA512 8fcef94ea73a77ad597bb3280578f0fea86573b779eb4aea1e458e55f1866637a7b43aa04502a65ecb1f2a7403cc61a76ccd35feb4b69eeb6fdc8352914d61a4
-EBUILD junit-xml-1.8.ebuild 681 BLAKE2B ead0c76a46e44ff447212062f19eac09e3d59326388ec05fa22a29b75a62b1bd12492520f242fdf5dea930cf27db08e258c29f7c01f6b7d71cbeb45b6a0052be SHA512 fbcbf12151eb00a9a88199e704b086efa630ed00766b8fe22a202667638ab02cc3d1289b83630058b48f513e9a40751b629875d107d2ba7fe6c1e47278db1e41
+EBUILD junit-xml-1.8.ebuild 671 BLAKE2B 242d445b0acf00f1ec3f072330da7271eaf3b9692d24748c1b53e9b82534247f9398e48ff8bb8d59e266d882c69451f1be168994d470a449c59aa74602637e3a SHA512 6b4bdd57fe61def8647277e68e1ff25aaf125f55f698827e3e37aec03f15b549d5b749da23b8e2cea0af713b50646b15f8df6b0edace2756089ac42f362cebaa
 MISC metadata.xml 394 BLAKE2B 6b67025e70bfb33452ef3e9a6b3c953ab975a88264148ce1c3cb022acb74f54bac8e84cbf66a8538c900c2d6bf1bdfeec9bb0de00ae231d22909b494b75e6ff5 SHA512 f5a65246be9868f444ea3e828df737912d18f26bfe766f0deec8306d2c6aeb11a645b630cffa6d6fc486655b122bc46d64956cba07a23c15fc7d97e9f81fc23c
diff --git a/dev-python/junit-xml/junit-xml-1.8.ebuild b/dev-python/junit-xml/junit-xml-1.8.ebuild
index 881504a7c35c..0241c4f5563e 100644
--- a/dev-python/junit-xml/junit-xml-1.8.ebuild
+++ b/dev-python/junit-xml/junit-xml-1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 572654947c5b..992da97d5f97 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,3 @@
 DIST jwcrypto-0.4.2.tar.gz 74332 BLAKE2B 4f779d00d58b7b17210042e7de943afcd766890e97859c487244899c10ee222326c68b74695b83034c09d00fbd43ad7108a5dcb84e019a8422722893198858e0 SHA512 38994a1274ce3a66d3a6a3e36f83b311b172e260129c94c70ae02e6d62b7a2fbcc07fd4353d3bf45f0c7f40c63322a3f489c8b1bda80c7511ae7a2136a2415dd
-EBUILD jwcrypto-0.4.2.ebuild 674 BLAKE2B 3f50ae15026a62f788042e6f9cb5e0ed908add9dfde8f626cf9789a7b34f3ba160c6d373bef8c747a149aa074f38af0e3e293ed5193c847d39d813a8e0d4f998 SHA512 66f3e180bf96a7bf877a9ab34c9dc59204aed936eb1508c7b68b6c8922f718e4d9865d35a9fdb049773c28abd3469fe7bd70d620997408c9ce7f07f0a8d3fb2b
+EBUILD jwcrypto-0.4.2.ebuild 664 BLAKE2B 9b5427fd12704e56aa22a0a0c1237d02b25a4ca9b31b3ed65f8e9b78f9eb86565bd7fe86a9c46872a747244cbb193168abcac8956be6b92376ff174319227fd5 SHA512 c5bf2cfef8837b15ad956daad87e362af850e95a5df3a627c3f049f70896643bb23add27511aade96118e23905694cdfeb500f2874fa39a5c31ba40c82f9000b
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
index 886733f05c90..e001979de9c6 100644
--- a/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
+++ b/dev-python/jwcrypto/jwcrypto-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 2605794f8a66..d543f70b1e96 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.8.tar.gz 5158 BLAKE2B 802435e81c8ec2544f26109762d43d7761c8672714107861e5f981583bf38ab85b3c2f1f3be5d25429287b380b756599fb51cedd130870f2cd9cfe221fd2f509 SHA512 8361e30c5bec9a7c57c280d277232ff4123686f29f3813e61cde9bf7512ead2e2f447ea1e18b8925aefe432edbbd9682a690293dcb928a9049c4c81832b5666f
-EBUILD kaitaistruct-0.8.ebuild 400 BLAKE2B 19a90529b1a67c4378ccee75df17a1972df113a15eb66002e7bd7407985995dd99d43e8fced36c7ae1b73fc033536d7bce310baff41bcc3222c0e720205ed819 SHA512 0c563a6f561c4f9b6b34890bbee1fd6746933716b30e64d1c4ca624c140d81589637676906e2a780458fb1aba832cfc687e86423f998e39e0b370658122f54da
+EBUILD kaitaistruct-0.8.ebuild 390 BLAKE2B 97a98d89de43063a8fd500c721626c6a3bd5ab04f435fbc3928c5e785d9e8c198b8d2acd6e0324094ebc93dbfdc0c1b8ce77043d828a245a41f186894e08987d SHA512 005fd4c66f988c7e4aceffaf89ac7cefcc1208fb8a583d799a682a6e34c03fb11fc7533e0555c595d232858b4a663ec433232cecd32cf90bfe3abe89d5e58cca
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
index 8ab274c95693..c932baa405ff 100644
--- a/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
+++ b/dev-python/kaitaistruct/kaitaistruct-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index d6b9c6b13bc4..1f4c23f47e66 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,4 +1,4 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 527 BLAKE2B 2061cc7d034493cee4945b7230314b7f9aae165eb6f22601d2a8a2adb6e2b118f737128c105c7cbeaa03bef2e8b2e436a8429c7ba302f601ac3bec86260e4710 SHA512 dbc2d260bed6f577e94709d0070a91e31269ee736dd4f1b53cb0a890441a927fada69c6ac5a3eb75d6052841d3d50b1286155ab474327039683f75a552c9f392
-EBUILD kaptan-0.5.12.ebuild 638 BLAKE2B c4d2d7a3a3ac8de3cdd99a958d26c8ef92a04fa4ff9437f7b7bd513f5623db293292149d3fdc7ec10ec5eb5df07ad1ab71cd1b03f4cadd5f11abd1dfb3733b78 SHA512 cc773a86970207ee5802bc1864b5f9ac7afa6ce7e4a44156fe6b6cae20c81f17f2426cdd112a91cbb580506ccfdd96e764931e06b1fcd5ec8c9af0e78c641004
+EBUILD kaptan-0.5.12-r1.ebuild 517 BLAKE2B 086c4bd278ddf5e44b78831b4e175a8e1bf5672e29bfcfe346f875e8b268fe0b4dd74124cc2384d7991a2c5e36fe9bbb117bc8aa4701e5cf7046298e42652ab3 SHA512 564a704004285c69cf3fdc3ea27c622a8f8b0a83f560af15a354aebc59fd89dba604b9bf97211b2bc18878c19810f37e0795b17c584ec8e1f2bd32d1b1a40b91
+EBUILD kaptan-0.5.12.ebuild 628 BLAKE2B 44dbf970be0f2f1dde128b9e0892980575051feee7e31470581cb075d2b124687e634c8b96a528d548c26a30f678ae5ed3b52645c88e2d3c6bdd841630cd4686 SHA512 1f07476c76c66b32963a8b8b12cbd5166db2967a926a3c0b2554e05128e50cbd087135eff06cd7c66311b397b9c99522927564e054e3fc4b2ccc708c5b98bc49
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
index 9b14f41ac57e..c3b25697ba3c 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kaptan/kaptan-0.5.12.ebuild b/dev-python/kaptan/kaptan-0.5.12.ebuild
index 095b7eed1629..49b3264cc84a 100644
--- a/dev-python/kaptan/kaptan-0.5.12.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Configuration manager in your pocket"
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 4683ad83833f..8dc4f657cc26 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,7 +1,7 @@
 DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
 DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
 DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
-EBUILD kazoo-2.2.1.ebuild 1109 BLAKE2B 16301fb851fac4c7f7f04774fe21297c795f45e2a1c8bc02e6ad3778b5fe26d40cbef3ecb2f5bccbf7856f88b78ccfdc0989cb56e356ced1ca2fa366d2d8398c SHA512 fbba57836df5383b04ffa911fc4d08e3cbccef46447c17f5af11f469761d6957a0e1155a48e2c496789de7d96beebc54cd216c5cdb075111953fb05fb245697f
-EBUILD kazoo-2.5.0.ebuild 1114 BLAKE2B c5f710ed3cfbfda5ab8451c1ec33dd12fd2366bbe8b1052ada71b23c14fb565145eeb694d940ab058952dd69ad84feea7f4ae68a39f9995a0312b815af05a8d6 SHA512 7530e318c57e8969bb1f125885f3a3485e194d8119810e05778f9336757d20f97fa9d8c99ed2045e32a129b2d51433a76207969c1e96d5de01976524a6a6e16e
-EBUILD kazoo-2.6.1.ebuild 1388 BLAKE2B 3c5a758f52e9a45bdcf4e93f3441d044d817f4d9cf40b59fe08cae76b5018fcf2babc385442cd395bfae322ac1b437ff6ffb7e9a8d0f8d05d93a2e4581be7300 SHA512 6a6cefb3ce8afd69e2512f1f2ee0d21ce99719168ca40190a5fa5d74dce2b602757ce42887b3330e8798fcc91b4e6779535b454395192b1b409c3fcc684437a4
-MISC metadata.xml 467 BLAKE2B 289e2184ed4d8b4435da2edd6698d915a26f2dfbbba93aba0aed35a2adc5f5ef20a95d70e673de980e08d58252ea8f540b913a35a46eb1327821dca49ad36f60 SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6
+EBUILD kazoo-2.2.1.ebuild 1028 BLAKE2B fe674aab4e20f75986e1beb0abd1a9974347b28f4967787d64cbdac9731d9fb151208ae11ce4bd06e533939a0d6dc4546a4cc4c818ef63111f68cce01572dda4 SHA512 b19070af341560c5d497e8e22dbaff9f9a3a12bd53e24eed68b80990eb9c3155bedfb1ce62437166632a078e6f8c9267a70347334850ec80d031f523738a1543
+EBUILD kazoo-2.5.0.ebuild 1033 BLAKE2B fcb17905d19b2a51defa47f47d3d70801e9bef940e0cbe3b135e87a9d47ecf17ff3bf2e9a686a1609dcfdb35adfc0395964e3513ee4a2254f63753ba58c10d2a SHA512 b7d079e96c3a106c2033898a0579c1b950de4f73b12634bc74c5f63a88910495673ceba7eb9f05313e657d47a925191d2f0fba7efd5c2afa5b16b178670c2ce6
+EBUILD kazoo-2.6.1.ebuild 1197 BLAKE2B 05fbf7e335210058faceda367516195004060cec27710dd3588c8fe7c70d048729c7ead56005cd61fae624b5bbef29a210c922727264a096b7fba8896f0dd119 SHA512 605631a38a8ee89f704e29d18055da5d1d700d9b241e6a6c62efb33af29d55464d6560e9d913ae4a6c883460e7c5d55d665f7ed3571b95a5dafe4345edb416d1
+MISC metadata.xml 375 BLAKE2B ff98d7e61ac90d35d8c7a5a7c60bb37fd55af628ff666f32d49df54eedb6797d4441d2aee8ea0e39840e9568ea3d1a188f0f994c523a531c84df5c2a9b19f6fd SHA512 339bb1ad3961d86caabefb90061d6c66e65b3afc7847fa26074615fba70913743633d548ed06c9ec6d05b288ff7aa3c4603e368713670490e640ec638376f474
diff --git a/dev-python/kazoo/kazoo-2.2.1.ebuild b/dev-python/kazoo/kazoo-2.2.1.ebuild
index 4353704e41ab..b28f3592a0e9 100644
--- a/dev-python/kazoo/kazoo-2.2.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -13,11 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc gevent test"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/kazoo/kazoo-2.5.0.ebuild b/dev-python/kazoo/kazoo-2.5.0.ebuild
index 91f07befcbd8..ea7d38dab9f2 100644
--- a/dev-python/kazoo/kazoo-2.5.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,11 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc gevent test"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
index a81c1fbe6c78..b55f6915f63e 100644
--- a/dev-python/kazoo/kazoo-2.6.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -13,11 +13,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc gevent test"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -26,8 +25,6 @@ DEPEND="${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/graphviz[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep dev-python/eventlet 'python2*')
-		$(python_gen_cond_dep dev-python/gevent 'python2*')
 		>=dev-python/objgraph-3.4.0[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
index a186ebb8fe6e..36934bd119a6 100644
--- a/dev-python/kazoo/metadata.xml
+++ b/dev-python/kazoo/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <use>
-    <flag name="gevent">Enable support for the gevent based handler</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">kazoo</remote-id>
     <remote-id type="github">python-zk/kazoo</remote-id>
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index f934f7487ae4..fedbf43633b7 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,5 +1,7 @@
 DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B 81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf SHA512 9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
 DIST kconfiglib-13.7.0.tar.gz 182782 BLAKE2B 976a8e4e377933e42dc45c79598a175d302d34f48bfadd764c0cbfa2ddd4e15ae6ba22467c50d41657abbaa1f4495c556fb4c1deb9c96e1119a7bdd6ae8a3378 SHA512 0376b2c4e68b7ce4f105f52a3b4793a23cb844dbd9ab183abbdd79e2f7958e3be372024ce82295902af974f010c73c4ac97a4147bdac8ee9b52900bc15b8bb6f
+DIST kconfiglib-14.1.0.tar.gz 182990 BLAKE2B 1e5a5f7e6d1003f4fa005b2b08abfa17cbf9f6837d9320f313b23f19c6e9e7aa7c8fddf5ff38871634257ea050390b279becec0c4e0638cdb53182347217e937 SHA512 929a75f9b9f74ad7d4190c15d7178b94ee0a6d1fb71d85e2942935e3a9370a4f2483d8b49123d41d6610841ad9efde1dc4c14fc5231a08379d438a486ed3f97c
 EBUILD kconfiglib-13.2.0.ebuild 996 BLAKE2B b60b5f99229287f2cb90285539c71f40baf5631dce57e9a7c83f8f7bfd5497971650fe31d68613d00bbaac0dc223205a00e213d3535f1aa9144d20b9fbee8642 SHA512 31fe781535f2795a1a89d5a928a8dec1e0a52c8e41efebaef69d496a913d9c6d168c9d0b365255be74e3e632c9bbcdca892d64fb44a3abd0e3093d4c45e7211f
 EBUILD kconfiglib-13.7.0.ebuild 998 BLAKE2B 1481ffcb51db9659ba87c2c42d3a5c7350c2d3d88a819effca5926400bcbb1bd1213dd0b08a8395c398c1f1a0c626dd0c99a77e637cf331ffebbd97b752d9843 SHA512 a2db1ef99a9972295694ef9b81aa83d3586e40b2f2ac3476fe1a0b6e3ade62018e14aa2104171ba27c7a6892303c85f3281f74708dd597eb2fa4e2fba534fc42
+EBUILD kconfiglib-14.1.0.ebuild 959 BLAKE2B 338a21d2e6d6cce169a46b27d64db5ef31b83f78648dcf2552e6163c78c82cfc0bdd9712b1fd00b5049d2533b232168840581edba9e399c9f587fdbe9fd3684a SHA512 c0e0cce217717e59dea79825cdeea9c6eb8553cf042ca8d4948be53fde503bda59642cdd71049d0adb4383278f78136bc00b4d7ef69a552929232c7c87dd4973
 MISC metadata.xml 331 BLAKE2B cf19e7c3a4a2511e58382941904de06eb12e21c0a1f27c89fd3f61ff1e2f96d9e8509aba80f52080ce4a53da8f99e8a15685803b143fbc9071d33ae6e815a1e1 SHA512 453f9a6063705a3f9db24e5c0658e31c73d234dead14ccecd8d46fe56f26b16729f4f46c0ff7471689c60eef5d9c006b455a14f349f1249ae2e9f0b677ef80f8
diff --git a/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild b/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
new file mode 100644
index 000000000000..52b0349ecfe9
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# pypi tarballs don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${P/k/K}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# hacks to run tests
+	mkdir Kconfiglib || die
+	ln -s ../tests Kconfiglib || die
+	# don't run kernel Kconfig compat tests
+	sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
+}
+
+python_test() {
+	"${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index bb636be2f513..8a346a2d396f 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -6,7 +6,7 @@ DIST keyring-18.0.1.tar.gz 48559 BLAKE2B fb9e8df5ae04b4c1d646b4129cf34d420fd0578
 DIST keyring-19.2.0.tar.gz 41728 BLAKE2B 24a8f095f4009f37fa6d5e7bc2b12be816a5db2abfa4416fc18203a818296c775fe34a2936a71b191700ad511e01059974aec374aea5ee312507a27bd8be76b8 SHA512 5104423289b9e537e64760afed38e5851766b9c955c0659b078cdaba82813e93922e488b5465157cb930285416feef07c0b559fc49909f58bc85b6f30d55dd75
 DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
 EBUILD keyring-13.2.1-r1.ebuild 1206 BLAKE2B d58a9dfca3fb0c5bc18320860dd4b449c2b894a52b3c9e30d2ad79187a3e1e0ffa79e96c4fce4933af8837130d69cebe7e1873edfaa47f1a2c3e3fe3fb5e5c90 SHA512 438bcf7a540fd4ebe5973de06b3b701d1a76516f3f49bf8d5bcbe428e31579c96f92d65e6deba4c97b109fdfb5453231b1a52a1d6e7452442ed6cc4948782bc8
-EBUILD keyring-13.2.1.ebuild 1041 BLAKE2B 225dc2f072384d1bf6adc54a5bc76946853f6ba8a77fc197664f596aabe49640c7cddbde2cba53bb821e4366e8c96a7a47226a06c14c5041c07123a7a36e8d4a SHA512 9890114565c7c802ad2f5ca704e2de3638f28822b43ee925bae80b9475e8c2629cb30ba2821721c135dd69f1a8cde285035f4483ae9a1260ae68cea33328941a
+EBUILD keyring-13.2.1.ebuild 1031 BLAKE2B 03bcdc382defcffc6c6ae56d9818ecb739a560d186d7589029a784fa824658d842b646effa9ee51c243dc894ce7c8a570a32d84aaa7cdc2fe4ae268c950c96aa SHA512 b7e069067b3cd631520a8367c237b273998f9d549557bafd6ca1496ef75620ccc8f1ec70e3ded52ca1ae6b8e9a6175512114a4c2b1c18b1959f3ebfb5158d27c
 EBUILD keyring-15.0.0.ebuild 1212 BLAKE2B fffd2ca5ff0739806636894bd3b7adcb78b091902502d4a823edce89e19f654aa1743dd7bd7698fa0071a8adc318b90839723b426b3a889da84c773176917659 SHA512 21a6f56b1cb751430bd68bbb29cbd6b7de82b5968514d79c8ea9227a552d12aa7ddbacf97f8b8782a1ade02cb67ca6a9f29656ec04080de0b7c86ff01601d4d1
 EBUILD keyring-18.0.1.ebuild 1229 BLAKE2B 9432164b90a9181d9fd8c5cbbdc118bb80a27c2ea933039652ffb03cbbb418ea3df42c504f8fac18cdc6aa4e8d86a05f8bceaa40edd26ad514f83eea43b33129 SHA512 24d2965f17fca86cd6bc4e4a51be90f1755c1c6cad8c01ca7adc0a40e780a5d35609dcdfc86fee1c96c9285a0a1e0f162eab51e80c6a3fd46fa650ae14e6abf6
 EBUILD keyring-19.2.0.ebuild 1479 BLAKE2B 98ac7371595129323f34c9ced7b2bfedb4d45b55bf68961cd4f14532198f4b9c7de4d9e4b645a2c3efd948333abf3480f498388922fb04dd7c38327df8097412 SHA512 832615ea9a3912a17f48548bfd14c30ec62d9dde442b4d3924ab0c326abfc70730fd0505b1665af26eb86aeb8cfa55830910e111e226f311dde6fd130e0c85f3
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
index 7000b2538916..7e1a5184ebc3 100644
--- a/dev-python/keyring/keyring-13.2.1.ebuild
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index 663350bd3e3c..b6630c1011c4 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1,5 +1,5 @@
 DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
 DIST kitchen-1.2.5.tar.gz 255350 BLAKE2B e4054c03130dce3fab3593da86cc9952cd748d0d0b300b7ade7a16bd433f7558045f10eeeb0c8840f59610140bab268f9e75e49f0f9504e221d886edd2b2a3f3 SHA512 f516d66d142b7e5d448abab911d08dcd4fd671144d0e734f12523248641b560bf451581704841225b46ec8b168cb716dea661c6c4839052900ccb1ac204b79f5
-EBUILD kitchen-1.2.4.ebuild 421 BLAKE2B f7308502f4fc27554f06e96a22a776b2683989830c48102924b23db71a71f277cc4ca6461d5cb7de647f6b79f8fba98dfc6f3bba043d260be681e3ca10243788 SHA512 e6fe95428bf90a3f6e1423de129d4bbf60c6eced0645e954fcd26c0d0e4a7653fca903a8124ba97753df650bfd5261dd343e138501ef7403141e68ab05c2ef69
-EBUILD kitchen-1.2.5.ebuild 413 BLAKE2B e0cd91ecb8fe59a3390e84a401e35bb15ec6295880f91e3e3d9f9fe51a9fcd671496896770457ff1120acd8038e6aa13623d0bcce5663c6ff3fcf2de21c6731e SHA512 81294fc391479c1aa53f29880cbcb097fa48f7070044287e5fad6b00dbcad18d6a3a6d55f020165551b156e7f1acbf927b294bf7dfe62573ce76803b06297b22
+EBUILD kitchen-1.2.4.ebuild 411 BLAKE2B e2e1360856cde4070f43f6c8bcd5c78be659866ca8a671bcff640aa6ac17897e7f87867ba994367fda275c76f76486fa2894d8ab45a47f90f4edcb03439feca9 SHA512 fefb4a310b733268966bc7df8e7736ccaafa5b28c570d104a8438d8da5caf267643d064e0cadbba42cb3a9b99383727eca37c46b3adfd5a88c5a2ac04710f11e
+EBUILD kitchen-1.2.5.ebuild 403 BLAKE2B 5685c1dfda76ad9455bf971c6fa58054b3ed76bc67d22d452dc8f6db2639ca5e0887f0efa3805b93006f0f9546a736afbbadbd5667a36d72fed3aa3d10122132 SHA512 381acb89490da8cdec111c40c467fc37f27ce37813efdcadf92623bb361130d8562d0075ac69b07da99410628f0e12901da6db232d42d5427bbf342186b480c0
 MISC metadata.xml 394 BLAKE2B 7dc512534576658b0235d756ef866ec734882a11ed3c976751b0c724cf01c9a4ac1fe828bdd63f98ea91d240eeb478f9dcba07ad3017af16cc7e53a7fb7b381a SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index c7781b8ddb86..a3b3a65da25d 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
diff --git a/dev-python/kitchen/kitchen-1.2.5.ebuild b/dev-python/kitchen/kitchen-1.2.5.ebuild
index ec7319b41b17..b2f19f14cfeb 100644
--- a/dev-python/kitchen/kitchen-1.2.5.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
diff --git a/dev-python/kivy-garden/Manifest b/dev-python/kivy-garden/Manifest
index f0430aaf55e9..1bae10c02081 100644
--- a/dev-python/kivy-garden/Manifest
+++ b/dev-python/kivy-garden/Manifest
@@ -1,7 +1,4 @@
 AUX remove_bat-0.1.4.patch 343 BLAKE2B e607d29191a031cd49f8932ae4784e512bbef844a2b99cfb8b7e543298ffc7b557dc131a838cbb0a2fb9aded2738835f27b8da871f3574d057114b1a9cfe23b0 SHA512 25d921c2790742537f64404c35c24cc8bcc0ceb0183907b165976ebfa45636f21b3d137e18c6b211d653c6fb7be395d681d0d1d5ac70c0e09f7276b47e36e328
-AUX remove_bat.patch 338 BLAKE2B e4d40146e08de4f6bb013ced86bb9f15fbe1dbf31a9e6ab7ebf099b731d3926dee69789d9ccac97c1c71cad601960bb02c4aeccbbfe068df2956deb855309b0f SHA512 53cc44b84467a74323b5bf2bd7f6e7f3e08dc0f6eaa3bfba740ced968e66e40ff422ad6ff3fc40f1a09564eb244486b3b960f8a1e8dba7aeed1122bbd05bee47
-DIST kivy-garden-0.1.1.tar.gz 5789 BLAKE2B 559f9cc2e58a39881bb08729913a154cdccfdddc9f0b0f6b5f594d2688b37b8ceee463b12998832228b1a925c441aa31192064c2f9974c6a5db8e4242db082e2 SHA512 d551e8fdb08c7c1810972df04b024fb59554a94b9d6dc98a1438620541c13152e8c7de4cc603efed4df00e3d681d8545939ab417266459e26e116ff6660d8013
 DIST kivy-garden-0.1.4.tar.gz 6849 BLAKE2B 944d84ce9057db64c1435d9e4f5e4b8d7e812cac39a7ef536974f5b4a4e525d2ed7dc8c214db75d20cf87bdd1effa9e1312d979e264bb93a5edaf4cf43c7441d SHA512 69b8fa2e2e80cc215eaad0eca78e1e207726ef2f611ba328863191580c19e77de970347b206c82927d92fbc821811956f8c45ac3613dafb2db706a491c50585f
-EBUILD kivy-garden-0.1.1.ebuild 548 BLAKE2B b0790f8897218c8b6f2829a8915e88663211cc69801f4032540580151b2535da5498c88bb9def14d6e94e612f159c4902da0c349de83502ef41bbde2973cfe53 SHA512 6695e9d381f4c50fb56eb6e2031ca2cb94bc430d37b194bafaefba36d9dc0e1d24f06aab539a98eba4f043ba1f2f15b9bcd4ad4d6f9cbe1407211713f7662337
-EBUILD kivy-garden-0.1.4.ebuild 749 BLAKE2B ee7f346729e5ecd892808ac7b9cf9178020557b6ca70501f5162a87c6970a805f5e4cbf4ebc8ecc0608ed0afeb59180167f21b89ba45699c1dbb1fe4b1c49024 SHA512 920d33aa5d7de91e90df9fb8a8c9c6cb08a650aaaeea3aadfb635e86a7db2175a2dd41ca993704b8e3953de8e1e8ed227e367ef10f305716e7ac32e72c24e1a1
+EBUILD kivy-garden-0.1.4.ebuild 743 BLAKE2B 5d97112779523c0f192f2fa5f9d2d5d83b4f15680155b3d93e790602d9e25f4eeb4f34753f366180e2714db512ba201083b383c43ae2deaa5c5e91a80c3b2a58 SHA512 36914452c0d6769e660b92fd1b9faed3672e701caf42168dc406f23af12dd7d680ac7b4595e99e80046323ee81769075b66f1952b73a0ed5114623d4c8275276
 MISC metadata.xml 481 BLAKE2B 52d95945cbd4b1e43d1772a6646044e4881c3a2d5b99867f8ec429a14d988d2d8c8169da2cf7308a13814ee45a9970570c1b179797f206c9003e8fecdcaf3238 SHA512 9b5a266a1369223bdef871fff1c7c6b0136a7d8243e20db29b2b8f718436661572d5c149fb05debae03414e57807d3ecd52fd4ecf25f44a3740b37aec71850e2
diff --git a/dev-python/kivy-garden/files/remove_bat.patch b/dev-python/kivy-garden/files/remove_bat.patch
deleted file mode 100644
index f178f2b1314f..000000000000
--- a/dev-python/kivy-garden/files/remove_bat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py.orig	2014-04-02 08:48:05.906881843 +0200
-+++ b/setup.py	2014-04-02 08:48:16.650214908 +0200
-@@ -8,6 +8,6 @@
-         version='0.1.1',
-         license='MIT',
-         packages=['garden'],
--        scripts=['bin/garden', 'bin/garden.bat'],
-+        scripts=['bin/garden'],
-         install_requires=['requests'],
-         )
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
deleted file mode 100644
index 19473ac88027..000000000000
--- a/dev-python/kivy-garden/kivy-garden-0.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kivys Garden tool to manage flowers"
-HOMEPAGE="http://kivy-garden.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/garden-${PV}"
-
-PATCHES=( "${FILESDIR}/remove_bat.patch" )
diff --git a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
index eae27fc8e7cb..6a757ae94999 100644
--- a/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
+++ b/dev-python/kivy-garden/kivy-garden-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index a6bdbb2e41bb..cc325ad64e56 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,8 +2,8 @@ DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc5
 DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
 DIST kombu-4.4.0.tar.gz 435287 BLAKE2B c87154f5f8862af9e0381f1f4eda6016e5ed69605a39b682c9e648003adf4aa4ed8ebbe7f6dc38b293ab013d8f5e31bb732cf47cc4aab7738be7edaaa25ca750 SHA512 2f7bd71f848c7bba0643e47c43af79ae09373597bed86786e3a90f2acd69414583021e7f5544e47bf01f760b1fd9788e89e88a32cd22a3d74a34845b7917e10b
 DIST kombu-4.6.3.tar.gz 427754 BLAKE2B 0db078eb8d6afd18a5e9b48c970791d2c55c46f5f705e8e0737c8685c2415e1ca974594377a54764f744cc73ff607668ece3c0999b1a7dad6a259567ac1fd319 SHA512 35113c4f19fe6bf94c374477c89a629f565975a23c16a3cedefa8e0c2a800cabbaa8917d48f732cf28e89cd5430fe8408a3514e055b1858c216b6ea31b4c014a
-EBUILD kombu-4.1.0-r1.ebuild 2312 BLAKE2B c5ae64d170d40321d11e03fcdf7f075307852609daf0ec7995f803983156f040959928016dbfa99e4ebc0ca370471053359f65c5171f01b94e3a783550110553 SHA512 7157e878e4ad438ba996be82dd5d7d2aa7ebc5d6882975a74684ab313d396030b26c6e14a3e99d41cea548068f1c5c5d8e8fe0da940e6e863e3633d88aa242f0
-EBUILD kombu-4.2.1.ebuild 2312 BLAKE2B c872414990381677cfbc9c691bb798cd1a5d2706f7591ee23060fe8855f551a33b56d4177a0d611f3054700c6890446ca4e32f9d80dd3d8cf0c2aa63a320d0f1 SHA512 10820964349d9be1fb99fd04856386d03ba114e6adb8e7f740230e3c027e988a108586d0715434ff47680c6f67a20c491d1be498c0f972b0597649827780bd52
-EBUILD kombu-4.4.0.ebuild 2314 BLAKE2B 409bca41b8a40cd9625c19299cad0e7dc794b92f331240ae19f95a62303f8de0eb1f138f99ecba927116cf58e6751e6f0662aa64b70ea244b8eca835bddd016d SHA512 7660303891313a42e35df8ff172a62f0b2ffde136ef1a62114a1b7cf3d9050fd37b2db1aec20af02d08cef2173569e7a31f4402566208ab0fb4b3e43e9aa0b76
-EBUILD kombu-4.6.3.ebuild 2321 BLAKE2B c57ea918f66f41c0ecfde70a9d8de3a3aeb419f5d48ac475b315905d1e1b81b75f2876ea38e283431652e4c0fa4ecc01c722f3f08c5701637d32b565fcd2fc3a SHA512 7becb075e3a26441ad39336866d16091d609bf1d73d7e64f8be113be8d3bba85d4cc70470111d98719c9b6e08d9c60262d36f52eb6cdca04fe70363f88753842
+EBUILD kombu-4.1.0-r1.ebuild 2302 BLAKE2B a457db4bf36e4f27d9c9fa04a6154dbd17ec5b05d51c38604235f405884dfad27b1f6ddf3ae998b205736084f960b0e3c2bf3b38321170e710946dd1045c8afd SHA512 3bc68fca1abb5041ff229e5abfea234e2616e6b2a15246a89d4b37b1eb2ef24eb8c08cf7959fd6720d402ee3103cd942b96fc36262c332f023839aedbf6ecd53
+EBUILD kombu-4.2.1.ebuild 2302 BLAKE2B 5ea6ef36d54725d0c25cc911e3b54328b93f8b11af11a7cdb715a5740c4a0415be79982a2d8e05bd1310a51b77166f7132cebb80155a21d8a75237f257b685bc SHA512 ff2abcf09f7e24d02ee42b97a505290d43676d81ca46b1a1a7d69f0e78c1312c601cd3f18796ff4499157dfd7f025bcdb2df2844692b1fe596e335b7c39c802c
+EBUILD kombu-4.4.0.ebuild 2304 BLAKE2B 2f79b04c027a8f00b4d635646fd1f11830b09c1153be6048a356ff53488ec5e9d97ffb26085a3ad76d3328e95a928e3f1fd9d5a414bcb7b017c3ab395df61b3d SHA512 c7702d6c1fd6eda60fa220f64fa30eaec5676f7c9ee44761155c7b6db2e7c08c43ec5a37a3636d6db7f193752382ec86c612aeb1051a7215418f60700b4911f0
+EBUILD kombu-4.6.3.ebuild 2311 BLAKE2B 3cc134c1c83e228ed750244514d4d0f9e7556efa77361b1660624d8552374fe6af83174ea60e4c6466661f18952aa7a086652dfd0e8e2e99b7bedc95e3ecb0e6 SHA512 74c33f886c0803e35e334dc582c1d7ed3001a5149caf3d3885c3c599733f760839b1cebc36e71ff2c6e227f690eaaa450a08b256b5cf4bab36df54b196348551
 MISC metadata.xml 675 BLAKE2B 6bab5465ca22ad8ab27ff08418abb6c6616972605b2b9bec7ec559f887962c80df01e6c9aa8eed5b1ffcbc392a8476f86ea477fa3c4084ba37e1ba350786f8d5 SHA512 37288783570daecc3bd70a8f5e9b96e652cd2271f1a36f9ecd644b6fb98f4dadbb2f2cbe36457c46d4b99d67fc5cfa6fea78f37bfd96b3b639cd26de4e948541
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
index 0ec84117cd48..a02d958b2eca 100644
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild
index 693a1e87d4f2..b5a2d6393803 100644
--- a/dev-python/kombu/kombu-4.2.1.ebuild
+++ b/dev-python/kombu/kombu-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild
index 387f273a303e..335e162cbf28 100644
--- a/dev-python/kombu/kombu-4.4.0.ebuild
+++ b/dev-python/kombu/kombu-4.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild
index bd142f3dbdf0..aee6727a62c5 100644
--- a/dev-python/kombu/kombu-4.6.3.ebuild
+++ b/dev-python/kombu/kombu-4.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 6b75a0d3c6d7..704050c4b04b 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,7 +1,7 @@
 DIST lazy-object-proxy-1.2.1.tar.gz 28860 BLAKE2B fecf6830111c9ac317fae2ebeae624b4b62494eadeca08bc6cb63bd6a23132cd954a55c97efbede3b136f4bd20d2c35c861d3f89022403d7d777bf762c656e81 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8
 DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962
 DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
-EBUILD lazy-object-proxy-1.2.1.ebuild 985 BLAKE2B 1939270791e08e15eaee56121e028c25070ca3afcb055d262fc1274cd5dc4ee67332dbd5ba138d2587593ec1b622cf2b4e0a5346070ab5b689e274442c7100c4 SHA512 939f83320c8f79a97e72f915f1bf4b57bac792f4138ef7a85cd7b56e05ffe97f4ce9329a40425a19b9fbc2eb25e02f00a8d19cd6bffbfa235c1d15f0d65cd084
+EBUILD lazy-object-proxy-1.2.1.ebuild 986 BLAKE2B 7749a3a4bb0557ad5e39fbba0ea381b1b6de60f5c5e4463b047e9504e0147aaa72b2cf383266ab6def85a8028ebf8c7d71fd1d83f7d774f729fe80acc344b20d SHA512 1def9f447fa346664dcff38aeae3d06df4402b2148040c8b9364d3e0fffc07a5c75b24555729f49074847bef896a040809c238bbdb075e8a778991f30c68bddd
 EBUILD lazy-object-proxy-1.3.1.ebuild 1017 BLAKE2B 6e7ae178b8f48c39007d9ae9eb428783769ba9cec6b919ef7abf31af3e1debc43d7b3c3f73805ee5cf55c34471cef0f82726f91cdd7a78e3478a8e14f6b95e82 SHA512 96a3b5e498eec9336391cd7a7cdde8bf1a522c7e6f68fd8864726e21e9b82b3d9d2b7256df8d0206ea5d2d26325f4509cacc03f7a2c24bbee30f92cff236572b
 EBUILD lazy-object-proxy-1.4.3.ebuild 1004 BLAKE2B d070eeb7eff82403e910e074b8cc12ca82de60c64bd797895b5544655dc67362a17efae9bdb4f06f3781733f552356163eb5303def02c1418eeb098830b05398 SHA512 44f64442eecc93d51e8fc4b604b0a12bcd977ef965e5fa51c3ecc18e8cf2aea38637e5bdd894b1fd940d979411bbb4ca38aab9553811d34586fbcb360208e60b
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
index 434b20bf38f8..f2eb2811f2bc 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 54c48a06e6a4..66b325deb263 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,7 +1,7 @@
 DIST ldap3-2.2.3.tar.gz 331483 BLAKE2B a6479e6a02d0a0682b809cea2b63ff9ff3935f2d083b9dff3a02468d3a27cbc75dc69dff64f523c0b077f288b3e1e565433af13a607568617c309c3e894d7a62 SHA512 a954f6c582e88addf0bd6dc6fb24108d76d134b80c14a3dca0f9f667dbbfee484cb7b0444822f7e82a41af7dacf61ba111b6dcbf215b7f6df26a3784cfd2fc83
 DIST ldap3-2.4.1.tar.gz 345220 BLAKE2B bcf2ea46d483fd4fbfa7ba48e2a2e72061e82b56ac5bcad0e28aec0d52a723d5e5b2aad1f1c335977edeb260264a5603aa2a2bb726c08fd46a0215c46ad2f287 SHA512 716671c2d07c53d1953aab4668562a1b59a1e642b19d50f3cf05d44c74b6848a34b4197aa2c77f5b1d6b556ec0ca473b0495c24da74e2395aa20dffc8a0a360d
 DIST ldap3-2.5.1.tar.gz 352262 BLAKE2B ddbc2146ab23ff2532290e54e8e92c9721c3a312d327f6ec408330335d7b8f30a698e38ea07d0bfc3b603985ce0b497cd8f69e0f0093379191f614fb8e02514a SHA512 8cf3e656f3b58ead391f45c44ec2175ecb7abf29047e4eb03d9f95983cb01900159a4e27bef596df5ffdf7fdf3827615663872c35bd57dede8c9b789aad191e7
-EBUILD ldap3-2.2.3.ebuild 856 BLAKE2B 4eac11a30ae7215da56bc68d3c77473b4f5558331ad17939f208ff1c6568368f6b34672462dac5c5d945741e93a606a627cb1d129360c7f90d0bfbd7d5f568c5 SHA512 5d2b99e4a937314155e160f29ae818a035a4d3c408ceac0f660ccb86e6e2c034fb595e5ea26f8a5a5cec2f45d1fe8c57352dc034f0afc7446fc64d51b447c13a
-EBUILD ldap3-2.4.1.ebuild 864 BLAKE2B 480a39591eafd5e6be80a3bb6a84247603e7a7dc7b934c0e865cef1deced353e8a75ad9b0b51b4f563e54972754914e6350e671fd8c00ab7b5652d61bb77e220 SHA512 ab3f7f36de9b41fc5cc4eb453cefcdad1464978ba267403682a73165cda8f03f9c6feb1f80cb9a472dea6f915af0d18bc362f83d7f2b92694d34d2e623fbc566
-EBUILD ldap3-2.5.1.ebuild 864 BLAKE2B 480a39591eafd5e6be80a3bb6a84247603e7a7dc7b934c0e865cef1deced353e8a75ad9b0b51b4f563e54972754914e6350e671fd8c00ab7b5652d61bb77e220 SHA512 ab3f7f36de9b41fc5cc4eb453cefcdad1464978ba267403682a73165cda8f03f9c6feb1f80cb9a472dea6f915af0d18bc362f83d7f2b92694d34d2e623fbc566
+EBUILD ldap3-2.2.3.ebuild 846 BLAKE2B c86c287d9b3e2150e0779b905a1a048cdd49c19e2003ac8e07f3113c85b1a02db29a691049543c5a782fb43b9434f29c7e6ca0d2f700b468996b6701fde874c8 SHA512 438ba4d1756b70946a9ec67250041217073c279b6ad0635cb08eb2e82db84161a3c845353b842d3f7f8fc8e8f8cbbfa57b4e567bca000e3fb114495ad7d42c11
+EBUILD ldap3-2.4.1.ebuild 854 BLAKE2B b276aea74bb059765ae176ed1daff90b1e035b7f1dd790139efa4746920ef11698f720fafdc3cb721be6c822a85a71a02f8c0d10be8d58cfb0fcf2254ef58529 SHA512 0e8ca19728eb980445d0120d69275c70bcb4004326bc8c87a8981ad68ecc966e6be1b232c8c2d56169867d5024b036b820f5c43f320b317dd56656346308ca6c
+EBUILD ldap3-2.5.1.ebuild 854 BLAKE2B b276aea74bb059765ae176ed1daff90b1e035b7f1dd790139efa4746920ef11698f720fafdc3cb721be6c822a85a71a02f8c0d10be8d58cfb0fcf2254ef58529 SHA512 0e8ca19728eb980445d0120d69275c70bcb4004326bc8c87a8981ad68ecc966e6be1b232c8c2d56169867d5024b036b820f5c43f320b317dd56656346308ca6c
 MISC metadata.xml 667 BLAKE2B 3dd9eac5fd53006653b3e1416ea1b7b4445daee2d041dce6672043effb4a4dc919503ab06b18b6e077981749f25b787657a3f8ab7d68572eefcda78af4c15faa SHA512 f92f6b96a6d9c32f959d278edd654495b0e8350ade72dde717b285667c0a6a9f472ca164b8c5f7e96b6f4aab1f48368a4a5836f75ff5e55941f8953b6b02e747
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
index bb9a228681c1..d594be37ba6f 100644
--- a/dev-python/ldap3/ldap3-2.2.3.ebuild
+++ b/dev-python/ldap3/ldap3-2.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldap3/ldap3-2.4.1.ebuild b/dev-python/ldap3/ldap3-2.4.1.ebuild
index 08e6ec09b5db..a853da85417f 100644
--- a/dev-python/ldap3/ldap3-2.4.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ldap3/ldap3-2.5.1.ebuild b/dev-python/ldap3/ldap3-2.5.1.ebuild
index 08e6ec09b5db..a853da85417f 100644
--- a/dev-python/ldap3/ldap3-2.5.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lesscpy/Manifest b/dev-python/lesscpy/Manifest
index b5166bc40f88..ec94e49c4752 100644
--- a/dev-python/lesscpy/Manifest
+++ b/dev-python/lesscpy/Manifest
@@ -1,7 +1,7 @@
 DIST lesscpy-0.11.1.tar.gz 159706 BLAKE2B 4f664d7e6d6edc0fea6db8d9b664703e408cbfccd666760ce1f394746696c61b28755668c7fe0d5ef374735e1ab6514532e2992d2d0c6292ef88861b25636225 SHA512 2cf4e8c3a46cf5e9a7f1dd80f613550fa0e857a8acf9d33d9da2f7a90e1b264bbc18a427668f152ff136b438b19866f016dec91794c721b98ec2f2456dc504e3
 DIST lesscpy-0.13.0.tar.gz 157854 BLAKE2B 2a06827233e5142249298c75d323ffaed2cf497f5ddf86023e65235417f3fb970e66a6b112e9eeb38f24868ab98a6d4b9bcb0cf8a53a2121fff44098fdde459a SHA512 227db8212a386b06f288140d09b7505ae43bc6221396fa2d154a6d7f0831cf1ff005d9818fd85fb3804103b725b60827cf56a29930c2de928546ab0dcf3d5877
 DIST lesscpy-0.9j.tar.gz 32061 BLAKE2B 95edffd8cfe958d966062fa58c041ebf411d5f771d48cc1da9f868c35094bb5b465449616e994690c972414cc188c9343ae29839df9fa57711e4575a42f927fc SHA512 9063b89a1ca8dc8424b3b1989bdf7c31de74e26ab8ab5ede1664f53d1ff1946308d9add65236cd5fabc58efcaf1cb5789fa73f0775a83cb70ea9a73d25207a73
-EBUILD lesscpy-0.11.1.ebuild 730 BLAKE2B 7dc44edb5fbb536ccb10113457b01e2a9cb51e708ee30d70225e75a58c7e3b83b9b0cbccd8af100e2c1349cda617e6c24051b9905e2b1bc9e862a84df4b8a5be SHA512 db49e20f0bb3ca98da4266147a2e44daad70793369cd6926d73178b11168e5ef57db961a20ee1a96a59326144d15d64d0712165305c0e987742b80758210f16b
-EBUILD lesscpy-0.13.0.ebuild 730 BLAKE2B 6a5822b37dbce720a0d3d2ebbf306918b1a3d604cdafeeafdcb658eb843df1ddaf497ae179ffe759f1d2bb6a9c64bfc8fe7ab03c62a29c0a2bf367f3f4abde5d SHA512 1ba7bf39188a9d54b72e7919cf7828257c94276e7e0ae65ef27fc6f5005a63dc5f29bb4a0ef1bf7e035ea5e33af1c5e9931410415516d14a6abe1227a07efc39
+EBUILD lesscpy-0.11.1.ebuild 724 BLAKE2B cf6eea892fae394d5c338181011176c1f15ff135a54cd007637da666369faf64f12614da3b42ac69e87324be65710bc5e1645a1072a213827e65fb0d7c120f15 SHA512 b97a84e4404ef808d1a7888fc71ceb569bfdec490f006685fa62420413fb6b480797e0b23b2de09b1e816f4b297eb624f195e454bd7fcb589123147a95fd4b4f
+EBUILD lesscpy-0.13.0.ebuild 724 BLAKE2B ad1ee2559270c995a799e5ebeb390b9d50a85e2cbbb3b0bf315d0d08fe8878adf8b09c5b2192848cc946e61c703593d3bf7426e4574c7395b98cecaf12c67e19 SHA512 33ec2c85d5198c277ee3fe735c9a935775abf05d81d6e5f7df1466100b7754ef4cd15982b1b6103c66837c1a714ee88a030604c94e4f525dc4484eede8967dd4
 EBUILD lesscpy-0.9j.ebuild 602 BLAKE2B 312ac7220ceaac8bce032135c7547dc433e8cd0157fba6d96c2e58ee137b19e482c41157d041e6b5b6c6131c4990cabc8576ff8696385cc6bed186bc2abfa755 SHA512 b497847362c635ab70183aecd75587b8df0bf4b11e8f2fb458253dd4c2d40ebb470387e461d14c829d217cf61f98d3d3b0a2f69a6d3b3be6a183ea0c3e7de0c0
 MISC metadata.xml 548 BLAKE2B 48939d5743ccc8041dcc22e6dd09842374253d6a34de93a7fc10119ef2abd8b860d5e9febc18e5b11c5913f52588058706048c3522c7899fd44a1db4c7612da8 SHA512 cd7c549b5130cdc08e12cccb5a0d68b5f19f2fddc97bce839c4dba5300608fe871663154ef0348623c52295e79d6efd6fd42580713a877430e82aa964b1361e7
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
index 9616d41cb732..0aac1ed93382 100644
--- a/dev-python/lesscpy/lesscpy-0.11.1.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lesscpy/lesscpy-0.13.0.ebuild b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
index 4f4872ce6017..669434fc4446 100644
--- a/dev-python/lesscpy/lesscpy-0.13.0.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index f3e7a2e52533..bd59af53e24b 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,5 +1,5 @@
 DIST libarchive-c-2.7.tar.gz 42299 BLAKE2B 6e7930f4e403e23a989ad7c519143ae81cec62e40ad77f36d8491d8d36b07419d77815bf719e5782c1bb0b68692798df90c532947ddc5adec96f0077da755b25 SHA512 809319cffc250130c1414885d4e2de399a8ba92f6025848f1423bde79eadc6f686f934f4b17fc0a90ea84379b94c5c38d4849b2b28e2e03f8d16548152dbc856
 DIST libarchive-c-2.8.tar.gz 45182 BLAKE2B 8282c46f1e2bd4c9e83809743953fd8f11408e7c7b0849735cb1c4afda35387cfd6889a0443ecda26bd411a7dcab384e42c685650d62be591fc72bdb151770a8 SHA512 533b23081996f2bfbd558e379d69e0c02ecfc7e62d39f4ae2ecf5b639511ecffc073422e78d7357cc58daa260b956a6399b42db5d26d6e3933622c622fa8dc5f
-EBUILD libarchive-c-2.7.ebuild 427 BLAKE2B d4b5a74c1cfa0dc2f1faf93a830af85da5dce0b1b94d0411d1d34116f96c6a168da92dc0bec2a667f3704f74c789515d0576e309edad605edfff43f613e9d852 SHA512 50f3d6bae7894732bd041b257dd5dd32990a2c019c2187c09d3db481c5dfb3229f9b6d857fbce6b96930613962984d56babb6fe71cbb686b66483adddea77abc
-EBUILD libarchive-c-2.8.ebuild 431 BLAKE2B d6ada344e68c4ae93b7c180d225a93a4e4e1ed1d158f728c10c7e41c947d2f7c5ded30293dc169216779baf59665bcb58f901c4102ff1838cc5180c0ad10f4f5 SHA512 c9fed5853a4c53396118dc1bf59a5c2e61d4205b5adfc4174a701a228f08552d7c2981648529a1c28ccc1e00c19116f51270600e79ab747d149074b5e0851435
+EBUILD libarchive-c-2.7.ebuild 417 BLAKE2B 1454ca6bc0a592470e9aa81e2458ae3f6a82cd8bfcd33d6d9cc2e2f3626644cfbcd723695600bc299ca3651a82e44f7593b7ee61b3933968ed8c40b4d6aa9171 SHA512 9cea581dbc6a3345453c7f200b89fe4f800a214555b0ed9313510a8b003eda1a78e0ac2ad0e7535df8ef3c3ca7ee95c80c4faa5c9f64ff6ae186de9b7a7eb4b4
+EBUILD libarchive-c-2.8.ebuild 421 BLAKE2B 4e60170f9b21faa821c9d5ea7567be04fb200431102d6daf97f69910e07e70e773b133724c8756d31bd622493e719ac981b9a82464c0e0b8981e2a2118b9d170 SHA512 390681a093c000d1fb24dd92fc0550c8c091c03b1f6fd3982162b5f6d126787997c2a096ac21740f9d25c2fe6ce43a0bc81eb4dabd66ffcd087665f57a02a129
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.7.ebuild b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
index ccd52d0a443e..9eb219000936 100644
--- a/dev-python/libarchive-c/libarchive-c-2.7.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 DESCRIPTION="A Python interface to libarchive"
 HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
diff --git a/dev-python/libarchive-c/libarchive-c-2.8.ebuild b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
index 4e2991da0d2b..38360fd1077c 100644
--- a/dev-python/libarchive-c/libarchive-c-2.8.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 DESCRIPTION="A Python interface to libarchive"
 HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
diff --git a/dev-python/libbonobo-python/Manifest b/dev-python/libbonobo-python/Manifest
index 84d7d304fcbe..9409459dbfb1 100644
--- a/dev-python/libbonobo-python/Manifest
+++ b/dev-python/libbonobo-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libbonobo-python-2.28.1-r1.ebuild 764 BLAKE2B 0005efbadc9125528bc39ffd302c9c8c2f6e35d3646b217837e1813c2d17045a88e05a4eb2e22ec5c240abd50bd3241dde773e27a10b99d2503cbf5e87ebad04 SHA512 3067a0a94e58fd694c6a781982b7114951f645758099a4b67e9be3daf0992d2f27209ccdd0754c2ccd57d2b03b593c728a7891711312da21847297028f97dfad
+EBUILD libbonobo-python-2.28.1-r1.ebuild 765 BLAKE2B e359a4f31419de9925265e9df51b947579012c559cf4ed34f5c46255cdda10137d4c34c74efe24cc4ff2fb87e8e7c30d0b496a2d12cc93b8e328df3308904c2c SHA512 b944d058029bc4d9bb81300fbd51c7a858d33e80e9df976d5434e52685c6ff7a1e0e8cd702748fdb4395531c0d980abc4a4b7661a36c790350e223f3303f9384
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
index 6c5704a12c57..b55634e83a2a 100644
--- a/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
+++ b/dev-python/libbonobo-python/libbonobo-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the Bonobo framework"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 8b7596403b9f..b83c1f541010 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,7 +1,3 @@
-DIST apache-libcloud-0.15.1.tar.bz2 570953 BLAKE2B 1baca706ac57d76baf4f83824ea0fccaccec51f38114a0103777e2965e67ad9cd96ad46459841ea702d72f8f0c3ce166037714d04f91c1f2369ddf6f455ffa63 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0
-DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
-EBUILD libcloud-0.15.1.ebuild 1075 BLAKE2B da3023b3fe0e174b2fc961d86a4b7d9dc870f279529535182611faf1a26fa9b1dc1186004f8f4a0877e551d7c4cb275e4684141c0d4a5e19e024e10e1c20a6ab SHA512 42a700c8d8a09bd2181b92171ee3dc2a03bd01a6d8d3d540a5f8ea2d5742db8171523f00f7d4e0fb9527cd8e37eefd00cbd52c909fbea9c101e79c6769f4b69d
-EBUILD libcloud-1.5.0.ebuild 1187 BLAKE2B 2afa7994050a018e93da85e466ea22b281892597af2ad4321b219bc2e89306661f8d81d00099e99401c0f51df6d8b9d852ded8ea728d3c62380430834c9f4b15 SHA512 ff99dd7e6bb56d3367a25053e049fc2f2ec4b20315261c0177303291f8b83618ed112ab7d7339bedf8b506856a6c25999724af1ce8f19622ab146916c0523588
-EBUILD libcloud-2.3.0.ebuild 1121 BLAKE2B 08ebcb2209e2e016ff68a4920bbf18f5fe218a06c61dfa938460e546cc831effde93f96b2d0153a7bc62606e144684c03f8c0202d522f9f44d1aef4f08724057 SHA512 245ae052132f8fa13ab57e5f2cc829b6f68ae29f258dabd06b18d4d5e50497d170120d4bf3bf0367b0fa15bf85a65a0855ac615db2fe6a068e0fe8a7258ebab3
+EBUILD libcloud-2.3.0.ebuild 1115 BLAKE2B 69582e0f8a0804734ac4e1e8c4e5ab09340ba0bf2bcab70ceedc4f6e8abac082af5a6a62241c3024020c54d6fe5ee7d1b4c7defd3dc8b2d04bedf763fb420900 SHA512 efe6a44bb7fc595afc980abf9607684136a2187be0a554ab844016a53be3fc70fce52ebea10133a3b588bc2b7f648328c2a1a69799c6bb2ae093f6232caae33b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-0.15.1.ebuild b/dev-python/libcloud/libcloud-0.15.1.ebuild
deleted file mode 100644
index 6011542de4df..000000000000
--- a/dev-python/libcloud/libcloud-0.15.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="http://libcloud.apache.org/index.html"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples
-		mv example_*.py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
deleted file mode 100644
index f178e88a1351..000000000000
--- a/dev-python/libcloud/libcloud-1.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py3 dropped due to failing tests once lockfile installed
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-	)"
-
-# Known test failures
-RESTRICT="test"
-
-S="${WORKDIR}/apache-${P}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples
-		mv example_*.py examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index 7cfaa7b14210..d72292e9e812 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/libgnome-python/Manifest b/dev-python/libgnome-python/Manifest
index eff4d049caba..b021e802a2eb 100644
--- a/dev-python/libgnome-python/Manifest
+++ b/dev-python/libgnome-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libgnome-python-2.28.1-r1.ebuild 850 BLAKE2B 1acf276e95276872407ec395c98eb7fb2463cb8e227ccd56315048248b8226c7f6de157b1aa9d2b7efdab7be969a4cc7f032e2bc0a715a5c9f36f35a257e1e3a SHA512 6e3e0574985f6e47755b0f755cd86b752ca5881a5210af092482a15b2571f77cbeb190b3511d3307b3439cb17a417b42241179d5bd7f37206408d308db7b6661
+EBUILD libgnome-python-2.28.1-r1.ebuild 851 BLAKE2B 45020fb1d598a270aec92f09f3a1409adacbdbf3124561f6f9df8904154a2d08b9cc2b5fabf5f4283850ac614b5c037beb39166ce441893320d7ed873e1a3fe9 SHA512 08f95a8feddd80105f1b311e43f718546040206a889f7159de44ee5351fe639453589c15cf4ce0fc9d16d925433bf353c91808a4a3ef858c2279214faae85cbe
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
index 168313a6a667..ff733b257f1e 100644
--- a/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnome-python/libgnome-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for essential GNOME libraries"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=gnome-base/libgnome-2.24.1
diff --git a/dev-python/libgnomecanvas-python/Manifest b/dev-python/libgnomecanvas-python/Manifest
index ed02fa20011e..02cc1177285e 100644
--- a/dev-python/libgnomecanvas-python/Manifest
+++ b/dev-python/libgnomecanvas-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD libgnomecanvas-python-2.28.1-r1.ebuild 608 BLAKE2B cc76e8a803c7cddec20673502cbac0e391eb6d6c6fa0956d9af286e0465b0d3b2b354d3bd49d474b01ff1ae70ea18c2a7d9502a3dcdd3e51a978bf17634dd769 SHA512 8a9cf1bbc298f2b4bcaebe52e534254c7d99dbbc98cfbf6d1248d79637be81b51b24162ae23953b52c915b7b65ab2c5c7401d26ebe6238c029f538f52f69ea50
+EBUILD libgnomecanvas-python-2.28.1-r1.ebuild 609 BLAKE2B df3b28856af397a1cc4678184e7ae697025c8602af03c1ebf4d76031181a15121e81acc9027bffb4aa6ee4f1d972898e1aacd76dbdddedd35b38c217f765555b SHA512 1de5efb3793388e4826bf2f610b230503d3e4152278402b77592b2eb02c5eb905d53f29dc24c590c2091f4761112636d801a5f0c14ce8a2e88a789ad6ebeab81
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
index aa0de3fd90e7..dec1670bc149 100644
--- a/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
+++ b/dev-python/libgnomecanvas-python/libgnomecanvas-python-2.28.1-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the Gnome Canvas library"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index a0f080f876ea..6d33faa9ef05 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,3 +1,3 @@
 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac
-EBUILD libnacl-1.6.1.ebuild 539 BLAKE2B 5645386bcd21402b736f7892a7f8dae24d55dc06595a39cefa58094c816e2497a8bcb54a37d1ab6dd5fa72e146d026eecc6fed75198aa99ef32ac3c9dfaf8dc3 SHA512 24c0120d2bc25d6489f88429400503ae7d2c2f590a948cfb7136071f5aaf675b147b6b572cc662d261be559cb3ab8f65a87704873557eee5e537a793fe5b082f
+EBUILD libnacl-1.6.1.ebuild 533 BLAKE2B ae0b48fc4ddb9bc0cfad6a8ac100a19e0c18e37f57aea1ddcc2138772405f6a18aa42b2c26c31045d7a9d06083a4aab048049e0120acb08ac3a4263581e1e186 SHA512 1b372d9284a695bd0545844f72909f69d773fbf2026776008605f946e2222525807e492d872d1f3da2880a2da86b6cf3c9cca032b0eda455882cfd09e0a2f5f1
 MISC metadata.xml 436 BLAKE2B d4777abed0c62a24f98f7053792402c4aca92cc9e352b7436061bf4669a18a731bb8edb9f79707780e3e2eb7a01daa46ab7d1222729d7708f7558b42cefcef69 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c
diff --git a/dev-python/libnacl/libnacl-1.6.1.ebuild b/dev-python/libnacl/libnacl-1.6.1.ebuild
index 4ce664bf5c14..1bd51f939d5e 100644
--- a/dev-python/libnacl/libnacl-1.6.1.ebuild
+++ b/dev-python/libnacl/libnacl-1.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Python ctypes wrapper for libsodium"
diff --git a/dev-python/librsvg-python/Manifest b/dev-python/librsvg-python/Manifest
index abc8018c8faa..5d44a4c75c1c 100644
--- a/dev-python/librsvg-python/Manifest
+++ b/dev-python/librsvg-python/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD librsvg-python-2.32.0-r1.ebuild 576 BLAKE2B 1701d24cb2509a4e97825cf938bb2e6a9302f88cdb3dc0be2c886150e7e9570601379a51b8561aeacef2ab5ff21811591ef9e92cc84589edc8ab02bdf02e92cb SHA512 ad8399104bf25c1664c15ce2bcc254059c9c575ccae107515028e13e55af255d4525f091693b40cd9994e16b24644f48701de8bb15459dc7af2f04ad1bc6121d
+EBUILD librsvg-python-2.32.0-r1.ebuild 577 BLAKE2B 789b0b4a64bb45e37d92ab12537211320ac95303e582e3b4e764f3bdbd537550411268e28f5838d511599770c36a4ced69c13201fc5acf58f85125bb66961819 SHA512 54f7fb9cbf8c1e98283b3db04491609bce4286d24420a291363118753ff03bf6b346cdfab63e8466f505b7e486e4628bdad37cbc88768581a3c031f550a33e68
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
index 5c5e79321dae..4a3450fed8ff 100644
--- a/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
+++ b/dev-python/librsvg-python/librsvg-python-2.32.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1
 DESCRIPTION="Python bindings for the librsvg library"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="examples"
 
 RDEPEND=">=gnome-base/librsvg-2.13.93:2
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index b6e1cd951e12..a252fc197562 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,6 +1,6 @@
 AUX libtmux-0.8.2-tests.patch 1677 BLAKE2B e5d3e6717809c36411ab3b5991dc1dec7a38868015529fe867743c31eacd81de13d74e96f3232106d43b68abad7e1b94afdecab44cc2954135ef34afce484a33 SHA512 b5df69fcda982fb7d8b0bc0659994959a5d4d868e46cfda43e8e9d3abb14a1a094c63da25a73250bc8329a93cf9a5747fe4cee51580b3802a4be1dfc8a68d33b
 DIST libtmux-0.8.2.tar.gz 37725 BLAKE2B 909a34b1a77bb221e6fd0ca6ef9075cc9ddd4f327cecf579d8aaff768668c9a71cff07a6567cdc0aed368482188936626dfc3f35a0b6723cd962294e2fc9d5ec SHA512 02156579c91e44e312ebf162b5314381645177cba244294b3251044be35c84b996263508cdedfd25ea2c182a87a3ff457154b9ed06e919e7149583b119a5e227
 DIST libtmux-v0.8.2.tar.gz 117077 BLAKE2B 52e9c7c47911797e9d2446e7fbc836f9482912e255c05d9b329d4a33f5f03d0bfad4df492902eff5605180f90efcd81a7e432174646cb2051b0f9dfa6615a91a SHA512 e5f3768f4ddd746c5380a92899961be05b1b6c567d9333720b0fd9ed124131671bbecf1c04a7c4e658092424b6dc89dd656ba559385b0a6f673f9895dd6c829c
-EBUILD libtmux-0.8.2-r1.ebuild 961 BLAKE2B f8ccbbd9c26a0c7cbb25be3c55b51f69ef260236af38a45ad78df58f7bbc2a0d681d7c2a03cdeb2c350ea69268ace0c0cd383b1b508fa596fc36e4ee891e999e SHA512 186d5fb342016bb8a8e173b22ce5639973f62b867b3438817c9e75ba6db149ee10dd668c96bb52957b4001ca674e070af485a9137ef6141573b2127b5d9373d6
-EBUILD libtmux-0.8.2.ebuild 660 BLAKE2B 7d3b1f9b1f0ff61ce04880cb16bbe6b281d2e74403587bae4346a0d7219221c8168289d75cc3235adff5a807edd0273cdc954786f555690f86b029ad658c0fcb SHA512 665e56e7ab13b3817ac24da4dbe02f680f4739c16a4d58d2b06892055754dfc0866798fff3c42e76a9d861719040b451aed6e4ecf694242a6bb38e5c6d27a157
+EBUILD libtmux-0.8.2-r1.ebuild 951 BLAKE2B c761597826a77dacf110c1cda85019edfac1154887fc31148a90c8f1282a80c48518f88269830d1f5c6152860077f5db64555349f15b1d50e0b0071514facb00 SHA512 983a055e364129d77f8845d0be311209a40a627a51c463239d5bda5085d2bbc6a09f15eb3a34b422fbf2877192df11309a76e29346d946385d20cea2d5f3750d
+EBUILD libtmux-0.8.2.ebuild 650 BLAKE2B 5cdc21b0e2d4db1c5480f1269cb7d086ead9a5293c2170fe6a0a1410a648d45b5485b00d186b19f79c12d9bfa9194a96e59f16ea5499899dc4fe9e24d8165c20 SHA512 55a97d53ae6ae543102b7b4eebf39e9c05f1f5fb8a5d6b527fcddf075f1e09b3aff27b85482e7c5cf1d026751a265268db54c08be46f897957ae4d0dd8c982c0
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.2-r1.ebuild b/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
index cd8b5d151762..9f616dda6662 100644
--- a/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/libtmux/libtmux-0.8.2.ebuild b/dev-python/libtmux/libtmux-0.8.2.ebuild
index 96e575bd8742..b2b343bde191 100644
--- a/dev-python/libtmux/libtmux-0.8.2.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="python api for tmux"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 9f5859ac5011..05e162edb4f3 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -3,10 +3,12 @@ DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068
 DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
 DIST libvirt-python-5.6.0.tar.gz 201352 BLAKE2B 16f88b9c15214af0ec97ee39912139d6ab07473a9f65a735303f5241d10d75e46db68378b33c9c139f6a9e43f7143a4c30fdbe187e50e004cfb5205dda03d0a3 SHA512 a6bf7c661127ae0ed5962ed7bc9cefe09907e82969525ee0ea8f8f70b5fee8f200b6ba9d35aefcb7b132f59e34162ba40e75e93aff297808bc1dd23f548da428
 DIST libvirt-python-5.8.0.tar.gz 202807 BLAKE2B 82111cdaa5f22ff2a8e5aa16c789535a0e8665c5076137c24bda0698ce0dd1eca2f39db1eba0f3288b208f809d3d44b6b4f05c82b60438222ec7fa66bb2fdabe SHA512 89e02e04c26738180c244a46c1d5ff4c6e839df70ec1cc045997cba25f5182ff616f36821ae180f92901c381e6471f629b4ffd9a69e45843e9412e4e715ba91d
-EBUILD libvirt-python-5.10.0.ebuild 1002 BLAKE2B 1e3c32e4a73cce46e778413ba605dc94c5c795da9b60e097120cdd463f3daa6809e43adab8c729c608e6d7e593a1d84b402668ae0d5b9cb33094912195be3a31 SHA512 0ed3a215477f6d3a7035e8ea5be6b0f6f5e5ef2432b2abacd9957ed18ff310ae8bbc6c6d6aeac1e8da91417d7aae13b62b8a7057c2cfcdf66b2cfc2f8ec8475e
-EBUILD libvirt-python-5.2.0.ebuild 1002 BLAKE2B 840e79ded46780f2f24957f725d46df47b0414595559a5cd6d1df0557ce2cfc35e9f4822f4f8d2aa3905031366e1b8587986fcf9341478a72e0cfa51dab75969 SHA512 6e6f6c6d91c9cf0ac3f917b652a140d1be53b5cc90482aba953541475166d0759c32d98d0f31505fca0fb4e7d30287e854bc7fbeb39960c9d01cfad77d6a442d
-EBUILD libvirt-python-5.5.0.ebuild 1002 BLAKE2B 840e79ded46780f2f24957f725d46df47b0414595559a5cd6d1df0557ce2cfc35e9f4822f4f8d2aa3905031366e1b8587986fcf9341478a72e0cfa51dab75969 SHA512 6e6f6c6d91c9cf0ac3f917b652a140d1be53b5cc90482aba953541475166d0759c32d98d0f31505fca0fb4e7d30287e854bc7fbeb39960c9d01cfad77d6a442d
-EBUILD libvirt-python-5.6.0.ebuild 995 BLAKE2B 515961245e1e73481a20d60b0a5a317a9069f9cd77c1df6044475ceb174b4011b948898f0f13292ca68a4a3190121b016f2ca7937cf490879b58f28e0924c0cb SHA512 be610188870cddc9301668f1db36da50755ab550e81eb85a73dde365d4729f7511d139245578bcc521fd6056496555e3433008ad07950100247d6f641dc0f09a
-EBUILD libvirt-python-5.8.0.ebuild 1009 BLAKE2B 352b61aae5cbb8369890af6ac0993f1b60b474a04619f9b1d62c93365f284557b01d698ffe714781d03665c6193272a404ce6d55203f4d4ccaf12ae04df3f625 SHA512 ba70faf6989e4f2810d6243024ecc5e12d07a4ca6090bd9d253f4e5c35e5a4ac1e637f61bc314ed5a8cf48caf1eb9ba93fa8ad922a0429a27ded90e10d4f9393
+DIST libvirt-python-6.0.0.tar.gz 196791 BLAKE2B 8fa524d76277fc0278158205f25da8a4331c732a7cbdbe7d9ef9c697b8d5758d8f4182ac749212f4b7c147cde5648fa8cd245cbe0ae809e9079ef654def3c4a1 SHA512 1d64bdb430d099c6e72259e49d99aa985b9ba745c543d3a12ad614c48e1334a3607e093d93612c34e8ec3990e880f3d66fd33199605f2ec9a419193bbb839d58
+EBUILD libvirt-python-5.10.0.ebuild 1005 BLAKE2B e638382d8a136e2c08f8167e6279d2819a50c9eaa197d599b69c509d4c3fde954b980cb7045148a0b3f33790c545d56978ab8087bc4e913d13c770059f12d605 SHA512 c4aa2b78c642fe1e51b110a066ad4f35c2de67f04b3d2b336faa5d424e6d8613421621d504c005155af60ba44fd67717743095b4f39db02f2c5f281a72170653
+EBUILD libvirt-python-5.2.0.ebuild 998 BLAKE2B 6d3f17a98dd075f7621ec2db61550bb7b0cdb5ea6d7cb515287b50a77a420de5bb3fae4ba5f65b9952da7da6ab7e5fc6ded343eddf171b0090c31c81cad7eaad SHA512 f7cad0aac9eccef80d4c1e220c4b35e0d961ec6262a70a367e77f6ee468d84bcf57c61129a0a7d7b667ca28c8b4e747cb24c3ff9c9a46788f0f95d525c9d9c51
+EBUILD libvirt-python-5.5.0.ebuild 998 BLAKE2B 6d3f17a98dd075f7621ec2db61550bb7b0cdb5ea6d7cb515287b50a77a420de5bb3fae4ba5f65b9952da7da6ab7e5fc6ded343eddf171b0090c31c81cad7eaad SHA512 f7cad0aac9eccef80d4c1e220c4b35e0d961ec6262a70a367e77f6ee468d84bcf57c61129a0a7d7b667ca28c8b4e747cb24c3ff9c9a46788f0f95d525c9d9c51
+EBUILD libvirt-python-5.6.0.ebuild 991 BLAKE2B 12724e82cfc8af448a53afdd400fa6c4a9476d883489d88221453ddb0eee878a9265aae98bae2ddaa6b1098b3ac8186b066785f065af16a5b3edcdcf0f371897 SHA512 47b420c710beef7a8434c8e6fe8d3b060d3d4d5fdbafc0677bf244ed7f4e9835b6253aa773c8e6f49cbc5ff28defe823a28b9b07522d14b7c85bde84a21e1879
+EBUILD libvirt-python-5.8.0.ebuild 1005 BLAKE2B e638382d8a136e2c08f8167e6279d2819a50c9eaa197d599b69c509d4c3fde954b980cb7045148a0b3f33790c545d56978ab8087bc4e913d13c770059f12d605 SHA512 c4aa2b78c642fe1e51b110a066ad4f35c2de67f04b3d2b336faa5d424e6d8613421621d504c005155af60ba44fd67717743095b4f39db02f2c5f281a72170653
+EBUILD libvirt-python-6.0.0.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
 EBUILD libvirt-python-9999.ebuild 998 BLAKE2B cfdedda08bb649c3f7ea1dcc9f44a7aa587bb86f1587bfd2e68c4aebd31879f2c18ab77c8daad3593f99b879a3c2055833ce6ef52719a81840c0177f1b612077 SHA512 6813619365bd317465db18a218493559e0c59778ad58666336644b38de353642761692021d21cfca1e465a4f3fb3cfbb83dad2c428eb3da5c9da09ec6eeb158d
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
index cc56b946099c..79a9f02c1ffd 100644
--- a/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
index f86bc6c1c1e0..810917f24188 100644
--- a/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
index f86bc6c1c1e0..810917f24188 100644
--- a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
index d73b5d79b3c1..e54729f32d80 100644
--- a/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
index ccfb9847767c..79a9f02c1ffd 100644
--- a/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
new file mode 100644
index 000000000000..607c6f77b7f4
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libwnck-python/Manifest b/dev-python/libwnck-python/Manifest
index 7350bf1dc932..e87d4e6fb2f0 100644
--- a/dev-python/libwnck-python/Manifest
+++ b/dev-python/libwnck-python/Manifest
@@ -1,4 +1,4 @@
 AUX libwnck-python-2.30.2-flagsfix.patch 847 BLAKE2B 27ac35b676d6c2190b2f4e0c5f6f5b830cdc58c72098662a67667a5439a0196961d869f26f5fdae4e037865762108064bdd13b5ae92a741bc0e6df052c0976d1 SHA512 ff30e03ee241ab6d26fafc4ab52f6b1c241b37b476fabeb72e9fb4536ad20604dffac6af42bb0c3170cc062ac90bee2f8c501fc0cb8478bb2adca3d07882c3ee
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD libwnck-python-2.32.0-r1.ebuild 717 BLAKE2B 546a0fc8ce37edee50cad1d4b5e47c5b8c6b7b0ed9ef61e2b20fd703d593f74b37aaa9368331c662b201f5dfaeb016b99a65dc546ff5e133ed7d11d0de3a2a76 SHA512 64d0fa6565e12a8537d053d05e073c0a5eaccfb07416adf773b2e0f197eb339c75846355b9eb2dc4032c2cd790e97ac5b0ac71ba865e0bdac4026b44f6c9cee9
+EBUILD libwnck-python-2.32.0-r1.ebuild 718 BLAKE2B 75d474eae66302df892388c5a45fc73c16204bb2d4636c487f1f4338619a6688bc3936ffa3435f9880bc7a5d2b54149ed6d44d0a765e36061dac4ebe2100caa7 SHA512 1f87233fb019dab36122a6334bdfc9f6795e55d214246ceece1a5ea5161d033014e9c2a530b80ea4743c9dbe83e05a8e26c4495550d0cb20b79dbeb27933481d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild b/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
index a3741296a655..ddf3e30ca17c 100644
--- a/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
+++ b/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit gnome-python-common-r1 eutils
 DESCRIPTION="Python bindings for the libwnck library"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/libwnck-2.19.3:1
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 3c90ab7103ad..5126685bc072 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0.ebuild 774 BLAKE2B 169b397ca7e3a2b4414b7e44f2ac381a1a3ccb9c2ce5f75195d157358d8da34935bc640d694cd89927c394c877c7b075deda8192f8609851945ff9a2360bd1b1 SHA512 b40ef59a696b45295499c51e9b6407c92fd72654c16e4291abdc6f1540b6762bcec45a64d90a078eda784c5ca28fe50f2b402184dbe5fec8427cd052e7a688cc
+EBUILD linecache2-1.0.0.ebuild 775 BLAKE2B 43053a1ef7f0f7f3a75d1cd146b0bc67cac46c84f91cb8cd401218b29a416460d04ef1ec4b8072699fe0933ec0b6769ec1e38bfedabc6ab3ab6f1f1be65b268f SHA512 3d02b4531ffff9313c6f8be3878bc242ba646bffa0d812f3468a961ee43da9e405f0ee434e7d9552346c48f9c7dce9d563918109f7dab8733d67556512692369
 MISC metadata.xml 302 BLAKE2B 121d88c715f0ef01faa1e813371b3a6f021ce034816667e62e1048ba9220d8ee4871500fa8e1a54821a4af1134e46ee08e569610c937f50492b135d8b7cc3d15 SHA512 8a62ad98f7c44a165b2e9daf3eb54b37ad4bda18d2d0404a72780e4155298f98c6cfb232dcae693d76cf52f10b2fa4332bd988fb06d56d53165911f194a52400
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 99588d2b007d..57c6f2f35605 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 805aefa9c45c..b7b8fa0d7f97 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,11 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.9999.ebuild 853 BLAKE2B 0d7ab42b23427fdc0d2fd932c0ddac35fc158c73511727095006d49be6a1387c450c9a50629064716a8c4b638ef68e6ad84de146c603bf11cca2c5441c29ad26 SHA512 1b7ce5ae74c55875ce4fcfb64953695a4fc5fe3d8dae10020421f53ecde4f5b8eec5e049e2420b13ab0c5b630faf559243eea8e47b7c0793194e3f4908c4991d
-EBUILD lit-11.0.0.9999.ebuild 853 BLAKE2B 0d7ab42b23427fdc0d2fd932c0ddac35fc158c73511727095006d49be6a1387c450c9a50629064716a8c4b638ef68e6ad84de146c603bf11cca2c5441c29ad26 SHA512 1b7ce5ae74c55875ce4fcfb64953695a4fc5fe3d8dae10020421f53ecde4f5b8eec5e049e2420b13ab0c5b630faf559243eea8e47b7c0793194e3f4908c4991d
-EBUILD lit-7.1.0.ebuild 997 BLAKE2B 0ab46c9eb3f0991a34f1aa02302fd608c04a9d495b6e534c9592c86d0c418bde0196164ab80ec19000cb266416b06764ee06997eb5171d6523385fdc6fcb3414 SHA512 3ba89f927b7981e1457df180e47880f37cc410d62bb14faeca3e02080fbe20d2f31fd55f277821de5b8ac394c20d82646e5878cca56270578aacfbe8b85a209f
-EBUILD lit-8.0.1.ebuild 1029 BLAKE2B be947bf92151e27db4fa43735b2aec8f76fd4ad2c5cdd8dcc57cbf97a8f30cdca7469513af6d87346c30242787b20cf27efa9c295307b953f7b875f75def0d66 SHA512 23d0ccefc6a181f70381bacd3abc99568a49f8567639122f5e8c86c87ec0fedd49549eb11727f2f4df4b5d7ddd6e4966c9b145de4786d8d493a10fb1f7c9ca6f
-EBUILD lit-9.0.1.ebuild 880 BLAKE2B 5274fcc94062a6d430b3a9e6f5717eae6e13e78a7d11e7004f763b07b4554c11cfade35db0c60c2d1d3cc09a84aeb0396102570e700ec828bf3cce8fbccf0155 SHA512 1c5214d135d26c1948fe27ffe6717b2e9bafb727bc994579874c319f9b39bedb642c7d32e2c6911abce694d0cc2cf69fd23490ebd6149081eb7dd1ae36ca1313
+EBUILD lit-10.0.0.9999.ebuild 846 BLAKE2B e4bd511c0079bb53dbb301ba82aca69ea17b173430c7da73ab4d20adc01bfb70467f5d0c4515856d540cba00973ae4f9ced77a162f9c7b812af1b072f4aea149 SHA512 8f68849871e7bde7af64ea82689fdde7ee95213a77399bb10ed749116880530d99d0b89807af99b5bfde292d44330659ed20051008cfb1727337c4f082c987b0
+EBUILD lit-10.0.0_rc1.ebuild 846 BLAKE2B e4bd511c0079bb53dbb301ba82aca69ea17b173430c7da73ab4d20adc01bfb70467f5d0c4515856d540cba00973ae4f9ced77a162f9c7b812af1b072f4aea149 SHA512 8f68849871e7bde7af64ea82689fdde7ee95213a77399bb10ed749116880530d99d0b89807af99b5bfde292d44330659ed20051008cfb1727337c4f082c987b0
+EBUILD lit-11.0.0.9999.ebuild 846 BLAKE2B e4bd511c0079bb53dbb301ba82aca69ea17b173430c7da73ab4d20adc01bfb70467f5d0c4515856d540cba00973ae4f9ced77a162f9c7b812af1b072f4aea149 SHA512 8f68849871e7bde7af64ea82689fdde7ee95213a77399bb10ed749116880530d99d0b89807af99b5bfde292d44330659ed20051008cfb1727337c4f082c987b0
+EBUILD lit-7.1.0.ebuild 990 BLAKE2B 04699386c31df283d56587c3c67f85484d9412d649e1b903ec6848617fe676ac0ab87ccd3ffa47b589ebee290e3211bd6581fb6205508115ca551185a21d258d SHA512 d9e078cd31bcd0b46c603ee7362d8b2a308c0bd1c09d588a3c480bc50b9e1f516fcabc8d73e9c6aa5f2fa6c9648d4a0fcd543aa4a37cefaf4234cfbe8df82370
+EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
+EBUILD lit-9.0.1.ebuild 872 BLAKE2B ae7dc85c7edc24744829fd3363f84160d1cd2e4e626c6b6d8105e8f040409fe66a578b9dae8bea3140f562488b78c7d3d29e47255f873d35e61f883c5aa06578 SHA512 b96100c01a826b033e5b70f2cfbade8d7494286cc3587725869d853e1a05fb35537384ec5f670153edeadd012daeed13fed5e7c7883475a97ab23ef00f83ce26
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.9999.ebuild b/dev-python/lit/lit-10.0.0.9999.ebuild
index 4996ccd73ba8..d53547c725e0 100644
--- a/dev-python/lit/lit-10.0.0.9999.ebuild
+++ b/dev-python/lit/lit-10.0.0.9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
 inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
@@ -19,7 +21,6 @@ RESTRICT="!test? ( test )"
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
diff --git a/dev-python/lit/lit-10.0.0_rc1.ebuild b/dev-python/lit/lit-10.0.0_rc1.ebuild
new file mode 100644
index 000000000000..d53547c725e0
--- /dev/null
+++ b/dev-python/lit/lit-10.0.0_rc1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1 llvm.org multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lit/lit-11.0.0.9999.ebuild b/dev-python/lit/lit-11.0.0.9999.ebuild
index 4996ccd73ba8..d53547c725e0 100644
--- a/dev-python/lit/lit-11.0.0.9999.ebuild
+++ b/dev-python/lit/lit-11.0.0.9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
 inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
@@ -19,7 +21,6 @@ RESTRICT="!test? ( test )"
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
diff --git a/dev-python/lit/lit-7.1.0.ebuild b/dev-python/lit/lit-7.1.0.ebuild
index c9d754973b91..0d76068cd76e 100644
--- a/dev-python/lit/lit-7.1.0.ebuild
+++ b/dev-python/lit/lit-7.1.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
 inherit distutils-r1 multiprocessing
 
 MY_P=llvm-${PV/_/}.src
@@ -21,7 +23,6 @@ S=${WORKDIR}/${MY_P}/utils/lit
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
diff --git a/dev-python/lit/lit-8.0.1.ebuild b/dev-python/lit/lit-8.0.1.ebuild
index 9fb91951383f..03682e862735 100644
--- a/dev-python/lit/lit-8.0.1.ebuild
+++ b/dev-python/lit/lit-8.0.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
 inherit distutils-r1 multiprocessing
 
 MY_P=llvm-${PV/_/}.src
@@ -21,7 +23,6 @@ S=${WORKDIR}/${MY_P}/utils/lit
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
diff --git a/dev-python/lit/lit-9.0.1.ebuild b/dev-python/lit/lit-9.0.1.ebuild
index 7405070d90e1..c87eead5cb39 100644
--- a/dev-python/lit/lit-9.0.1.ebuild
+++ b/dev-python/lit/lit-9.0.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
 inherit distutils-r1 llvm.org multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
@@ -13,13 +15,12 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 967235730dfd..e303a69a53df 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,5 +1,5 @@
 DIST livereload-2.4.1.tar.gz 25593 BLAKE2B 97a37349f14cb9d1841ec78cc3d1965b59f65f86b00cb972b9b726364f7f34e6409853f8af32215c6bd400698f9b3ac2b947ac7864a8df15ccec8badddaa0cfe SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb
 DIST livereload-2.5.2.tar.gz 27070 BLAKE2B 9d2af1eb313f8fd6e7a5176565c3f7a9ab7d8a36260d568d47a427e14e8ed76c0edb0c227ba5784681c82d7c7b5994e151d14302d8c9d0e76caea7d12e130586 SHA512 bb4ba50a31a912051f6036754bfc6ce7ba33b1b8abd5a20ac151f996e347d84367d4cc26f9c798ed6aef487ea335e1591d40ebd1c12f9487f74992e53e129749
-EBUILD livereload-2.4.1.ebuild 880 BLAKE2B 77dc04af45e0446ff59ced4d24857ac72c1d9d980257832e742dad3e7805e20bae5ab5f9f7d73e8f20ef5426105597f36438cbb7503f2ddda95d237dbdf53f9f SHA512 30f027a8c1d94d920e57e85c4434fdd3ab68e7abba373098329aac155fd5c516de741d4d1f9d174d4a9a7befd3ae0b33a51ec45840a45023616f1d38baa89fcd
-EBUILD livereload-2.5.2.ebuild 881 BLAKE2B 004223f6bcc2ee2b2ac04f8e85e432eb83778e7730b4386499a388f018d598ecfe5c0ad8f0030463095a57daf056d3f65b1006a04bde2775419c81f826c84b0f SHA512 dffd38e67a16ea6196fdb703d839c593b87de0d4cc0e8834976e52a732459943cd22e679b2a96d4967f99f376dc266b0ff51296af2c466b1af2cf3530ea9fb57
+EBUILD livereload-2.4.1.ebuild 870 BLAKE2B 70b3ff3d4e7b2bab3bfedc169e598ab08004a6291ea05cc0931449e59180ad24ed8b8a8b0fc00fde984faa5db2b3f8924341ac76c3838575c821efbfcbcf4987 SHA512 3246fe62595f6169dcac3d67bc4ef8cbf6d2510485d829bdb757900da20fec573cd2acf20d75ba0a1392b1ecfc534e484d4c0f5054b26d52b783e173a40c14be
+EBUILD livereload-2.5.2.ebuild 871 BLAKE2B da6c30abd047bb195acc5518e8cdae89a8a08e38f86d411b185da193dcdb56e774b3770222800f738e4c778e66623727c1dc26c04cbc9908bbcb9e71306f9b43 SHA512 a61dfcda794ae46aa8ca342fa2bc68b6be2b42e1f08236e9e9c784929ba1c13e1e630d5560af8c57f9202fed6c85496d973143bba337c4f6bb54960947b474c7
 MISC metadata.xml 255 BLAKE2B e88348eaa3bdb7b0d49b6041be22aea520b3c8725f8fdf9433bf9ecff7f5835e9ca46ef054a110a94b394fed5e14c12459a1fee88449ba47cf23bfd9d44da951 SHA512 42395b9462f906c39def6b21217119364b03682e624539e1ffea1f95258d21ca9c3bc3e94f86cd4294e6e4d92ecab7e6355a5068b243aa2d11d6cca1fdd95012
diff --git a/dev-python/livereload/livereload-2.4.1.ebuild b/dev-python/livereload/livereload-2.4.1.ebuild
index f40cd94ce162..e79f6070944f 100644
--- a/dev-python/livereload/livereload-2.4.1.ebuild
+++ b/dev-python/livereload/livereload-2.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/livereload/livereload-2.5.2.ebuild b/dev-python/livereload/livereload-2.5.2.ebuild
index bebe781a1863..f6f7bf77c5ba 100644
--- a/dev-python/livereload/livereload-2.5.2.ebuild
+++ b/dev-python/livereload/livereload-2.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index fea3f0b298e4..da96ab28465b 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -3,7 +3,7 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
 DIST llfuse-1.3.2.tar.bz2 348035 BLAKE2B d3a3219c8d7462f448486488971842362b6ade8fcf6804d725db30b0e91d3f240ec9443705cb67caf3e6beae8a174f323465695dddd132210e3606aef6dd861d SHA512 f065818134b12dd128574836bc7d339404d9b7d9236b535da709378e9206b17cb2accd97fc0b658f39a93efe126a7c3064f7901468231f63f8398a3e053498cf
 DIST llfuse-1.3.4.tar.bz2 364400 BLAKE2B 726a42381b84fc57e3e54d519bc1a105056cc8cf5d1c586ea12b1798db493254df7088f1060ffda0d89887c2b7db2046825e4f044953153e7978891f72032457 SHA512 6bda4534f660c42e6740093be0a2c308367f5915a0144d44c390b4f6b197efafb48bc28f7f8d1735defe470e37637bd6688690e26ec3d0c01cb7c197e443f6e6
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
-EBUILD llfuse-1.3.2.ebuild 1044 BLAKE2B 58f884c781d3baa8330cfbe64140dea5a1c3a64c8493a01b82c1c644b0a8dda79044f0a5459e0bac41e198c6b8733113df268b05df3cf8de18e7a3061bcf533e SHA512 073d4eaf5f666f6fcd6350b61acfe6c617022a1b0e1017535c292d9e0ad55b7c3cd40ddc46148ffa2c47d2e5eae40c67208ac66580f61ae8a9a69ac3b1878908
-EBUILD llfuse-1.3.4.ebuild 999 BLAKE2B 7a9f5230e277f89382f6e92fc092a23b506573c7c7efb0df714d58cbcb915abfbb465edc3f3ed0ededddb58592f7309f87d3968a4bfba081c10d16f857d9f9e9 SHA512 d2b91df9d4b8c13d2d4f9ffdb3b9ac6a7a61c0ebb7680969957048fe8e748719a6a3bc451218cdfe257b10c390b2fbe7035cb8f7a6fdb672e963c37d537ec57d
-EBUILD llfuse-1.3.5.ebuild 1000 BLAKE2B 532a6a30e88bcde95e0a92eec7436277e3e93c1f8d23242fc6a00fbf85587ab8d6dafa6d5c117235a876781955a07a16347d1a5b801829b9df33fe43805cfec4 SHA512 275f6add63ffc6efc16601fd1fd1d1843740dd6c11a3c55834ea0e258ca1b285651c585792efc8abab3e2f3cd97edbbbce5ac20193d63f4dc07165c965f943f1
+EBUILD llfuse-1.3.2.ebuild 1038 BLAKE2B 52960edc2796c7f73994579c885c95b5887c5076a9b165db0bb255128e697a308063cefe69bbff3d8d2dcbe868111267b73dae0c1051aff449fa8872d870582b SHA512 a3394df6f7718f07ef81f09b43bbdd400715149e2f23a8cfe7e8b14588b91aa0610373a0257052c54bfe850f55586e51911320d4eabdeaff6447288534921768
+EBUILD llfuse-1.3.4.ebuild 993 BLAKE2B e72fef78240422fe338eb90998b9b507142c7177afb5188e1cfb79cca4453275c35d377bc685feef1c307ec6ed6eae90174cd6955e8c2f0b4386309d273beebe SHA512 1c3d4b825cc059cc3bef6fa159bbeb996526fc5710273d01bce5a350565a81954f747fdc12fe0befad52099f278e49db0ca926860c50c4fa15016344c6dc1792
+EBUILD llfuse-1.3.5.ebuild 996 BLAKE2B 9998cde4c2184f6361bf769e8f76b5b8a88a1ed03657dd5d4598336df2b0519bd128d5aa2f204dd966029d565c60b95f8b127c62eb5ce2a5e43bddb380edaf98 SHA512 194454b3bb731b5ebd859f38e3461a48aba590dfb901546c82ab08c1d5402daccdcbe6032196758fb63dbaf3371bdef71be5f3318db1ed317f2caf5331373aa2
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.2.ebuild b/dev-python/llfuse/llfuse-1.3.2.ebuild
index a2a5f2073247..800e130cbaa5 100644
--- a/dev-python/llfuse/llfuse-1.3.2.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-1.3.4.ebuild b/dev-python/llfuse/llfuse-1.3.4.ebuild
index b6e057c90019..8d6c4d0e1673 100644
--- a/dev-python/llfuse/llfuse-1.3.4.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/llfuse-1.3.5.ebuild b/dev-python/llfuse/llfuse-1.3.5.ebuild
index c5d477418d22..bce229739584 100644
--- a/dev-python/llfuse/llfuse-1.3.5.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 158d4ee93b59..7a605aa51273 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,7 +3,7 @@ AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7d
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
 DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
-EBUILD llvmlite-0.28.0.ebuild 1537 BLAKE2B 213aa9a2775fb005774d740025b6c0f8fa23808ce3ec689ce794f3d7b7784460d2f8986f69e7abf4a8ec3f4215af71c0bd45ac693ac8201f1f49a770e780cc8b SHA512 0c64a986bd128c0540d0e6889df8892d3d341297996e81b7da39e418912ce3523f7beaf393ecbfc7365cf2fa68bdcd3f684ac8bdf0aa72237be95ae61d9c4577
-EBUILD llvmlite-0.29.0.ebuild 1496 BLAKE2B 2c151ff7b183893b7dad48014f8327275f94cba9fa90cf7cb2718e75df6cae6a89be3fc9d10b5716f29051a939ea6a3d1a5206d9e6a8db04dc1a27301868e07d SHA512 cd78e582583a37f80cbb481638f4148fdf786f997ca78245167375727606e0b392345513924ddaa5f7635f3518b229911125f73bb10f2eab55f87952edd7f165
-EBUILD llvmlite-0.30.0.ebuild 1500 BLAKE2B 276749cba18c33471e283456d61eb6e5c8e797fc1451051e40f87739aa050d78dbdd2abcc36504c15624fa93634a28b13bab3f3017d5f869299cff85561bbbaa SHA512 0d80e97aa276e91f32c416e5940b5cf5bad28e9434fb71c85ebf27836597a2c649d180e3d609d7e0b7b91dade32b848d99851df23b7f44d88e263ff66171c6c4
+EBUILD llvmlite-0.28.0.ebuild 1533 BLAKE2B 5d6e5a02e079c416b7a536b1d373b12248d880e8e389fb56267e08dc4a7e8d9428cdb2a59f0f55585131cf6d0b6bbb0009790f37438315adfa171432b39d8e5d SHA512 68d9d5b119ac8d80a9c7dbc7353c3ff5423043bd1b446554972f2d52d5bf4b1ce4a58f7f233f70ebe93baa1ec9a9a2579dd0621bc7fc0d8f1811c347222bb418
+EBUILD llvmlite-0.29.0.ebuild 1492 BLAKE2B ddf6cff35073e58486848e4049784784feb9c4366fd60c17ca94e4973da0957c37dce5055ececab168920fe9c968602a9361353d9778cf71f2d08eaae210d089 SHA512 e899280c2503b0c348ccf18073e1937ad38adba4eb1ec85257738b0736c0c157ab164e306171ac6fbab77c6acd3e523cd4e8f0b26b647c1d32ad78826ec97b0f
+EBUILD llvmlite-0.30.0.ebuild 1496 BLAKE2B e2fb5ff5223fd8ad9b640a4a54c13328c6b4a202c04c3be50170d9de271a5b26cbbfd158c2edccc07796cb0d543ecf15a354ed5c64fac013f9924ab1a8bc8d1a SHA512 7b33a59ee05c84527b36e8a7163f063664c14d22202c26851ed5acee92e358fc44c5fbf4c303fba2f7f89766f2fd4cbb63b1a5b06780105763731c6e9813f4c6
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.28.0.ebuild b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
index c52d19b9934c..4307ec0db32b 100644
--- a/dev-python/llvmlite/llvmlite-0.28.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.28.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
index 81241167a8c7..33f86ddb7d20 100644
--- a/dev-python/llvmlite/llvmlite-0.29.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/llvmlite/llvmlite-0.30.0.ebuild b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
index 6554258314b4..11e5368b53e4 100644
--- a/dev-python/llvmlite/llvmlite-0.30.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.30.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 llvm
 
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 9f7318a04eaa..d2468df18925 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-0.92.tar.gz 155720 BLAKE2B fa991dba144e636d395e264c70de61bf6e1391bed589b8e67075eb604ad3cde7bc1593f596f884e13ef4c744efddac93467eb0e9d7e79d445a71e21e1f5541f7 SHA512 5177abe0c441fb9067ad84de0cafda960113042404507eaf36194efe614fbc9fda37668b9d8a07d4a7f674b0c1a267194ddfb241834a3b1db0d8026f53841cf2
-EBUILD lmdb-0.92.ebuild 574 BLAKE2B de845418751c517fb17c6945c0d45aca9109477e4ca0262f5de0e057be6f59d81e39c83e9cef89a6f7996b13e350867137eef933feaa29b12e16423c0abcd31c SHA512 0726699b876951f3e435606e5f55731aba5db0d1b4e7505acb500d909a3dd105711bc86d4a09f523ecf1af79968ae5ea386adbdf1ece94bd5895e8f2d528c2ee
+EBUILD lmdb-0.92.ebuild 564 BLAKE2B c9339cebee0ac7abdcfee2b20de71b863605b8413b5842662ee8358849575f30bef6e8eeaed20bca97f370f3068b858a5dd96d399dd1cfc8c237572764f9bbd0 SHA512 d3d9156d577ca5bb852750c1f0f9908a044e000d7f18cdb24011352959c76b536cdace0a311afaf0d9af414538a7606bcf3f67c632a0270e61b532a4b8f3c030
 MISC metadata.xml 369 BLAKE2B 753c2fcd809cb0b69b60f4581421e3d2abb40158dcf3931a70c2c2adaeaf22f5558707a6dc39ec2b9d8724d9fa3bbc370cf790a8bb550d00d59e10cda643ac88 SHA512 4b2ad4e50acca757e8a1ff4e659ae99c8c42788ba6cc1e1d503cb371cb897443e6fbe3b7c2f7f8ca0b6409da9e7a7961a644aaf615d306da8172687caddff3bd
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index 2c3fe85f5e1d..1a28cb0f5217 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 8f224ed571ba..e332cef3f4f9 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,3 +1,3 @@
 DIST locket-0.2.0.tar.gz 3506 BLAKE2B 10f5c325036b5c0880c2b0261de180ee9d046ac346a64612d680170fad8664bcbd681954384bb6b9c4f812059b4418c618ee44f638ac6fc1c35b62786afe555c SHA512 ed9bb25f3fcaa70386217716db5612bf31a923c669cbdb8e871de6df4c0c42bf3309604a1aac804c0f334aed8c88b0ba113d8d265054c0e87793c7b53f729ff9
-EBUILD locket-0.2.0.ebuild 450 BLAKE2B 76c918a3e4c47b79f9489771f50c475bd530d24a0a4edbbe6cf10db3a46e1bd37183abe18d6796bf6284d7247a6dc72e6d7cfa4c7c0e56cb88864510558f9c36 SHA512 bad88ead000a63e13a2fa3d5b7aa7bdebaa5e6662e52e8a041f11dd0bc2368ab826ecfb4b76c2abee4c4d013432d54b6bcb4145ab10adcb90b15aa26e0bcd575
+EBUILD locket-0.2.0.ebuild 440 BLAKE2B 24919155d14f3700e68919a9aa7519bb606c0a982568a08f5fea5b3c79afebdfe7415681e04b343c9321293f8d8c043fb328c23ee78d691ed86f13ea97bad2e1 SHA512 f83e7b3faaa6aae7e8773d1f7ec01c80c72ee71aebdbc6301edaa11bf6cb1a1010693589805af10ea14693383beef2e12bbcc69beb2426a3f3722c21725ebc21
 MISC metadata.xml 534 BLAKE2B a6497888f2b3c5654969c9f4c83214e7703ed888873475f12aa73db09f177d114c9f7eb8e2485ef00d3611c406cf88669e1772758362c603f2aec27d355976fa SHA512 9e37c3571558f195d20d84d2785dd3866c8c035c21d6b62b5c25ea0f4f57ad8fad6e08b0071bc08c21b39d92188c31aeab930a678f0e7d014a7acba8b25d082d
diff --git a/dev-python/locket/locket-0.2.0.ebuild b/dev-python/locket/locket-0.2.0.ebuild
index 71de60e68792..32d1cdefc998 100644
--- a/dev-python/locket/locket-0.2.0.ebuild
+++ b/dev-python/locket/locket-0.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index 3d09a40cf674..3580f323dedc 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,6 +1,6 @@
 DIST lockfile-0.11.0.tar.gz 20909 BLAKE2B 8e13508312efc7eaa463e8fb80bf0a51ae3bc0adb93dee0eb52273bac40293e729de83aca98f549d12f3e46f9654c1d0f373aaba350acf7a17421c3d1fa9ea52 SHA512 6c4c69e1434194076a99f8134a2558c791675d420a17687dfd5b38c1303564392ecc388ec285d55a20027bcbcbc1b3475a489b70390796c46346b89d4b18ad89
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.11.0-r1.ebuild 1225 BLAKE2B ebac58d02165bf6f02c6cd06939dc44523dc8cae154abc95ac5e8ffce64384c481dd0d9b1f73dfd1debc48278567bb787b80c23601cc1990cbbcfdc18b8c4c7e SHA512 f5e4e78e6391eab9bce2d46b6460e2c04b81e03662c40900524cc33a218bced9366df82d604d67493665cd2701177b79cacd9fd5a3f2054c72ef449addd7d333
+EBUILD lockfile-0.11.0-r1.ebuild 1226 BLAKE2B d36184fd1f953b0cc9000cf607623fa1c540d2b6e63d81c6cf9eed0306fa2a21402f052165cc15138abd6560024e700f24bbc6e22418a69ba86e9c6e60f11f06 SHA512 72c1374edf3eb8898222dabdc0fe15316daed78fd974568af5fc954eef7cd917d3d0df54d4ccd899edc9aeb3df38b49de4378cb4cafe112876e92579108d5657
 EBUILD lockfile-0.12.2-r1.ebuild 1098 BLAKE2B ce4d96145d24fa870a818c1ef11a591cb0140e3fda4d43a447c77784b15c9763f30618c2778bb65572955daaedc05df5224e768efa9ecedacde6aefdd342a2df SHA512 cbb2ed5e6d0098ed36a7eb10ca3e9f1c4ded9f76e5141ff02ce4aa659b40f2986df0432bd53099f36d1433e2d1a6b4bd888cd2c927e5e11914af8a2f4f3a3443
 EBUILD lockfile-0.12.2-r2.ebuild 1098 BLAKE2B 4e921f127c6237e45555f32dacfec9efe240463b66653f8e2c4c449e81ce5870f70991bbe2e4281a753bef3b6d0dc8a3d76a55ecb6454143e4df5599128e436c SHA512 e8901e332a79d880a6ba5316a47b5aba0dec39685fe76d55a873ed8cfa45af4e420adfc92886026cb8ec0b73f3e612faa6d828636f58684204fb1d681a0b9091
 MISC metadata.xml 364 BLAKE2B 504dcb4ca67f92ab6554918b7dfa48d80f31439e35d6d1b5af441dde50455d27bea1f9e0f2284676cd9190cdacc839a322ac4ae556b45a371f98d5f032c5ae5c SHA512 b736cd5f710ac2c628d8379aa69fbf3cf5015a1edd80405ee695d56d0a0f86bc40c8ecbe70083338e6b7fdd115d11318358f5fd04b2397e0ab5ab7b315bfad5b
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
index b333b045dca1..1c1234a1a9e4 100644
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index 9176726387e4..0d8c6e1572df 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,6 +1,6 @@
 AUX logbook-0.4.2-objectsinv.patch 393 BLAKE2B 9575e9f92379fc772755785bd10cc465c9c85085cc9261657a61754d179f8a8f790da8045c13bdabbc0d62ca12c74286bcb35652dc13b8675ef8aa2d6677e57e SHA512 7b62f943b48f52ae46d56a8835f0942d74feb757f2a1ec5165006cfb70a6e2030b422a20f278aa746d1f3c85c9c20d87c954e8c42c31dfd18050fef9dbd3f302
 DIST logbook-1.1.0.tar.gz 367541 BLAKE2B 26e27e94f1238c9188fc66b6eb1f5622d96e1c0db97817dba30c8c70107544ea80ab1f11b71592db6a8e2a9c5d32dd659782a532cb7d263c2f042b41ef88d2ad SHA512 55ec7a026a08baed405e29d7cdcc9d3cc423c9faf13788c2447ac7ccff688de9bd9e332ad78077b1eef8bc8ad9aea572f9c124888f46ecabc2abf22d8ac9086b
 DIST logbook-1.4.0.tar.gz 369335 BLAKE2B 02398be49d2a12aadbcde90561afe6ac08060877922fa04b27f08587115aef8faf47bfc352fc005b8a986ab619289c8544fe53a84e0e863a09c992685f78739c SHA512 3ea969e9e2075e34a915566be906266b408671657e4cecbe47663c28f2212c0522b0f0eb2832fbc4fb906f70c8e53d3cdbe65923dafe53a77545b8126ab539f2
-EBUILD logbook-1.1.0.ebuild 1190 BLAKE2B 4cadaf73f6cbb58ea2f24f45dcc7606b53e02ea9028680b54f250719d92dc15324f855d731259cc24248d75f4f0b7e9592fbfba73d23e089df8dcd131581ee79 SHA512 423db29cf813ee6c146a43412f82ca9f76c95d076dacf2580d0b02280c355489452750d6317dc944f098d8b24cf6de917c5733e172e9b3a0806d992055062dca
-EBUILD logbook-1.4.0.ebuild 1192 BLAKE2B f97fe5b5090a73f90e04a5a3e61e9f7b4da05216685e727140fc0c0328f0ba38aeb4fd2a3a8e68a1e36526fb68463da0c53f8a3b51ee13fefcc02ada2fc1dd5a SHA512 05b8efab973b0443d2613b898b3526518d2e5ea8ce420bf6ae5b96d9b820d7c175c3404e23f3b46de4c17dec24f4295c4b3ca7208b0f7a5a4ce16308c4e10947
+EBUILD logbook-1.1.0.ebuild 1184 BLAKE2B 168c728e8882eb75d55686a2517bf8ad7da51bcef41ceba8527f7fd6f049d40536c066dfea029978862d7fd25b4b3fe938dbef1fa1b8809ecaaf2f8b3b745343 SHA512 ed8a5ef78e06e9566d98d88e1ac27117838dcb126b9c739efd0f476572b27f956c17aa981cf05774c6f55ce61e25866557a5ab54634e960e8ead87d07242f0cd
+EBUILD logbook-1.4.0.ebuild 1186 BLAKE2B 87ed354f89440ed3a45e0f1ed248882e101f4a97a8b5f2f7f384fae249df508a438d4b9c13152390ebd74aea3245e9b413ae99a532e883add87340d7de73b3db SHA512 c3552a0fd7c04c70ec14c1477d1ce5c15e41f7e32adeef2537ae4a5f46d147ec3b54a86fb91efb601c29ac96243e34b4516f5483e03cb769f1a20fc87bbd9d03
 MISC metadata.xml 379 BLAKE2B 63416a01d45934c94f9f56e2872a35d66a625c6d529315697d4038d64fe0947f77065badeba36cd765d2a4781e04ab651b3b812c5563caf3222065210d62f3f1 SHA512 fcb989995cc9403469ef44339c37b3a849a485b9741b1910e3dbad66d6aeb5a815a25ef9c403c020d75e608f91d78d436dff8a098efe5a508ae73b3dffe01a82
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
index 3d251417d228..f136b6ba1cc7 100644
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/logbook/logbook-1.4.0.ebuild b/dev-python/logbook/logbook-1.4.0.ebuild
index f06bd6f03f4f..01c0f7bbee4c 100644
--- a/dev-python/logbook/logbook-1.4.0.ebuild
+++ b/dev-python/logbook/logbook-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/logutils/Manifest b/dev-python/logutils/Manifest
index d42fef6dc854..829bff029f8b 100644
--- a/dev-python/logutils/Manifest
+++ b/dev-python/logutils/Manifest
@@ -1,4 +1,4 @@
 DIST logutils-0.3.3.tar.gz 27106 BLAKE2B b029b1767fd385d921a254454090630b31b4a9ff7f71ca7fbf777102bcdc795bd79207f8d9098bb0538a110dfbc8ceef87ffe1443fbb42cad1e6f4879248ea0e SHA512 d341567180e96cf09155af7af96becb773b81e1c25946c5f08fce56b85018f236eb23b0d76b2b938900128b763a65327d64f0abaec0ccb0f6365d4d8fa3dc369
-EBUILD logutils-0.3.3-r1.ebuild 498 BLAKE2B 458ca68c366bee4d15ebbcfba0ff52e096437163043456238d6058c4ac31173185cde9cd812e0a33ec6975ca2640ee08127d0b3dfda1a0d888f0a655380af585 SHA512 8b9c94a3e520817485ee9af5202552cc77d796e07022738ebea6348cdde797202799974a0bf1e45afc1a1164d20c822c1ff6d9be43532022b8830dfa1d089f42
-EBUILD logutils-0.3.3.ebuild 482 BLAKE2B 32309aaa4fa0692c77c18104c6701a3a51453b4f20e527d12ff8141aa9775e7cc216ffcc33369545ee8ded270ae57e915c2a5360e53d34724f916b2f559990a9 SHA512 42f62ae7943436ba417ca05e477f13cf28dfe211d25b285ccfbcd94f7170c04f80d5ff6a581da241f8b6fac301fa476eee2d2df02487ebd32cd0ef9e64323bad
+EBUILD logutils-0.3.3-r1.ebuild 488 BLAKE2B b68905ec3b1a182b765d288ceaf83da47566da5a02e3f8e4c5006ec148b522688140f2fb37669a4288301985d7cb62da447615b62c3a91642a07232c202e8701 SHA512 2fb310f438b91f33a47c914666a8fa07b0fc41ba2e4acd233687d003029e47b2886176453e596a55c1d22bdde7ad90c58b9c87fae1254e9a96472b232abad715
+EBUILD logutils-0.3.3.ebuild 476 BLAKE2B fb7e98a674ae26ae4e134f6d4c6d9f5900e747fa233abd8f4d08ed19fa6c9ef5066c2538aa35be48c8bfddda09858feb087d9c11eabaa35d785e69bbcba203db SHA512 35a69fd5c8ecbaed2241682528cf94eee2160aabefcabbc0bce5ef93e0695f07f377915329c8580dd1039c596a555467bf36fe75520c4eab2bf2a7910ca513bd
 MISC metadata.xml 388 BLAKE2B 587b9d7fcaa5cc18f3064ebfb24f18808ddbf2c05d68d6a44910babde42dd3ec003ba40b1738de445065767da564a1146e68ef14aba0309b7150137cd44b71d3 SHA512 19aab936b18ec786b830772716ee0d0c0e2d81e2cfabbccc20d0c0baa0dda993423c9de608780f2b969a2cc53f5e03a1378486246c86c656143fe6a0626a61de
diff --git a/dev-python/logutils/logutils-0.3.3-r1.ebuild b/dev-python/logutils/logutils-0.3.3-r1.ebuild
index 44214d61aa18..0a97d1d1f31b 100644
--- a/dev-python/logutils/logutils-0.3.3-r1.ebuild
+++ b/dev-python/logutils/logutils-0.3.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
index 7559718a6336..ffcbc6043503 100644
--- a/dev-python/logutils/logutils-0.3.3.ebuild
+++ b/dev-python/logutils/logutils-0.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 7f44dc71fbf5..a2e53771d659 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,15 +1,12 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
 AUX lxml-4.4.2-tests-pypy.patch 17078 BLAKE2B 2dc3bc4f8b1de65f3b287d921880e2632cf3268b0e944846cd641903b382a0065d820093448069fbea318a3bf181b375a441dbf8aa903f0ee71f2ae819358adf SHA512 9a5c021b8cc2cd6cd4a609adb858e582172675aa5bc106ce03f88da95c71d7b2afc04394728e8297b316f6312d338f170a87b4937cda78d78c56e80a3308e3f5
-DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
+AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
-DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 5059ea45d3d833955636216a7c096322496882de4592a0d19604885dca8dffbc763afb7dc804b7a34561d0c94dfa2130a61835d6c12b97dc83008e8fa33e098a SHA512 7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed
-DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314 SHA512 23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3
-DIST lxml-4.4.1.tar.gz 939355 BLAKE2B 0e9ebc894ebaa7994ee7ce1491683ff892ceac5dbae6bd90fd4d5ac04ec59d6c85edba37160a605c8c1b38119cdccdc8b97b62dc43f76705d7ebb595410c666c SHA512 08857f5e15d6b4badb8bea96fc7aaf3a02a504f9b87171e01c6ace25250d254691c64661dca8e723824cabac4753c59ffa667ac0b6042506b05e4357389e658c
 DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705bc948af24bba369153accc0a4cea0372e87530227be88a89a0dab4d23308b75fd695f55fdb73e6326aa03b SHA512 af6608df7e47513644b841ecb6291e655122927cb439bd2ae694fd344cf5dca621e3e1ce6b40accc6db9e0c4383b5b3e6c6f9ff19f35c4daf30f119a217113ca
-EBUILD lxml-4.2.5.ebuild 2346 BLAKE2B 6ad6d208349c25945792d73976713927a0fd98c67cf00b449c8fd0d8cb8fdaccaa4c468c240ace642da05eb6aaccac82f91364bf0f96d7d11be6a442c1ffc5f9 SHA512 388046d56566d810a2067303aa7fd6fff906a02ee34040a80b8b78b3ec2b7e35a726320ae58ea3484e479266b4434051c4c0e5f90da4ecbe51ff5e2684d0a039
-EBUILD lxml-4.3.3.ebuild 2436 BLAKE2B 460b2b5ef5c294ed20998c3abfa888deacc8b69fe0dad701fbb5e67b454059b338bbeab8c8740c05f90b27270a4b1100c398d054131f3174d335be5d2045afed SHA512 20a9f899905c29ef32b0cede41098e8d1d6862005cd219114dbd3aecf7da1102b831a61bc4344a8c3bbb7fe2ff7c41e6455c0e0e86a0f377b5b18fa9e2bd454e
-EBUILD lxml-4.3.4.ebuild 2447 BLAKE2B b2cfc585bf18c585a7a5430e2d8cca6a4c6954333e71049190c24bd74f8cb2ace7feacddb1933846d00878f30e589c7e73ddfa6b054e828c6481e6c585b05d94 SHA512 69adfc23c9c70d2d3edc585259a5d2e85a11e5ca1f49e491ef7ab8ae85f6fbb292f56a5787839dd040e1474f7705b50a3bd166259e35d138c1d29e92fc2a56bb
-EBUILD lxml-4.4.0.ebuild 2295 BLAKE2B 79a13c6db76d78031ac8769d74ba8f835dbfeedf82ef7c2504906fde9736afecd22c48c96975cfb480b722b407810fd139f3f660fa714116acc3f17738b42c51 SHA512 e18818935cb9a3ea09dba9285decf17c27125e07d672068e74801165a4a2a0f2ab9a457dec4fe0762630791988862d935a145ee7c897c426dcb12927b1902e78
-EBUILD lxml-4.4.1.ebuild 2297 BLAKE2B d00bb97732a6c6a4831d51a142a1486948306c7ba46769b5adfa842d1a9d70fcebc65292c9351c04b0ce4a28cefdfddd18c69a6750682e15f53335ddd327d6c6 SHA512 4e649aa9ca4be5e8c998c4405862cbf685353e50c737d345ff272d835fdb62010ae7b04d7bff1d31ef8559efd1fd96ad65b2c3031d85261828ffbc76b06b69bd
-EBUILD lxml-4.4.2.ebuild 2347 BLAKE2B e8b2e916b01bfbbc99341c6ac1f2c62ca7d358d6474932da1a723228b32b948c58206e6e514c95c7f6cfc7660fe2dfb625127da6a0b5080c562cab6173e33758 SHA512 771b594ce84da482e4bb606b619828e5c74c5d8b6cc8a43a345ab9d2cdf27043c46840ecfd8648396d765af68a5b1c5fce7effc03ce6885965572b0b13e9e06f
+DIST lxml-4.4.3.tar.gz 940482 BLAKE2B 9ece0314d7b8ef82d70e83f6b77e4abef99d486a0168497f1f97e6a93d81d58e522e259d3569373d2429ac3190a642e8d1107dbae29ca20ec56636f7576545b6 SHA512 7b07450a243595bd412a43e73a55fafda0e6a6e41ed47c5488ee8e6cbd04d48a93db1b06f8b646bdc6377cad063aa53781cf41e3048f9dd7a62ccecc20900298
+DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
+EBUILD lxml-4.3.3.ebuild 2437 BLAKE2B 73fb2f05738a79448b324a20e9a79ec981889511cbc33bde9ec00797eb7e67db85fca94be070cb752203749a5796a60d8bc6a1aba9ae76156c6aae96f9bc9d50 SHA512 33c12f61dd02d7608c21923e9a96a56a9b60f286fc3d97de30780e69cf804dd60b8a0eea9f8cc3a107eb2f6cb119807b7c174cb9b7f8708ed54e5d77cf16851f
+EBUILD lxml-4.4.2.ebuild 2294 BLAKE2B a891ce490d942f2ffcff7b3b28ee31577c27db3df3aca4549bada59c8539189adaa3d97404e4a7d9ce4bbfa644e5b3fca94d602e28cde4c85bffe65ed34e529a SHA512 4411ee25b2399c241a4c6010d10353c646b95f9dcc8e6348fd57b8ef34bbb59bf394925abd53c8439d992162c44701436d5e530a54e76b9aa3118b71170891de
+EBUILD lxml-4.4.3.ebuild 2301 BLAKE2B 7cb17345b72b32f3b21b5b6299b8b1f7359557c5daf11ccf868448f03cba781ea7ea4f9c19e600a28753ae863f6fe988b6fd7c2336be53f8862427501c70c120 SHA512 cd99aa11d270e67bed34ac21aa71770ad3a0c143a97d12d2c4d35532d6c51aa92fa6bda2ed2f684e4087db8d247f108ee72cbe7f7cddc80d71430e834ada011c
+EBUILD lxml-4.5.0.ebuild 2301 BLAKE2B d96936664a021c04a3192c699c6671c3394d8a8827866bdac813c098956a9e193a60c985d332a56efe214fdbbee2c25c357ae738a8fa8565f5fa3329e17418fd SHA512 b158f2bc2b8b0344248395f8b264da9e818435e2c2ba8e0b9c901b9a75ef0f67780d1f5143c8b1d01657ecb599e674a2c753745bb6fac95a34e39b6a1b8bd7e6
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-4.5.0-tests-pypy.patch b/dev-python/lxml/files/lxml-4.5.0-tests-pypy.patch
new file mode 100644
index 000000000000..5f8cad9063fd
--- /dev/null
+++ b/dev-python/lxml/files/lxml-4.5.0-tests-pypy.patch
@@ -0,0 +1,434 @@
+From 1804702b5e3c85c1a16014d62365a29d0a6d0c75 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 30 Jan 2020 06:15:27 +0100
+Subject: [PATCH] Skip tests failing on PyPy
+
+---
+ src/lxml/tests/test_elementtree.py    |  3 +-
+ src/lxml/tests/test_errors.py         |  3 +-
+ src/lxml/tests/test_http_io.py        |  3 +-
+ src/lxml/tests/test_nsclasses.py      |  3 +-
+ src/lxml/tests/test_objectify.py      | 41 +++++++++++++++++++++++++--
+ src/lxml/tests/test_xpathevaluator.py |  7 +++--
+ src/lxml/tests/test_xslt.py           |  7 +++--
+ 7 files changed, 56 insertions(+), 11 deletions(-)
+
+diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
+index 78d8964d..f3f28044 100644
+--- a/src/lxml/tests/test_elementtree.py
++++ b/src/lxml/tests/test_elementtree.py
+@@ -26,7 +26,7 @@ from .common_imports import (
+     BytesIO, etree, HelperTestCase,
+     ElementTree, cElementTree, ET_VERSION, CET_VERSION,
+     filter_by_version, fileInTestDir, canonicalize, tmpfile,
+-    _str, _bytes, unicode, next, IS_PYTHON2
++    _str, _bytes, unicode, next, IS_PYTHON2, IS_PYPY
+ )
+ 
+ if cElementTree is not None and (CET_VERSION <= (1,0,7) or sys.version_info[0] >= 3):
+@@ -2956,6 +2956,7 @@ class _ETreeTestCaseBase(HelperTestCase):
+         self.assertEqual('TEST', root2[0].get('{%s}a' % ns_href))
+ 
+     required_versions_ET['test_register_namespace'] = (1,3)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_register_namespace(self):
+         # ET 1.3+
+         Element = self.etree.Element
+diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
+index c0aee744..33111429 100644
+--- a/src/lxml/tests/test_errors.py
++++ b/src/lxml/tests/test_errors.py
+@@ -11,7 +11,7 @@ import unittest
+ import sys, gc, os.path
+ from lxml import etree
+ 
+-from .common_imports import HelperTestCase
++from .common_imports import HelperTestCase, IS_PYPY
+ 
+ 
+ class ErrorTestCase(HelperTestCase):
+@@ -25,6 +25,7 @@ class ErrorTestCase(HelperTestCase):
+     def test_empty_parse(self):
+         self.assertRaises(etree.XMLSyntaxError, etree.fromstring, '')
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_element_cyclic_gc_none(self):
+         # test if cyclic reference can crash etree
+         Element = self.etree.Element
+diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
+index f9eff39a..edf2bd81 100644
+--- a/src/lxml/tests/test_http_io.py
++++ b/src/lxml/tests/test_http_io.py
+@@ -11,10 +11,11 @@ import textwrap
+ import sys
+ import gzip
+ 
+-from .common_imports import etree, HelperTestCase, BytesIO, _bytes
++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY
+ from .dummy_http_server import webserver, HTTPRequestCollector
+ 
+ 
++@unittest.skipIf(IS_PYPY, "broken on pypy")
+ class HttpIOTestCase(HelperTestCase):
+     etree = etree
+ 
+diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py
+index a0aa608d..5aa5dc48 100644
+--- a/src/lxml/tests/test_nsclasses.py
++++ b/src/lxml/tests/test_nsclasses.py
+@@ -9,7 +9,7 @@ from __future__ import absolute_import
+ 
+ import unittest
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY
+ 
+ class ETreeNamespaceClassesTestCase(HelperTestCase):
+     
+@@ -46,6 +46,7 @@ class ETreeNamespaceClassesTestCase(HelperTestCase):
+         self.Namespace('ns02').clear()
+         self.Namespace('ns03').clear()
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_ns_classes(self):
+         bluff_dict = {'bluff' : self.bluff_class}
+         maeh_dict  = {'maeh'  : self.maeh_class}
+diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py
+index a12ae7e1..83ba4ced 100644
+--- a/src/lxml/tests/test_objectify.py
++++ b/src/lxml/tests/test_objectify.py
+@@ -9,7 +9,8 @@ from __future__ import absolute_import
+ import unittest, operator
+ 
+ from .common_imports import (
+-    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO
++    etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO,
++    IS_PYPY
+ )
+ 
+ from lxml import objectify
+@@ -213,11 +214,13 @@ class ObjectifyTestCase(HelperTestCase):
+         expected.update(DEFAULT_NSMAP)
+         self.assertEqual(root.value.nsmap, expected)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_date_element_efactory_text(self):
+         # ObjectifiedDataElement can also be used as E-Factory
+         value = objectify.ObjectifiedDataElement('test', 'toast')
+         self.assertEqual(value.text, 'testtoast')
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_date_element_efactory_tail(self):
+         # ObjectifiedDataElement can also be used as E-Factory
+         value = objectify.ObjectifiedElement(objectify.ObjectifiedDataElement(), 'test', 'toast')
+@@ -374,6 +377,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual("4", getattr(root.c1, "{}c2").text)
+         self.assertEqual("0", getattr(root.c1, "c2").text)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_setattr(self):
+         for val in [
+             2, 2**32, 1.2, "Won't get fooled again", 
+@@ -809,6 +813,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(3, len(root.findall(".//b")))
+         self.assertEqual(2, len(root.findall("b")))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_build_tree(self):
+         root = self.Element('root')
+         root.a = 5
+@@ -838,6 +843,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(value, None)
+         self.assertEqual(value.get(XML_SCHEMA_NIL_ATTR), "true")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -871,6 +877,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(value, objectify.BoolElement))
+         self.assertEqual(value, False)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -878,6 +885,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "test"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_intliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -885,6 +893,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "3"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_floatliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -892,6 +901,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = "3.72"
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mul(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -904,6 +914,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertRaises(TypeError, operator.mul, root.s, "honk")
+         self.assertRaises(TypeError, operator.mul, "honk", root.s)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_add(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -914,6 +925,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual("test" + s, root.s + s)
+         self.assertEqual(s + "test", s + root.s)
+             
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_mod(self):
+         s = "%d %f %s %r"
+         el = objectify.DataElement(s)
+@@ -979,6 +991,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(value, objectify.StringElement))
+         self.assertEqual(value, "3.20")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -986,6 +999,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("test")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_intliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -993,6 +1007,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("3")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_floatliteral(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1000,6 +1015,7 @@ class ObjectifyTestCase(HelperTestCase):
+         root.s = _str("3.72")
+         self.assertTrue(isinstance(root.s, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_mul(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1012,6 +1028,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertRaises(TypeError, operator.mul, root.s, _str("honk"))
+         self.assertRaises(TypeError, operator.mul, _str("honk"), root.s)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_ustr_add(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1037,6 +1054,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(value, objectify.StringElement))
+         self.assertEqual(value, _str("3.20"))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int(self):
+         Element = self.Element
+         root = Element("{objectified}root")
+@@ -1053,6 +1071,7 @@ class ObjectifyTestCase(HelperTestCase):
+         value = objectify.DataElement(123)
+         self.assertEqual(hash(value), hash(123))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1069,6 +1088,7 @@ class ObjectifyTestCase(HelperTestCase):
+         value = objectify.DataElement(5.5)
+         self.assertEqual(hash(value), hash(5.5))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision(self):
+         # test not losing precision by shortened float str() value
+         # repr(2.305064300557): '2.305064300557'
+@@ -1088,6 +1108,7 @@ class ObjectifyTestCase(HelperTestCase):
+         s = "2.305064300557"
+         self.assertEqual(objectify.FloatElement(s), float(s))
+   
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_float_precision_consistency(self):
+         # test consistent FloatElement values for the different instantiation
+         # possibilities
+@@ -1169,6 +1190,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(value.text, None)
+         self.assertEqual(value.pyval, None)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_unregistered(self):
+         Element = self.Element
+         SubElement = self.etree.SubElement
+@@ -1331,6 +1353,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(["why", "try"],
+                           strs)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_str_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>test</b><b>taste</b><b></b><b/></root>'))
+@@ -1358,6 +1381,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertEqual(root.b, "")
+         self.assertEqual("", root.b)
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_int_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>5</b><b>6</b></root>'))
+@@ -1380,6 +1404,7 @@ class ObjectifyTestCase(HelperTestCase):
+         
+     # float + long share the NumberElement implementation with int
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_type_bool_cmp(self):
+         XML = self.XML
+         root = XML(_bytes('<root><b>false</b><b>true</b></root>'))
+@@ -2049,6 +2074,7 @@ class ObjectifyTestCase(HelperTestCase):
+                           before = [objectify.getRegisteredTypes()[0].name],
+                           after  = [objectify.getRegisteredTypes()[1].name])
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_registered_type_stringify(self):
+         from datetime import datetime
+         def parse_date(value):
+@@ -2519,46 +2545,55 @@ class ObjectifyTestCase(HelperTestCase):
+ 
+     # E-Factory tests, need to use sub-elements as root element is always
+     # type-looked-up as ObjectifiedElement (no annotations)
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_int(self):
+         E = objectify.E
+         root = E.root(E.val(23))
+         self.assertTrue(isinstance(root.val, objectify.IntElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_float(self):
+         E = objectify.E
+         root = E.root(E.val(233.23))
+         self.assertTrue(isinstance(root.val, objectify.FloatElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_str(self):
+         E = objectify.E
+         root = E.root(E.val("what?"))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_unicode(self):
+         E = objectify.E
+         root = E.root(E.val(_str("blöödy häll", encoding="ISO-8859-1")))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_bool(self):
+         E = objectify.E
+         root = E.root(E.val(True))
+         self.assertTrue(isinstance(root.val, objectify.BoolElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_none(self):
+         E = objectify.E
+         root = E.root(E.val(None))
+         self.assertTrue(isinstance(root.val, objectify.NoneElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_value_concatenation(self):
+         E = objectify.E
+         root = E.root(E.val(1, "foo", 2.0, "bar ", True, None))
+         self.assertTrue(isinstance(root.val, objectify.StringElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_attrib(self):
+         E = objectify.E
+         root = E.root(foo="bar")
+         self.assertEqual(root.get("foo"), "bar")
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_nested(self):
+         E = objectify.E
+         DataElement = objectify.DataElement
+@@ -2573,6 +2608,7 @@ class ObjectifyTestCase(HelperTestCase):
+         self.assertTrue(isinstance(root.value[0], objectify.IntElement))
+         self.assertTrue(isinstance(root.value[1], objectify.FloatElement))
+ 
++    @unittest.skipIf(IS_PYPY, "broken on pypy")
+     def test_efactory_subtype(self):
+         class Attribute(objectify.ObjectifiedDataElement):
+             def __init__(self):
+@@ -2674,7 +2710,8 @@ def test_suite():
+     suite = unittest.TestSuite()
+     suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
+     suite.addTests(doctest.DocTestSuite(objectify))
+-    suite.addTests([make_doctest('../../../doc/objectify.txt')])
++    if not IS_PYPY:
++        suite.addTests([make_doctest('../../../doc/objectify.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+diff --git a/src/lxml/tests/test_xpathevaluator.py b/src/lxml/tests/test_xpathevaluator.py
+index 13ee97ec..6d162c6d 100644
+--- a/src/lxml/tests/test_xpathevaluator.py
++++ b/src/lxml/tests/test_xpathevaluator.py
+@@ -8,7 +8,7 @@ from __future__ import absolute_import
+ 
+ import unittest, sys
+ 
+-from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest
++from .common_imports import etree, HelperTestCase, _bytes, BytesIO, doctest, make_doctest, IS_PYPY
+ 
+ 
+ class ETreeXPathTestCase(HelperTestCase):
+@@ -740,8 +740,9 @@ def test_suite():
+         suite.addTests([unittest.makeSuite(ETreeXPathExsltTestCase)])
+     suite.addTests([unittest.makeSuite(ETreeETXPathClassTestCase)])
+     suite.addTests([doctest.DocTestSuite()])
+-    suite.addTests(
+-        [make_doctest('../../../doc/xpathxslt.txt')])
++    if not IS_PYPY:
++        suite.addTests(
++            [make_doctest('../../../doc/xpathxslt.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+diff --git a/src/lxml/tests/test_xslt.py b/src/lxml/tests/test_xslt.py
+index cde23357..41f8d78b 100644
+--- a/src/lxml/tests/test_xslt.py
++++ b/src/lxml/tests/test_xslt.py
+@@ -17,6 +17,8 @@ from textwrap import dedent
+ from tempfile import NamedTemporaryFile, mkdtemp
+ 
+ is_python3 = sys.version_info[0] >= 3
++is_pypy = (getattr(sys, 'implementation', None) == 'pypy' or
++           getattr(sys, 'pypy_version_info', None) is not None)
+ 
+ try:
+     unicode
+@@ -2085,8 +2087,9 @@ def test_suite():
+         suite.addTests([unittest.makeSuite(Py3XSLTTestCase)])
+     suite.addTests(
+         [make_doctest('../../../doc/extensions.txt')])
+-    suite.addTests(
+-        [make_doctest('../../../doc/xpathxslt.txt')])
++    if not is_pypy:
++        suite.addTests(
++            [make_doctest('../../../doc/xpathxslt.txt')])
+     return suite
+ 
+ if __name__ == '__main__':
+-- 
+2.25.0
+
diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild
deleted file mode 100644
index f2a02a829719..000000000000
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# apparently logs have changed with libxslt upgrade
-	# https://bugs.launchpad.net/lxml/+bug/1782078
-	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.3.3.ebuild b/dev-python/lxml/lxml-4.3.3.ebuild
index 2e0cc643e642..2a00e922abb7 100644
--- a/dev-python/lxml/lxml-4.3.3.ebuild
+++ b/dev-python/lxml/lxml-4.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lxml/lxml-4.3.4.ebuild b/dev-python/lxml/lxml-4.3.4.ebuild
deleted file mode 100644
index 01eab585ebfd..000000000000
--- a/dev-python/lxml/lxml-4.3.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 eutils toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# apparently logs have changed with libxslt upgrade
-	# https://bugs.launchpad.net/lxml/+bug/1782078
-	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index d8a372d79f7d..0210cdc96699 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
 	"
diff --git a/dev-python/lxml/lxml-4.4.1.ebuild b/dev-python/lxml/lxml-4.4.3.ebuild
index 73aa0d8537b8..8e5f5c5c5482 100644
--- a/dev-python/lxml/lxml-4.4.1.ebuild
+++ b/dev-python/lxml/lxml-4.4.3.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
 SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
@@ -24,16 +25,16 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
 	"
 
 DISTUTILS_IN_SOURCE_BUILD=1
-S=${WORKDIR}/lxml-${P}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+	"${FILESDIR}"/${PN}-4.4.2-tests-pypy.patch
 )
 
 python_prepare_all() {
diff --git a/dev-python/lxml/lxml-4.4.0.ebuild b/dev-python/lxml/lxml-4.5.0.ebuild
index d216231db4db..669878e08cd1 100644
--- a/dev-python/lxml/lxml-4.4.0.ebuild
+++ b/dev-python/lxml/lxml-4.5.0.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils toolchain-funcs
 
 DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
 HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
 SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
@@ -24,16 +25,16 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
 	"
 
 DISTUTILS_IN_SOURCE_BUILD=1
-S=${WORKDIR}/lxml-${P}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
 )
 
 python_prepare_all() {
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 94e2462d221a..6743f8911aa7 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -2,7 +2,7 @@ AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a
 DIST lz4-0.10.1.tar.gz 92068 BLAKE2B e581540036d1008c5efa008a1b980c1bd612bab94635b7a506e230921bd17c534fb99272e3ea09bc5be4faf09e0a8f701224c433df1615b4e708d620a23e1149 SHA512 538880742257e08b027c45c33aa29e12d7303826f63817d1f6d316ea9b69dfb20710a4f573499ce141cffd12fbac701305405521cb815e2329333934e7e1f2c9
 DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
 DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
-EBUILD lz4-0.10.1.ebuild 600 BLAKE2B befe97da696a9d0e9a636a4d6cd15b3358788f0320ec720a58e35f814b611c1349d807b8c143b74ff7965d2ceb40c3f04457afdeb6d4b2f8de934c2721bebab6 SHA512 b2dc07da46e577c86efd53066003ebf61490c5517c8db28eb0aedc25af51e43d8ab609f291b01c25de8425581a034d142663c37d2736565a0e288b9aaa61fa36
-EBUILD lz4-0.8.2.ebuild 825 BLAKE2B 72c6fca6761116d36396f3824d3a611a424d1c62275ff539f8f2ad52ba4b7d7961f176626031714723f0a6e64ac2f031f4b66270a5359dda2d6b1d1ecb8bf51a SHA512 b11c8d27a4d790e4db8aab784dcdf4479c2181a59ef46c2c9bbbfd6dc381e88705a3826df99e2efb52d38f585d3f4461b5cb701767288714e7c728132a9edd93
-EBUILD lz4-2.1.6.ebuild 556 BLAKE2B 55ad9e9f4a0341f4728e5b24c56ad95027a0aa5ce20aa6a0727ff3eae575c021b1ad47cd49ff10629aadefab520361e6a6d41fb64d7eac9feb753fe1ffd33a5c SHA512 27f6ab470f57bd18c45bd83661229a988a04bf0514e52b7be31f47987e554f1e92c11fcff995174f03f53b302ab73f784601a284c88d0fefb1a031be5d1d7603
+EBUILD lz4-0.10.1.ebuild 594 BLAKE2B d29d83e088b7abc4a639b3ccb4ec973941ec40832596704af6e2ffbee08f98351af70b54ef7375e5af3ec5a763d4fb8392ec1aebaee941b86f7d5ae804a8f32f SHA512 590efe82e6077286ba56aff018d4ab4dce0a28cdbdf3845f29b965ecfee5ce9b5e38025c19a0285a256c2fc60bfaf4f2ea888ce6e260d728c0e57613d9e55793
+EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
+EBUILD lz4-2.1.6.ebuild 552 BLAKE2B 1dd786e93c035fca03f7be3527ee6621d2f80f73c3488dbbfc4e60ad23addd856afe410bd1e8a92d072f62c99901b1cc4649dcf5abccc4c89c39ae43121a0431 SHA512 a3c3d7494b644eeeb6c3e9d091cbc0e939bffd0430d9d17e7913cc0d74588deb47dfd85911eeb4391e4114c488a7fa76c2932f63a22d952bf3b0082fef399d91
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index ab2f21869811..53344e14b708 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
index 340de7f78625..7803badb5b7c 100644
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index e5a9bd7b8f30..bf600f275e2b 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 52cfe856a7e6..a54754c2aac4 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,6 +2,6 @@ AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f1
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
-EBUILD m2crypto-0.31.0-r2.ebuild 1515 BLAKE2B 03ed9034d0b22388c010360a76fc49b0965c2ef62006c21d622165dab106f92789fc0dc1bc570be35ab70e6369142d0d116b97c391cd06a097a2c8e04144929b SHA512 d079b369d5b08c56a7fca1c000b2bbae76721be470abf7cc5ec48b6b538cd54345cf52172de6fb56809031d2b266e30a4980ffb55ed9fba6a932c69e6957d4d2
+EBUILD m2crypto-0.31.0-r2.ebuild 1516 BLAKE2B 59b5071bd65f1ae504ea45ac673ad1f38b2473cc8fde73f1b33e9370d7e26d17a718530fcbf06cc96b98b4d3f9f259dbe1f8ee99471c285281e1ce2c447391cd SHA512 0d3bfec0a3ede1da0818eb8ec19794f4f6cb959686c6679441787f55f3126116542a7731eb89a6ab7bccbd3fe7d66c8071b2ab41e7e7fa26acf15aa8a46e8807
 EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 99d5a8a7011e54d203ae8a1d71c3a909720bd69cbe68097a95e3e56c7fdb75c8780e9ad0504a07debd570e9d93b2c402550dbe6a56020365cea14e5a1a42b75b SHA512 7e09a092e644d8211474b1f42f4072dcf88fabcea6a483ccc8838a42c05819711aae5286a7ef4cdf8c0df73d6a24dec1f696638632910d33c8a5a381a1239f21
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
index 65c6597d33e1..cf7277f442e7 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 IUSE="libressl"
 
diff --git a/dev-python/maintboot/Manifest b/dev-python/maintboot/Manifest
index bfcdc9eb6643..f5ff87318ebf 100644
--- a/dev-python/maintboot/Manifest
+++ b/dev-python/maintboot/Manifest
@@ -1,3 +1,3 @@
 DIST maintboot-0.1.0.tar.gz 2090 BLAKE2B e20c7f478b83de1eaa7c8abde5f7c308c58b41eb8b7a02b3896c7d050d3d54ec55bdc518648fb5c7187d3626bbbe0093f6a191ec7e9a29ffdf4497d0da50fe18 SHA512 dc63c59718a3c66a2128f36ad495c42d94bba08d6b16c40f470b0a0cc00388b5ec5977326ac258c858113e4d6c3f1ff246c5a1dfbd3d417aea181d381d7ae28f
-EBUILD maintboot-0.1.0.ebuild 401 BLAKE2B fdaf2fa356365912e2408309d70075c5410f7c57d13dcaaae4aae67ae6acdd2eb122bfd62f4dfacf2b0bd9b3ec03d36b3688e9abad33753903817c84468475d1 SHA512 80f6aea906f9940175dc8f02539bc1baca4d4e650cc7e068b1e82542584f9e9fc70ecc9be936a7158ef6a7b8d59061d5ee5fdef4f9ae1657ebd512fe4ecb9038
+EBUILD maintboot-0.1.0.ebuild 395 BLAKE2B 840035138f0aab82f9ad26eff2acf621bc7f8fdfc8993c411fffe72bbd216f5d7a4f17ed569b02c47e83f17a521b0cc162e83567c0e6cc03329f414b376e7dee SHA512 b2924cc701d43fbf74e787b244e9cb6786bb4a165ea105e6615860d17489fc78c48fe3d43f7e4797266af9860307f37bebbd28b95fb403d412f10fe6d8aca5a6
 MISC metadata.xml 244 BLAKE2B f5f1c229ff20b4c9f49e44fc9a759e8f94a79d5605031089006e5c196e877cdb074c10b5374d4087e72e86602a007388e2865ae7323bfb38b122a5fc6cc16caa SHA512 b0e08647af630e02531f47cabd502af365aa5f33e4152ca0944b73e8f627d2d473fd3ee8b0670d792854f4ee9feccb884d7dd9d33b921f881d5754f4e606d14a
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
index 28f8e01bee89..8c9fae89723d 100644
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 86c0f1f3be73..dbcd4826c7c5 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -3,8 +3,8 @@ DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
 DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
-EBUILD mako-1.0.3.ebuild 1421 BLAKE2B 95d75e0d84b3e93fa95ae5116959c12a93f3c359891d4ed5af9ab93a093bf0954ee454522e35e8a622915ef0d52c9b96e13f2201bde4a3395d5160f896903ea2 SHA512 4a4da490d7ccf4458ac51a5027f3c451e815f27cdd83bed664f9210d297c51ba8acba45f23325a0c3eac5eb767ac7950c0c284add00185eb89d213f6724c2e6c
-EBUILD mako-1.0.6.ebuild 1477 BLAKE2B e153eb99dce290859c1be13ca54222cccf5d1a0db7d6b39abce2dfd95426179f5d0baf5a0a0ff239d5a064dc20453fa49f5e1f3b95ea2733d70a04153a025c21 SHA512 67f87c4fc1b87046905e1fc8a07e5f8745673ea3670c755fdf5bdc2ed9ee85acddc086a421d91fe91a8c9552048b14230079b6bf493198a436aec4e55c18cab7
+EBUILD mako-1.0.3.ebuild 1422 BLAKE2B 8a03fed7eaebfa8eabfd4418cd75cbe5f342114d7fe5016d4de31f0fb8feecccade64bf3cadbd990c6e6c8eb4dd20f0afa3dd27f6425937fdb6bdceadca5f38b SHA512 fee3ca9fded2a85d07391d9ee1f9d4e9a9498c43c778e99cbe3950b4088c8af7d1d9004c043a9f674697cf29184fe325420453e6e17c655bc276dcd576d21b2b
+EBUILD mako-1.0.6.ebuild 1478 BLAKE2B 82dc6e6ded16423f03f9304f94fde58b566c224c2c530a0bee696166d80db903cbe1833ea927f35b32114bcd1acd68a61736476626d8d88cfc214bc911c0d921 SHA512 91cb999d3275193c7f37bf21ce0e747e8d9bb877019191b6198464808bcdf842bebce436f1c806aa97a6b759712968f0f6a9121999d483519e6bd67691ac914c
 EBUILD mako-1.0.7.ebuild 1169 BLAKE2B 91e96e598344f4df7f8ba0656ea533250774a9f07b343813a4c780d66cc724ee72c077ab79706bb1a19afd8f359713b78244d2986fe83236d5060f2e99e80906 SHA512 a9b47ca8f19fc33e01e1009aa3afd4281ffb49d8e2a57aa8e48d67523408263ad82d3d0ae148ad7ce159e379b73e08f32707a7947646a8646fd78117a88c89fa
 EBUILD mako-1.1.0.ebuild 1170 BLAKE2B ec353a7ba7008ae87427f3cc290d549dcc3c2afcc124bfa776619fcdb604741b609d5bfa89d37c635dff9412fe265777bf86aca1f53e06ac2fb049bdb4f21f88 SHA512 f9048e1365ef4205a896b128c4afd621e362b37e8f9bd07b1c71bb04eb387d39a61d80971eb106987ebd710060fc1b6e8eb7cfce7b467f5ed365a498d3061680
 MISC metadata.xml 437 BLAKE2B 4dc2a160a2054ffe0bd59638a0170845b22d7eafeb77e94999ff239dac231e9b1a0c06b688da2c4699f73b99ae2c1306332cb0b5e91779da757bc048452c7c22 SHA512 ac01b2c4843ec9ab15f5b20677a003aa34fceeb2f1ad39a76e3782e077824f1d1103c831dd2f911ae5e64bb7530db2e87c2b1e5fde2fb77acf6d1df65f0e0b69
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index ae35fc28324e..8a166b84065f 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -16,7 +16,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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index 628b082b9e1c..8c8cd52434da 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -16,7 +16,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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 3f78531fd03c..ba25c1526ac8 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.8.6.tar.gz 10430 BLAKE2B f3629525cfe882adb040674852ed9e725332ab19525305efd42a0fa0a0a3ab20df7a257299df525149609858792c267219eb3caf761a6f15b7d3b2557d4e98a2 SHA512 f35396bcb607c2eb10caa99f4c82924b0c75c2eeddb3d18ed5db3d5e38dca41917c23f1fcd7003b596576436cea6a02f40c352e6a11f63e472144e0ae0575198
-EBUILD mamba-0.8.6.ebuild 923 BLAKE2B 1992356862ad7f2946897e18cf0a1138b69db157339861e27b9ecc86ff3884abf6f940d55d871dbdc860fc584611dc8786f0ccdc1fa5a339f48ff5e7d9cb7b9a SHA512 d6cfc35bed1547ff9b3b78fb1b21d221a3066f61d2e000ee67e8717b39ec49f542a83f969e6290cddc18779f0f081db03a1f4bfd8238da059a589b5aee5a7f12
+EBUILD mamba-0.8.6.ebuild 917 BLAKE2B 4b5bf4b84de9029719a450d8f0dfcc9014c447caac1f151bed43af529cf4995292ea87211225dfb7a623bca6fc1ab9a0dbba8bd212579e8521e6b48aad199d02 SHA512 7f3af64a4ca0be42d439fa1a575fc921172d83f3de60a26161bc8a2a9ac764e607a530aba7f76e501953354fca0d9ef8b9bbcbdbe91a47eb05d45516dd7a5565
 MISC metadata.xml 299 BLAKE2B 921f7b7d5add4e7decb67da81d15bc1382bb3c51125d99342a9d8229fbf4cb0336ac13623290d0977ee9db821565bde14a1a5d9769dd5e2b89e333efc2a44d54 SHA512 ea6d9b306c3a8691697cea16a1582c8b5a36b54977534e4937feedc34bb62f4006d57227df48e878174aaaee03229d272bd940f23cc5e831cfbe79b05d827f93
diff --git a/dev-python/mamba/mamba-0.8.6.ebuild b/dev-python/mamba/mamba-0.8.6.ebuild
index e12a951613b2..91ab921fc603 100644
--- a/dev-python/mamba/mamba-0.8.6.ebuild
+++ b/dev-python/mamba/mamba-0.8.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index b614cb3e2ea4..656200c0eafb 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.3.2.tar.gz 22393 BLAKE2B bf6a7df4a6e2e8270d0b8fa278cde7d520bf5c9d490dec748927d8f7c024381094f946e5feb4b5334b0d7255df002aeb1b42b8545b7514194425e37f739d2da9 SHA512 57f5041ad175c4eca4c158d9d917dcb1f9c25978c60aa0e76322d0395b0edbc3fb7b062da7b9af871a97bbd46cfe7f81e634287f813baf15ef134be53150bd11
-EBUILD mando-0.3.2.ebuild 944 BLAKE2B 7c32dc0ede0643be1667ae3872d208868dea65eaa9821112f804fdc7a13494cbc23def84f2427348eed67933238755656d0881af051fa3655fe21e0cd4df225d SHA512 c5d8d95ef395ecbcf90c2cfcdfd18892372ff5e44dc4dc79daa7458053e09b25fb90cd448fbd4142c5efcf836b0c278c70ad7955030a6545af44978d7e7e50f3
+EBUILD mando-0.3.2.ebuild 934 BLAKE2B 48e18b3273be1f7e1a7e8e787ead47afdaadb3581de28df0af9e3af8760ae0a56ce4ac8755a0fe623a05cea633e9a944588b62aab6f0fb699be775e453bb9a52 SHA512 a1bd06368f848d4076d3c5b0c96d5cb0ddab6c80942b5ef9c65d7b63ecf57d3d6f514ffd625f0238ca9ae82207127b8658ccf802ea936b0bb1f2729c44ca6d76
 MISC metadata.xml 241 BLAKE2B cbc5b40c8cc94046b0c3f22ff09d1d4808cbb26026213495d792da8c605df005a5670fd55586aee9ec26e66862695768683dce22127e5af344ea529302b4cd31 SHA512 3ac90d64a94a1c32453b3fe9e3fbde47602aa1257f1a15bb08e8d5c1abf779eef08378376ab4910904a672fc66b1b36f781f1ab144eea0be3c1d36f35ea6337c
diff --git a/dev-python/mando/mando-0.3.2.ebuild b/dev-python/mando/mando-0.3.2.ebuild
index 9e7b1e439a9d..6eb96d61546e 100644
--- a/dev-python/mando/mando-0.3.2.ebuild
+++ b/dev-python/mando/mando-0.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 3cbac41a785c..517ef49304bd 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,6 +1,6 @@
 AUX manuel-1.8.0-rm_zope_test.patch 3693 BLAKE2B 444261de258ddc0a24aa2eaf517385712da421c6a8dc322c45e6bc980a87e10c22b6f10285d1d4352ae3542999d53f2bffc71b833d7bd9181b8708b2fde957cd SHA512 47dbc28c5d66895c764997de7a5c04aefd92de6aac6094f8184de849f906e5a1650e2c483868bf5ce77e7d81893f51410a19d7d38f732b4e0a1e54bb728836e9
 DIST manuel-1.8.0.tar.gz 207600 BLAKE2B f7bad36491d49254c7aea17550cbd4fa00b6c3c122061586785da4bddc514f51a2d5a8df3b048fe78c7b01036ca903330ea614c998fdd04d1e8cca002930c962 SHA512 8099df44cfd28c8ac6256f346bf8cd36091893a38d3c297099866b1a5db97286b9c9e69f3f12054d7eee9ae3985ca0a003d7b2cc082d28d59850bbcad6b57c57
 DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a
-EBUILD manuel-1.8.0.ebuild 716 BLAKE2B be6d90e327787adc1a3e29b39154cafbf8af4ac703bc09c14175afdcc6847c614281854f7e0084b8cfb4cfd8ab75f1559f4091912432913b313c5507c8d1b6f8 SHA512 648c70b7f4a11ec8c1f4e03f9c6b53fd58c33dd51be1f39e8c0c74c95fabf93d555dd3b078f3cb0e09a528a0d088cb3bceb66a62af8a155090aaf20204726fff
-EBUILD manuel-1.9.0.ebuild 725 BLAKE2B fa6f9958260ec0301224533f562d3f46348d5f71072ccd0d09516c1fe7a63946255358a78a60fa832f80bbed1cd950abad9978ec6bf0aba1f199bedc66307d62 SHA512 0bae71ca9a4b33106560003cc93766881ef7a3ce78c43109a27d29f89a81abd4b6c7ebc76d97bbad79b75a9f5007fdefc39e652aa55943b4b041ae1946078900
+EBUILD manuel-1.8.0.ebuild 710 BLAKE2B 6841afc5d3df024e17a864e0a0744c9acfcf01597137f7c39a60402dcd01d5bf934c80bf8f829e0bf48b16f9ed1c6027667acf389bf3dc65e616bfb983dcff12 SHA512 6611f617c53d6127fc803da84907413ed98a560e85cc61cb327f6ff95b4b6aca05d6f43808e9d45f163071bbeadc6f1dbdbd9b98361f8778109e9b5780ea5a65
+EBUILD manuel-1.9.0.ebuild 721 BLAKE2B c1d5558c72b82c615765523556af1182baa76f8fa6e1324d86dc9b3ece36abb3db5455b691b54c6ba22044bd3a63c7ad42895055a289486f19d4a69ba984ac09 SHA512 a87a05f29a1937deb2687e5978aa0875b4a2a115b6ba7d82690a2d60882f67aef6d6a8f5ef5412516149c7a834a9f8ac3d15955923c979ee109c6762a305b37b
 MISC metadata.xml 378 BLAKE2B a015eb99ca98c46e7636f0203ad982b5e60687e7a753548f05dba16c968d42ce355e786be237a66180e7d6834cbd1a2c273113604274e4e0c1befd92c35e2668 SHA512 a90d635b0d109936cb39e2b016464e6c6220ff02b6d6f640d30045782ffb85bccc9e408119897947b11d8fa234451820bef9bd1f49264dc72c7b0ebe36f1edac
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
index e4ca4e9630a4..307de66e3b12 100644
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/manuel/manuel-1.9.0.ebuild b/dev-python/manuel/manuel-1.9.0.ebuild
index 888269e9711e..55378235ace1 100644
--- a/dev-python/manuel/manuel-1.9.0.ebuild
+++ b/dev-python/manuel/manuel-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 283da22fd506..e6fce4858af8 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,8 +1,10 @@
 AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
+DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 DIST Markdown-3.0.1.tar.gz 284084 BLAKE2B 6a9250295057ed32b389e1aeecf9aa3acac37ef48e6ca93a4821eb56a2323d65c1aed99799bf05811f27f45ba61f7bb704f69c6d2be706d8d2764c026e937905 SHA512 c648c1b8ecb3c907ff2bd636ec6c08b4b629967fb916913f77db641f6d61b83d16929af2f15f5695c8cdb9614031606110e02a7e0bbb3aab0be38a8e285f12f1
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
-EBUILD markdown-2.6.8.ebuild 1419 BLAKE2B 02d27ff9042b56e48c3976d107ecf17b1aa95e0bf89bea5be51ff84bcc2e657f13d95d10fe16c9f3b10d2d59e259dc6eea8550e05fc50971df893e525a233dd7 SHA512 03f0120e59c1b85d1ce5b6c7aace325db1eebdfb4db7ea0074e831272541c55a266aa1bb776da059b3d2d0c3777011bbc515e8b85b2b628f3f8499dfc7da0c01
+EBUILD markdown-2.6.11.ebuild 1335 BLAKE2B 2783aa9dc9bd53655383087ac8c52be1758253bee4fc36303bd289fb7ac28193ce93b8276f8f7f986eed2178a8024d6f01625eef5f29057dedc226452e8e1bf5 SHA512 bd75988f49caa502d1a47bf622a2ee7d8447619c596ce1e354589867f1228ea392e1a26cad28586d56f8a53a948891767fb11d7f7aba747be277f6e16e08dd99
+EBUILD markdown-2.6.8.ebuild 1420 BLAKE2B 376cf24f824a200aa8233c1efc1d1f129a308a1c7fc14a2c30f8949703f4af9f3163e2b1f646c33a52e5840ff45bfb7df5d79f32b292098c0bc169fd21b7db3a SHA512 2fa22e5608a0d41463b4b499f7d5399712f81c00d9e35c7775a634e2578af7baa28490ef2d1d5669f5112995e86b13016aac8159a7fc0dbac26397d9c768b755
 EBUILD markdown-3.0.1.ebuild 1255 BLAKE2B eed1c97845e9f0e7ec2cbac1b3f4fae6a9bf6b251b89d8a3719f1f21e6d8b95111e0f794be9b3a6e4281c96717777e5c3da5017aacbf9afd0100ea444ef5dc12 SHA512 b3f214ed031041f107501568559f9f7346699d84ec19333aae5414c3da22d8cd344b880c60aa5c0004558ce69cde2865229eb5d3fb1e5708c81d5c09a4e4d640
 EBUILD markdown-3.1.1-r1.ebuild 901 BLAKE2B 411a145d862aac15f9de649406ab8c3b79183535a4d59bf48d1f38ba359828676f410d91cb66e65890d11ecb2d304f498fbd12389754d9421acfcbb192617b5d SHA512 7fed93159f021916b68a6c72ae86fc5575cd21e6b7299f125c407bfd0944bb634feadcf399a4a5b184b01840f3d050829b435afc6e4191f348dd04f43196348f
 EBUILD markdown-3.1.1.ebuild 1119 BLAKE2B 8cfab1504352f5b1a76d36ca2bdb224d3706fab8f22dc2bd792bacbbc9e768e747cf4f7e9b2995a6aadfe429d471be62eb3764d6f7c5264fef818cd9c94a4cc9 SHA512 5e8282772bc67de2bfb5c27dfb8dc1c317b479e3aaf58cd72227fbe3ac59278e326aa8ed091d2f714ffa67c49e56d5cbafd8c29b7cff368abfe25486618b1728
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
new file mode 100644
index 000000000000..371d2feea395
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	https://python-markdown.github.io/
+	https://pypi.org/project/Markdown/
+	https://github.com/Python-Markdown/markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
+~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+	)"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${P^}"
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_docs
+		HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+		# remove .txt files
+		find "${BUILD_DIR}"/docs -name '*.txt' -delete || die
+	fi
+}
+
+python_test() {
+	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}" || die
+	"${EPYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index e2dda6be9feb..ec62f2144dbf 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 50933df9ba92..417b45679707 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,3 +1,3 @@
 DIST markdown2-2.3.0.zip 145194 BLAKE2B ef6e5744b6d9c9c8de20ac2d17ea0fc13453dd6401ab0c8d6d258f6a19aec4e94cfdfef28cbef7ef4b4bf6133a0acb55a1d8a76a41ac621498117c39b1fc1a6e SHA512 48bf8e26b34c48c0c12fc0f110b09d3232ea3394db3325d50639adf5cefb603344ee97b116e09b574f7c7414ab4a8293ddc37ca6706e41baaa14e399fa467d5f
-EBUILD markdown2-2.3.0.ebuild 686 BLAKE2B f1cfa82acac2035411be3f7aef72affb367a9c8793afadf332f2b77c24fca2459e0a1d4214f8bdd40c26fcac536e9daa579161d1fb7acc8ecdca83958a64db8b SHA512 4e1a6b79bc08637ba3602eb09cd8d812671b36910c5264a1ccef7366f6e35880078c9603688cdad5d3828deffe1976a2c4ee17b54e57914336ef16df3a295277
+EBUILD markdown2-2.3.0.ebuild 680 BLAKE2B 0d565e360c7dab5c87783f941ed041f315f744e3a65c47fdba406115750f6a3f645e61725d54c072cb5f7550cfc987e2adf0a07bb1407f56ec7a6698bb1994c5 SHA512 8c13f71fdc407cf8f368fe4cfbbf1742fce4309ab899ca94b3c55b21bcac5758aa40969bb2b0eb93f64eba7e111959bcf2538fbe66896f32660266cdf1f29116
 MISC metadata.xml 641 BLAKE2B f1c0e61b9c9e1229be9dbc2d913af9398d8ed41dc69afa0d46dcbc3c74aa583eedea6e1c8132de436b10b288f76a9657e3c74f7e546d357bba817e38b01606f6 SHA512 ece3faf6646450ac53797ac77c91f7e7a9953dcc419f98738cb8529722d04fa00a9a0e9fbe0958c2119b6e0909fe1ca6eee50749a133e2aec8b2d242071348f7
diff --git a/dev-python/markdown2/markdown2-2.3.0.ebuild b/dev-python/markdown2/markdown2-2.3.0.ebuild
index 96a0f7370cf9..698a4cec1f4a 100644
--- a/dev-python/markdown2/markdown2-2.3.0.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index 3de6cf69675f..9cd30e7ae721 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,7 +1,7 @@
 DIST MarkupSafe-0.23.tar.gz 13416 BLAKE2B f8ce67bab421447b201592bafce6a7ce58a827199ae45c585489165641c82dd3684810381654d3ac1325adaef3499665461d814cabf795eed9ed1dbb04632a52 SHA512 4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
 DIST MarkupSafe-1.0.tar.gz 14356 BLAKE2B d1ceeef939f4d4c31b871d8d1bbd78c72d72ff2e8c7109c9ab2b202e4b8272db25bc13210cfe2f442dbe2073963ec41f5924e4df9dc93a45ebe85fe9f0d9f12b SHA512 7437a02cb1b9c1d6d6c20b13d394f24a1cd1cb8c743f832d8b1cbb6ab8846f70f54d924dd693423b33c4d592e772983ae38fd4a35961e233457c48bd3584ecb8
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-EBUILD markupsafe-0.23.ebuild 892 BLAKE2B 904534d5bbc956c16e52500891ccc4feaa3c04211f7e711e326ef97add62d9f91537f430232907e097abd5567da6b8110340a0c1c11e6d95085bf3b741ff7877 SHA512 3c4c0492b86a02b689c0206ad5697dc7f87335ecbc92964c586350a5b4e39e0de8bd899eff69972d6212bbf4622a66611a58f3e405e2446b815dad6c262cc47e
+EBUILD markupsafe-0.23.ebuild 893 BLAKE2B 00bb68ac2eb2f8bc1448c333bdcfb491f892d9187a1fed40931218787af020ae93824b9bdd04a0442f366b44145dda765d9c81556cfb9d3b662668bfbe8d0cf4 SHA512 ac8ec38aad91cbd1813b2cb6712fd8d61bf4d31e09e8a4b608c352ec23a2ce1f28e2627027baa4c1b4eb2909f1a1c2d23868a7dedb59869cf6808c5fb3b7e9c3
 EBUILD markupsafe-1.0.ebuild 760 BLAKE2B e809a2a2f01b9f4f146bfb0db84a496137cdd72a34e82697e410d28c9325d740b2cae6cb45b30fa0fcde73c1b600c2715943ae6934b06c6ad5ce0c2c6527437f SHA512 6849ae7565b3d4df42953b519ee71bb87bf72ec3dc58753e9734154980686a441ac2be498a3a779777b921b03f7f81e739616fab842808f725d973066e600e7f
 EBUILD markupsafe-1.1.1.ebuild 710 BLAKE2B f1c4bcf55d56f4605d9b10695d14d017df8161947029b17bdafbb488a2cab23d20bd73e869538571f6332696f31d1af6457ffd52c0d9f4fe8fec32bccec9c3d2 SHA512 371b3ede55b9a2d55c7589ac10ab1cc3a15f43895362dbc757b3b3ceba5527add0d5a5398ec77d64671a9f8b267358e7bed1de5ee87570f098b24f3bb3694a97
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index 733c989eff2b..a7aad3b1d71f 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.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 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 63d0c2816cfe..4bcd9bbf6156 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,7 +1,7 @@
 DIST marshmallow-2.20.2.tar.gz 152437 BLAKE2B 0d31537051c45bad52d922439d1cb9d69fc4a4bc2767d6a13bfe32a9edc978cadf9b1c508ae51532f5661291f32ed4b7c5e54f5fcd092eb4ebd7d3045521e9b8 SHA512 05511aafa978377152ea8ea1b70dd5558782bf634df5ae52453bfa65c7ec9270a12cd7a32e11872808a3289cfab2ef0380e129e84878511872e7cc95b0792453
 DIST marshmallow-2.20.5.tar.gz 152733 BLAKE2B ba509624e3715ace53eeb1a835f533172d676b3645ae3226c6da3727dafef7084bde896f3a66459112d599e3e422d600d150934313b813fea9d819658ce3b4bf SHA512 a02b6a3341d2cd08174937112eba2f69a07de59054a088eef64ac12703699e2b6f561ce76ebc0cb43334056f02f3898098bb0d3501ae8a1b6350f9a168eb3355
 DIST marshmallow-3.0.1.tar.gz 168186 BLAKE2B 6c89fed45c144a855c692bee39390e1c80b2977274acb704095e76567e6ed00643704473f95abac7fabb4c1d1d96b90cb9a6fe3a127a09a0d2a4c72c02358baf SHA512 085a7e9b265bb86232222e4decb32fa172d62bca3ba3c5303f12715be1b0ab6553b1978e28db520a6a7a25778915c770ac83c607bdebf5e4d26746cd69f2d555
-EBUILD marshmallow-2.20.2.ebuild 895 BLAKE2B eb1c2758a0615bd52a3c50b13b7a48852082b383d74bbb2040f284ea7d6410bbc213078a1755c02feb8dfe122f8ec3fe5e5090f74e20b0cb76e7f14d0ad0a961 SHA512 48237020c44d787e53cd21ae19bd30642b2e7e7220b2e0b0f32f96c08c6c91eadc7db685cdd2a2ebeb093cbe5243c20d1f26a96eb410e060c5e9b2b3f3da65af
-EBUILD marshmallow-2.20.5.ebuild 895 BLAKE2B eb1c2758a0615bd52a3c50b13b7a48852082b383d74bbb2040f284ea7d6410bbc213078a1755c02feb8dfe122f8ec3fe5e5090f74e20b0cb76e7f14d0ad0a961 SHA512 48237020c44d787e53cd21ae19bd30642b2e7e7220b2e0b0f32f96c08c6c91eadc7db685cdd2a2ebeb093cbe5243c20d1f26a96eb410e060c5e9b2b3f3da65af
+EBUILD marshmallow-2.20.2.ebuild 885 BLAKE2B d37f637b8cad76b9fa88af82ef74b336edb1c1cb41192648c51e93bc70670de9111d6bcf9a1be505c73bb11f66c877e21977236effda159130cab8c25c2ede59 SHA512 9c9fe02e35821c12d64292b3c080a03982faf2fbe3d6db59ad149f9c27f2f5090830d71e893998b061d60eaf4631842cef4ab20c8f0dfdfbac2e62614987dc90
+EBUILD marshmallow-2.20.5.ebuild 885 BLAKE2B d37f637b8cad76b9fa88af82ef74b336edb1c1cb41192648c51e93bc70670de9111d6bcf9a1be505c73bb11f66c877e21977236effda159130cab8c25c2ede59 SHA512 9c9fe02e35821c12d64292b3c080a03982faf2fbe3d6db59ad149f9c27f2f5090830d71e893998b061d60eaf4631842cef4ab20c8f0dfdfbac2e62614987dc90
 EBUILD marshmallow-3.0.1.ebuild 811 BLAKE2B ce18096d54522a444509ee6c3297545abad50c1267b84b7edc4588029edbc491d2b42185c8bf73c3daa019679ea4e14b81ffd4547a704361ee11b2553e02a1fd SHA512 22be298964d6bf17f48ac236676418db97c40d6a1725089c155857dbaa6b55e413167ddfb80d06c852d5f10f14fbaa374d166b3aa8e60d43eb131c8c3dd9f044
 MISC metadata.xml 360 BLAKE2B ed1f62630b417aaefbfc1ce52c275f16187a1fac9ee46e7172c4b703452329b64de253eed111bde2e7bcb4b85e7806d8423fd5d80899f93b23e7c3da61030a2d SHA512 51665fe5adb03e70bb1582f393b95783c9e4956c24f664c09d08017663bc8373b07080c142f714fd4c93381cbd5c55bec2b58ca412df6aa55980f9a61abebc54
diff --git a/dev-python/marshmallow/marshmallow-2.20.2.ebuild b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
index d1a97915e2c2..55c90417ff2a 100644
--- a/dev-python/marshmallow/marshmallow-2.20.2.ebuild
+++ b/dev-python/marshmallow/marshmallow-2.20.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/marshmallow-2.20.5.ebuild b/dev-python/marshmallow/marshmallow-2.20.5.ebuild
index d1a97915e2c2..55c90417ff2a 100644
--- a/dev-python/marshmallow/marshmallow-2.20.5.ebuild
+++ b/dev-python/marshmallow/marshmallow-2.20.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
new file mode 100644
index 000000000000..d2d3dac9d296
--- /dev/null
+++ b/dev-python/matplotlib-python2/Manifest
@@ -0,0 +1,5 @@
+AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
+AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
+DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
+EBUILD matplotlib-python2-2.2.4.ebuild 5197 BLAKE2B 83b11730eb8b96d3b63a926eb600cf2502b90d24f0eb8c2a67e653a92e3a8295ea8c2e13ebf2306936ad6b519770a301c7b1f3f9289bb984071dbfc254d98a71 SHA512 f1c94c3f81ef2de5beb0478c56f74b4f92ff4a8c190e82361d1e63c23977273665799cc8056d7988f659353249633ace874d7662199326005b0fc072739e15a4
+MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch
new file mode 100644
index 000000000000..b6a01b097a61
--- /dev/null
+++ b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-doc-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index 017ce210e..5a397082b 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -170,10 +170,10 @@ source_encoding = "utf-8"
+ master_doc = 'contents'
+ 
+ # General substitutions.
+-from matplotlib.compat.subprocess import check_output
+-SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
++#from matplotlib.compat.subprocess import check_output
++#SHA = check_output(['git', 'describe', '--dirty']).decode('utf-8').strip()
+ 
+-html_context = {'sha': SHA}
++#html_context = {'sha': SHA}
+ 
+ project = 'Matplotlib'
+ copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
diff --git a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch
new file mode 100644
index 000000000000..9d13adb8ab53
--- /dev/null
+++ b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 41037e95d..6a438fa99 100644
+--- a/setup.py
++++ b/setup.py
+@@ -178,9 +178,10 @@ class sdist_with_jquery(_orgin_sdist):
+ class install_lib_with_jquery(InstallLibCommand):
+     def run(self):
+         InstallLibCommand.run(self)
+-        _download_jquery_to(
+-            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
+-
++        # Avoid downloading jquery ui during emerge: we already have it in
++        # pypi's tarball. use this!
++        name = "matplotlib/backends/web_backend/jquery-ui-1.12.1"
++        os.rename(os.path.join('lib', name), os.path.join(self.install_dir, name))
+ 
+ class develop_with_jquery(DevelopCommand):
+     def run(self):
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.4.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.4.ebuild
new file mode 100644
index 000000000000..3f9831ca74f1
--- /dev/null
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.4.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+MY_PN=${PN/-python2}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Pure python plotting library with matlab like syntax (py2 version)"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+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 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo excel gtk2 gtk3 latex qt5 test tk wxwidgets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+COMMON_DEPEND="
+	dev-python/functools32[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PYTHON_USEDEP}]
+	dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
+	dev-python/cycler[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/numpy-python2-1.7.1[${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
+	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PYTHON_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/matplotlib-3
+	>=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
+	)
+	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}"/${MY_PN}-2.2.4-doc-fix.patch
+		"${FILESDIR}"/${MY_PN}-2.2.4-no-jqueryui-download.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
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(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
+
+	cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+		$(use_setup gtk2 gtk)
+		$(use_setup wxwidgets wx)
+	EOF
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+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() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib-python2/metadata.xml b/dev-python/matplotlib-python2/metadata.xml
new file mode 100644
index 000000000000..d238bedf5ab2
--- /dev/null
+++ b/dev-python/matplotlib-python2/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	matplotlib is an interactive library for plotting and doing basic
+	data analysis in python with a syntax similar to matlab. It provides a
+	variety of backends and hard copy formats for almost ready
+	publication plots.
+	</longdescription>
+	<use>
+		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
+		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
+		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">matplotlib</remote-id>
+		<remote-id type="sourceforge">matplotlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7ec8aa84ad45..749364a88d13 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,8 +1,12 @@
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
 AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
+AUX matplotlib-3.1.2-no-jqueryui-download.patch 544 BLAKE2B aa5e55ec734f3847579864d2d9133da9b4d483ce91b9418dd275ced1f7367e7ceee728f0f4a271743e50b554980005871982bfabd523d8b20d0bdb0f2966d3f8 SHA512 a5900df8735bc6956ce9ea79334d4eb22f8029b9c025e81ead16d41fb061fb94dfcd8d2e773b70bbb8912469b18e18ec194f5bfce0ec668a5be423f1b9de0d7b
+AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139
+DIST matplotlib-3.1.2.tar.gz 40909582 BLAKE2B 670907670335ca13ec01f3acf036fd502ce34abd12666b2e0d10867c6115a0fe80039326cee89099471aa6b3bbd25f1ca4aa837072dea624ee41984da9f647be SHA512 2eff3c0525d01824ed758a87f50a3f6094767b580fca1eae4e9dbc2cc972af3d0cc3ac9615e576c5685e8bfc1ec90754bc826635f4f2a919d0b26bbb686cccab
 EBUILD matplotlib-2.2.2-r1.ebuild 6370 BLAKE2B fab5c042e14172c077f62ed4ae9a44800e2d779fd8119a4bc16d343b6702976b8e3e94f9f5b2884e11cd0cf7cafe37cb11418c5c97e5c9be4b1c4e581b5b7972 SHA512 3a618bb2718901cdd4be90679fa248d20e595b32d631f414e3c63c35ff98c58897d0167a0fb11c150808fe44f6cd5641c7bfceb933ad4c09c2d92984fb7e8d28
 EBUILD matplotlib-2.2.4.ebuild 6444 BLAKE2B 5cd558b7df2f7972c37129967a0ed65a084b950be6b4859167c9bf2e23ea28963d441ec6144540c2635782282bd8036d3605a15134894b06b5b7e3424052834e SHA512 f9edb7250a6fb868a24609f107a07ecd8f2f27a8cb5637229dc5fe9e716b5fa6d9b33ae01e01877f31cd8d58251f7af893119fd2ab02be8aec5930d272309d20
+EBUILD matplotlib-3.1.2.ebuild 5828 BLAKE2B 0ab5bcb5ca71e16ef0df465f2028d384e35980a04d01e74f073e149d49170e0a0039e9767a5d5cb1d53c1d0e8428e4212957248427518ae86c8be4dfc013f447 SHA512 6a8a36c474ed647331fba9210d4520d7eac006ca456a75e576fec80272f6fec71634edf4f02c6a7f2508a6e61219e72e7f14cc0582bd4731e42b8e91c8136612
 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch
new file mode 100644
index 000000000000..145f321039b9
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.1.2-no-jqueryui-download.patch
@@ -0,0 +1,15 @@
+Index: matplotlib-3.1.2/setup.py
+===================================================================
+--- matplotlib-3.1.2.orig/setup.py
++++ matplotlib-3.1.2/setup.py
+@@ -125,7 +125,9 @@ cmdclass['build_ext'] = BuildExtraLibrar
+ 
+ 
+ def _download_jquery_to(dest):
+-    if os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
++    # Avoid downloading jquery ui during emerge: we already have it in
++    # pypi's tarball. use this!
++    if True:
+         return
+ 
+     # If we are installing from an sdist, use the already downloaded jquery-ui
diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch
new file mode 100644
index 000000000000..e02e03e65edb
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch
@@ -0,0 +1,20 @@
+Index: matplotlib-3.1.2/setupext.py
+===================================================================
+--- matplotlib-3.1.2.orig/setupext.py
++++ matplotlib-3.1.2/setupext.py
+@@ -839,14 +839,7 @@ class Qhull(SetupPackage):
+     name = "qhull"
+ 
+     def add_flags(self, ext):
+-        # Qhull doesn't distribute pkg-config info, so we have no way of
+-        # knowing whether a system install is recent enough.  Thus, always use
+-        # the vendored version.
+-        ext.include_dirs.insert(0, 'extern')
+-        ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
+-        if sysconfig.get_config_var('LIBM') == '-lm':
+-            ext.libraries.extend('m')
+-
++        ext.libraries.extend(['qhull'])
+ 
+ class TTConv(SetupPackage):
+     name = "ttconv"
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
new file mode 100644
index 000000000000..db457aa8b799
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+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="mirror://pypi/${PN:0:1}/${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 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	test? (
+		cairo latex qt5 tk wxwidgets gtk3
+		)"
+
+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
+	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	wxwidgets? ( dev-python/wxpython:*[${PYTHON_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_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/numpydoc-0.8[${PYTHON_USEDEP}]
+		<dev-python/numpydoc-0.9
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1[${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}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${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
+	)
+	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}"/${PN}-3.1.2-no-jqueryui-download.patch
+		"${FILESDIR}"/${PN}-3.1.2-qhull.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || 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 || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(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 MAKEOPTS=-j1
+	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 \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	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/mccabe/Manifest b/dev-python/mccabe/Manifest
index 097231c32d31..d5b16a009b26 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,6 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B f8aacf5e1a03296460969fc561e53a0c9bf9c9eb19a82bda3896ba2caa732b1591db065fe4c4f44f6c5ec53337366eb7c1dc95a6e5f79f334d994aa55ead64a4 SHA512 98efe4f155722c8b42de40d0716c6409708f7678c65d056cf0f7a06c0eeb03e9bf2b047aba3886ed14b7ed292e66581d52d6624fdc034e0d863c147f2d590267
-EBUILD mccabe-0.6.1-r1.ebuild 780 BLAKE2B d3d569131b8328d66978b051c7ca693c175e4346a7ba38fe0f3d7fc6f51ee0900c29a77a8e5e4aa2f2907fbcb2028a17777b18c7279b639ae91f08835746e8ac SHA512 c52c1ef1411d61727d2912edbd4dbc4475bdd58744afe95f0d4f31381ac1fc0b4451204356e95386f86fbf6da5e0e13a42e8f682bfbd87b4dc5be3bf1aaa6aa7
-EBUILD mccabe-0.6.1.ebuild 895 BLAKE2B 1be1bef24dc9c1a95cc75a6cd6c58f7c59538cd2bddb082784e73ee87086d62b4b14343cded8650efef4c10756ce0c60b0ecec8a1e9d2245b24a568a9083c140 SHA512 92e89b96575daa51b872cbbbb8b208ebeae88eb36a1fc3c2b21d9a5ef5a6f80f4390e4efad4d8013287b7a807a7660e7b7677f5e29dc4c4f21285db0fcc34b6c
+EBUILD mccabe-0.2.1.ebuild 554 BLAKE2B 4942fe0213628484c4a64472eea68011b852b2d5bc28d538944027b79b2ef6f6f5151c8582460d3dfef26b76409634490cbe9c045052f76763b28c3563695d0a SHA512 a3facdfb706808c816d6779d4025cb4d5f2b716dc77f1be9ee76f2f447c32c569debf46c440760b95476f0ad6b778900f44da114ccb67a7bb6640475f404843e
+EBUILD mccabe-0.6.1-r1.ebuild 775 BLAKE2B d33e1be8ab3be4a6914d57ec3b54925ea554f02f691eeac5cf85c1c485ed04e957f120b4eb3317c92ce1ef137f01bff942a999c5f4eb8d6c67365aa14cb108ef SHA512 ce5b281ec0cbe7b1315e08f5595badc19ef9f8e9ac97e3bd7845f0a29b635775cadfdd0b238cedf4be733c84d6ca27ae9c1c088b5bd704faf25ac51d0f681d29
+EBUILD mccabe-0.6.1.ebuild 896 BLAKE2B b367b3def7da4536ac8729b49a8dfa4eed1ac75b4724032fa0e6f865aaf8f4f6fb7fead7bdbb38bd08752a95f139c82c431dd62a40194a8743ed0250e80babbe SHA512 0d827467c6362413ff845d62a7023447f16f6107374d639394340137e71f30df30fbb67bc6664916d5c08ec079156422251fef97fd703e89c512bbc57560baaa
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index 31b75349c164..ab34e980fc9f 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A plugin for flake8"
 HOMEPAGE="https://github.com/flintwork/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index f43eb98d69ce..6edfca15b539 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index baa33a53602e..7e24f6298219 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
index ea05b648b6f7..d97da67b60af 100644
--- a/dev-python/medusa/Manifest
+++ b/dev-python/medusa/Manifest
@@ -1,3 +1,3 @@
 DIST medusa-0.5.4.tar.gz 107744 BLAKE2B 13050a97887d6dac4ddf561b109880fae9eb4f2e1462ed92a4963724580821190d94c3d9086dcf2b4656551d9f6e1f9d6d3dd6d501923cb25ff1f68257f6a985 SHA512 9b28c13f633c87586b88388719afdc6c8f32cb0e25583e8c03f5bb0a0ef7c75a4fbad23f5b296bf84c8fa50d7d811fa62305f3fbe64d3764aa5d28228a31a43f
-EBUILD medusa-0.5.4-r1.ebuild 731 BLAKE2B 2a128aea8fbe255ff5e5d7a968ecb96dd7cce57fe713dc9adcf6b8c339a485398ee48d7539849e0c8fefa0f677caa372702a6af86d49d823647b85c4b4e90250 SHA512 6eb3b552b8f659812e7812f69da0faf4817ffdd7daa57595007f8af31897eafc68e7c834917b0c86e1704ebd62d379d72d9db629ced41664a37707ceacaa9696
+EBUILD medusa-0.5.4-r1.ebuild 732 BLAKE2B ef9cec728d8144c846cbd2aaf45a3afbaf030cbb310602d0690fb09a8b6c289f4c6d37d7a67d44a86c758f24c8f0f130fdb5c7bbaedc08ab66131ad9125a35d1 SHA512 696f1e538d8872088edac14387e1e7c4cc951b019d9cc01fc541d75c48ee2c4baa467557ebbfe4cfa5e3f95ab56dba1ab15fceb92fd7eee0ec49dc3670aa7ef1
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index bbc62829e662..e57fa512fe1c 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 python_install_all() {
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 99247e9e82cd..b7419d34d30c 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,7 +1,7 @@
 DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
 DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
 DIST memory_profiler-0.55.0.tar.gz 40951 BLAKE2B ed6eefa0a522eaddfd0ebf3b118a57b7bcf6c7455057d1a9e891e826ba2b32a671fd86357d073f45c36ae5db418987a55e90a908cbb4aba3b3f972ba4580f9f6 SHA512 9f280af163b124809d0276b2a473f66d9f11071f38afbabf7247d4e49f120c137f69dde2cc3fb27fcc88cfc6dc71355ba01efeb102098c401c7e953462ed4a1b
-EBUILD memory_profiler-0.47.ebuild 1253 BLAKE2B f1f97af5b6476958f856130e1457c2973daea99497e9b95b7b52711bedf13132bd0eca2079ac1ec457f900abe946dbebcaa4335006c8ff548519626a9b1f5b96 SHA512 0f3306cf52c3f2a5f1dc7e895592449c4da58cf45680baf2b1375f14b29501b5a6bde3916b51c5ab18a1f146e94d0c679105953af7541369ecb748ec6c22174a
-EBUILD memory_profiler-0.54.0.ebuild 1312 BLAKE2B cef98532fcb0606acd9d9fcbf8e54c86d443849f225f44534f8f5b7d81e2da318448a54f4b6b932b59e0daa25961912bb4dddb65ccc8f193a084725fec75074e SHA512 fccba94402f3ab93bddd46c3e71822f69cd6f41c17a241189d565979a0f12994bec6527d27c51296c308547e0e9a5719e6cbd1a03ba1cac316046fc3db0a2845
-EBUILD memory_profiler-0.55.0.ebuild 1312 BLAKE2B 291fb9408811fab3194de4dfc34059819a12b71d80bb83848f4be85acb762351936983e518ce7ccfab3a2c69460f651d73c05c1bcc82094d704ba7f4013d5210 SHA512 42912da95211b7124aa0aad687b8109f96c718714977f0b12e1763df2ce77e3c35e6a5c5fa97fffb3dfe539abb6fa1605f0993ee9bf1048a76136c909e624e67
+EBUILD memory_profiler-0.47.ebuild 1243 BLAKE2B c0e0ad9c522262b5d49e8421771a3be14a8877ee61f8bdc2fd82bd5931899aeb670934b3f1eac5faf83b178fb0f9da5bec1e6ac898c999db722ef6bd5cb4d101 SHA512 e8ab85291b40734145b9081f1d394783fec2956044228dbdb44be50c0b5c275c9f13f41a9da9bfabf19184f8bcb62e4d5cc15cfd1c9d863e59659ea7f4c948e1
+EBUILD memory_profiler-0.54.0.ebuild 1302 BLAKE2B 21e7df661c397cd32bd7861326eb85a1766e5febb4943ea3a449cedfee8190a15872b97f3b241215c4d007875c654fcd63a7db7f00fa90317cc94ef9b6945af2 SHA512 1ec8aa512aa94cc5bb6c8025e05a0232a63c91cc8a6c137ac850f7b09c518e5477c5567c21b75a05bcb6ac3d1abf241a5b5596319088a192aba95cf28bc6f20a
+EBUILD memory_profiler-0.55.0.ebuild 1302 BLAKE2B d940f47311af059eec481dd6cc8755443ea7b2f457d9e0cb3dbcb46b3dc537fc1f7d9aba9cfba33a61f1ba073b4f6fdabee6632f9818b425b622c1dcc3d33174 SHA512 c2b81ee9ecb2dffa4dd490a147b4ac4206df218a8e1feede7c12cf8a39a3a0e99f1e4dc4fa016d7e3efac1a17cb6721e1bf32b82998727b1cb8e6d5c20eedc66
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.47.ebuild b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
index 72ac15e0bbed..cc19e0084e9d 100644
--- a/dev-python/memory_profiler/memory_profiler-0.47.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
index 71614a755324..189afea74eab 100644
--- a/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.54.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild b/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
index e946d9d3fa03..d4751b2ed0f9 100644
--- a/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.55.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index ab50b3683a3b..25d4b481f87f 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,5 +1,9 @@
 AUX mergedict-0.2.0-py34.patch 1553 BLAKE2B 4528010ef6dbce8210576aa76fdf011b87b3484a8fc6b4432f5760ba8afcc4827a2283f139f46920b99132cb93a8c740cab317a94d53ad0598b1c29ee6d33de5 SHA512 034d2f185257c6f4387c50940385a191a7f7822946394eed6ca02e677a6525f296133947992d06c8e9933ee12ca9e8b51af68457c0b4d6cd883fb1c2df18f6aa
 DIST mergedict-0.2.0.tar.gz 3554 BLAKE2B 3dab9dbbae8cd592b9eeae2e7383bdf2b536139027cc791a48e47a9a2894c3a385b9a993ab34563d4f75ebedef57eb39c1ebbed60a5eada20f5e3c14ade44ecc SHA512 5d867944865881731a854526ad17c178be44854e040ba47ccf493ba1e8bd627346da07fd55c066a5497d806c5537c8627c8e903883e35ac86a05661fd3248f3a
-EBUILD mergedict-0.2.0-r1.ebuild 501 BLAKE2B 53e401d5af89339703f39713cc396b177aad487d59aec1a7d2a57b08b44990642a886202532db55fd077c48c1f6047652d09463ab0f0b24320790c4f6645f0c6 SHA512 180d12643c7190882b09d28c2a8ed017b332135acffc7663fdf3beb124d187a08b72b94c19d82aca8683b414fe7426518c345b73b5797d6b43cbfc49f7e0631d
-EBUILD mergedict-0.2.0.ebuild 489 BLAKE2B af6e57b7ef0647a4e81472e9c61de030c3c793721f376bc402a99c57a9be1724a6e5060d634007b1a5c9bd05ec05abbb1a3721ab72ed792bf30cadf9c0d4a50c SHA512 663a7e6e2d015278bb0b6bdbe23d5c3008ce390d91e62fe80d5913b16cc0ae33d9398b92f4695ec13c7f563cb67898eb9a3b7c6f525ced64c4a514f18464d1ff
+DIST mergedict-0.3.0.tar.gz 5286 BLAKE2B 9a0d08da1d3a0eb85d0e98df88f246b4ee7a54a748e81dfe72a3adb15649c90cc623e39f475cd481e3fc613e29506d3ded7df1aa3761433642c8f48ec636cabe SHA512 7608f2d156fda8050672542b2704b5feeee266fb9e6052102d6250d7e5745cb9ba32e17528e0fd7d959e27a6c29e845796029ce6bd7e6e869b1ecd462b70a9ca
+DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
+EBUILD mergedict-0.2.0-r1.ebuild 495 BLAKE2B 77bd0f7b6e1b2dfec9736d11555d741cd8aff315cedf492f5ce9ee853f3c86915b5b327877446717fd05a1883e0ddd7c91d19c8bafbbdfdc81f321bce3d40394 SHA512 47c24152e014fc9ca5f6ceb96d0f9c11bb48bcbc72d96c14d519400c23e411f3e475c0291a2cc16904e8b7f400bc5e2557a47af8c3b0feea814b0cf4a783009a
+EBUILD mergedict-0.2.0.ebuild 483 BLAKE2B 4b6ab86c0aee4135366faa52de9f11c5c92b7371c36a2f9d2f95b287b0fff86b15f0ddab8b9ac7a576dde5f92b9079f3ba28edc6fcaa69fb6ad39884265a931c SHA512 3f9f4f233999ec26795033bd1665a000d4b907d79c745d812ec389f3071b68033b8175099b4d8ebf9aba6eff3f5ceb6f362d1b84523495140e0ae4ff601e07c0
+EBUILD mergedict-0.3.0.ebuild 482 BLAKE2B 2b1e99c3ba7189914de4b95430385062fe63fd71e37715b97fee6eaf20e7fc22bbc84e63b852b90259c4c85f6af19a5f3f5e7e40a2b199f6f08c0959e69e273a SHA512 6ba2a3cab68a61da6e92b8dfcfe19146715b9d50a27fde27ca3d46e049e4af9bb4925be9e906dbe3f034f42e138a5be5bbfbcd519e505222ba0b021fa0fbc4c1
+EBUILD mergedict-1.0.0.ebuild 435 BLAKE2B 4dd060cd409ac908cf702a7540974b055cb39b0e1c8954636587fb309d35e1cadb9ef8647b562379f533b3b7eed667de2c20b13305236bcbb4d6cf685bbd13d2 SHA512 46429b8ff8ffc6ca442d34267fd3a2f4509646981b6332ba5537c3eea578f2c3f11c3417c824ba204493a8aa046cc90b67c3b3d80ba8639c0eb8c5165ae57ebb
 MISC metadata.xml 375 BLAKE2B 4a8004375ba9a901afcdd9573fe5e76b481f1831c9556f888792d1e993b2450e4ac6353d2dbd03dc129f46ca55bbaa1563ac3c7de033d23ad7dfc833bee26de7 SHA512 544ef98dfb5099a4cb1eb42b0be0692a02d7e965b4f1ded19fb87acd1b9f1dcbfe605c1a73710dd3daa2a53949d58a7e3b5dd45e7e5a6eace0349446220a8b9e
diff --git a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild b/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
index 25b8d266ce93..cd0924beaadd 100644
--- a/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
+++ b/dev-python/mergedict/mergedict-0.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/mergedict-0.2.0.ebuild b/dev-python/mergedict/mergedict-0.2.0.ebuild
index 61195fac063e..437c55402666 100644
--- a/dev-python/mergedict/mergedict-0.2.0.ebuild
+++ b/dev-python/mergedict/mergedict-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/mergedict-0.3.0.ebuild b/dev-python/mergedict/mergedict-0.3.0.ebuild
new file mode 100644
index 000000000000..7f18076b3228
--- /dev/null
+++ b/dev-python/mergedict/mergedict-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 'dict' with a merge() method"
+HOMEPAGE="https://github.com/schettino72/mergedict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/python-singledispatch[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mergedict/mergedict-1.0.0.ebuild b/dev-python/mergedict/mergedict-1.0.0.ebuild
new file mode 100644
index 000000000000..60436652d3db
--- /dev/null
+++ b/dev-python/mergedict/mergedict-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 'dict' with a merge() method"
+HOMEPAGE="https://github.com/schettino72/mergedict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/meteor-ejson/Manifest b/dev-python/meteor-ejson/Manifest
index e19dafa729c2..c6424af78452 100644
--- a/dev-python/meteor-ejson/Manifest
+++ b/dev-python/meteor-ejson/Manifest
@@ -1,3 +1,3 @@
 DIST meteor-ejson-1.1.0.tar.gz 2292 BLAKE2B af832f42d53c27e3b9168c1f97bf807d6ba9967acdf41ec3ec32a77dae948c4befdcfac3a85f18a38b2c9efab6ff3a4b346931d48b30bec84b935be740764f1d SHA512 eb211d262f0006f3229296b71320f68b59d8a7e618e65baa8e613f874a0e6ac9cfe45e30fc73ba57c42129204c5f27a32c4b8b579527fcefd601fa1dc2844da3
-EBUILD meteor-ejson-1.1.0.ebuild 635 BLAKE2B 18159234f77e6525e678243c0497f114694c0313968457f70f54c630378ed391bef89a9003f67f2ff2240116cfb848a299822ee7cd0aaf0c38345a2ab04002fc SHA512 43db559f7777e146b73e56748e77841f9a3cbedb07338072bd04c4f2f5838c6d8853b841e319fe927842341baaa7890ff7e1d12185ebfb1f8c17f5a4b013a96e
+EBUILD meteor-ejson-1.1.0.ebuild 629 BLAKE2B 134818b6b81017186be18ebd6e127956dac9a3dbcacd08e675df443e89ac689e721434816913664181c331c251d63e8efc3e8212cd8a3cf30906c40f7b8b31a9 SHA512 3af3369891363e8f7034edc153e52a4c4f4270df4f2e13a9fa66762a60d3d56358c46f1cf4888578398e059760641a732b3aa919fbb024e97155f17bf5b5baf3
 MISC metadata.xml 592 BLAKE2B 21de6f8fed82161290a6541ede36e22155d0b12df84c8d9cee1018a2477fe86bc2335dfe5694ccbdc2cfdd7f2b3f6ae37b4f5ff53f624184ec5493a07d3585ad SHA512 9244b588bb294281d3542c6b868359369ee2ea1aabaa1765c2b768b8add49213bd705075082168ebec080619ca481650f7546fe6e1c9ffa68f08e2aef66cc936
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
index 42105f374937..1e76e45d614e 100644
--- a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index dabbd49a43eb..f9f39fb7de73 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,4 +1,4 @@
 AUX micawber-0.3.2-remove-examples-from-setup.py.patch 652 BLAKE2B b7551df8c1bdc16cbb10b54e071b965a273d4b51192cdf17f50d516580a6b52065d10b46274c1e3a90a063d87fe204111ab65eac2c4a937a9e59728ae9381d9c SHA512 225bfd7c7306170c7c6d0b564c84092b015ac078ac597764c0029613209851e157ae5bfa2e910a5368f540e68c5a01aa44df78511dba753c6d875b8eb144cda5
 DIST micawber-0.3.3.tar.gz 32200 BLAKE2B 570c6e59cc73a7ddd878c6c03cba1600159a44cf1b1ce6a2e8d2311e5747352143cc7831a868cd27f68b36d67923860ec3a8c7f36a7a63aeb2c51d08f1fb2c02 SHA512 15f5e3f85e6d3bf44e6a4a3ae975872acb2e9093e15b56a5a3b24573332c811955c84f0ee69d327334b22fa61b29a51ce14657fc7bf2f486268145965c159bc0
-EBUILD micawber-0.3.3.ebuild 652 BLAKE2B 6895afefe7d878ef6707d00b928d5a4796682a78c2da3b6be175435ace37aed9a1bf8bdf940f313d03515004d2bcabd0e295d6386113e81f23874d490edb630b SHA512 9fb2a1f7ec65364ae52bef1ca94c72209dd0f1a0567a6879ac911b1f8e6317b3a58cc5cd65dec2260344ce3e543dcf509718237ec79a2a66405ca6b95ebfadfd
+EBUILD micawber-0.3.3.ebuild 646 BLAKE2B c2c424984842dbdf9494d7c1a54c7f0f1efde63b52baf393572fa497b0bad61809523368245d3f1ab05877ae28fd824607ba71a61789f74e9cbdc33d0937513b SHA512 baff578a69b0498eb5f0aa403999e244a88dd334465296aad57227bf5a41c44d0b79aea9ee2ee7a424002b1d42ebbff37ab43410d74770483746a7485e189df9
 MISC metadata.xml 332 BLAKE2B 1d2fa19b717b98bac1f2ad6fd261ce54360b6185671a3d1a51bc72080a6708196c0abcb5d5226dc0e4c693258caf85476a53d4b19d452b847e67a88adfed275c SHA512 9815d1b8eec3bf22a430737bc5a7dfc9e576f0f5ca79ca318a419dd911af378f94b63a6d457cba32bbf4e4939cea3690bad4e6be918ed79324f06f7eef42aaa0
diff --git a/dev-python/micawber/micawber-0.3.3.ebuild b/dev-python/micawber/micawber-0.3.3.ebuild
index c4c6f95a0112..e49d553ef81b 100644
--- a/dev-python/micawber/micawber-0.3.3.ebuild
+++ b/dev-python/micawber/micawber-0.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A small library for extracting rich content from urls"
diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest
index d4deb649184f..388ab901d34f 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 1083 BLAKE2B 61fa9c78236cfb99fcfb2dd71ae1e120dbd25688af02feec6f97b05ce172c2c69a16ff8d8e2e94f9a553c4ac8885b8307cfe9e2ef982f66c8b60eb656a9c235a SHA512 fde56a32cc4b2f614670220fe4f885814d139cbd7b85a6bee231a7946454a300fa4c955fedcb3e6125d1317d9ca7b257a8107df502a5c79bb62208929ef17cd1
-EBUILD mimeparse-1.6.0.ebuild 1122 BLAKE2B 2caa9956bca727a3cab87fe8fb4cb98acaa68cf7e1daffb87411da0c05ea846927a3675c8db51d1f86b77ac0f8ecbff82c841d9f584ed9eda76f467bb40a62a1 SHA512 dae44ea58e5b08e1a00e5934d75f247c5333431c116d445a25fc13b3c161bed4c2616f3d4922a41b0d7813c95d552382f3599c13386099f57b0008a927ed9f1a
+EBUILD mimeparse-0.1.4-r1.ebuild 1084 BLAKE2B c06f9397c745f97d63627fe2db4679626df52bef7277b0df0eeb6d17ad4675f1c4dc620cfc75c5cc2db6c5b8d0d4b61dc685fc1cbe1ac8211df49948c5287e34 SHA512 d9241f2d9fbc183b01e6318611f5d4313a9c822ee66bf4c9b5cbeca7f7a08b60ff4c994db2c05b0bf55af4457af5ed183bb586543d65ce18167a62a658c0dff0
+EBUILD mimeparse-1.6.0.ebuild 1123 BLAKE2B 4480029c2e71b71efbdede7928985fb25fda67ee9efd805d7b47e061f8bed35af0292f4ec550e5a8f1cba1b86b3f31a45bc5a0eafc3898311cfecd99d0d1e4a8 SHA512 d11b93fc7a31c98abdafdfdfc6d1c785d8b5638b0af86a58bcf76a18c569fbed49be4d0a7052008f343ac43641b6e02147cbb425cc3d64fcd832113c934a6aca
 MISC metadata.xml 394 BLAKE2B 076eba4e701e0c6274b4e3e3510faadb92c02d2ef35ccdee6626a3e4e5b46c91c912feb325e4b3abf33a19d5e6937ff4d6b2aa4c1209c682ca4badd59f35b478 SHA512 900355ef3cc835ae4e0766614eaabcbe701570fc54e1b00cfb55eeeafb0b65df35e24ab272eef54bbaa7aa0540cf89931a9bf58f5b515fdd6c88d303fec4518f
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index 118687fa316b..85b5099b3d8e 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -15,7 +15,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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mimeparse/mimeparse-1.6.0.ebuild b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
index 8b4e0d73c62f..7cc7ed541f77 100644
--- a/dev-python/mimeparse/mimeparse-1.6.0.ebuild
+++ b/dev-python/mimeparse/mimeparse-1.6.0.ebuild
@@ -16,7 +16,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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mini-amf/Manifest b/dev-python/mini-amf/Manifest
index 828709f8ece3..5d6055699356 100644
--- a/dev-python/mini-amf/Manifest
+++ b/dev-python/mini-amf/Manifest
@@ -1,3 +1,3 @@
 DIST mini-amf-0.9.1.tar.gz 117016 BLAKE2B 22133a2a6f44ea8d485874924e6175383dfc9301d9bba193e4d9d2fd901671c64be3665617c02223dbd2075141071deed142e804a77816ae11ac4d00e72a870c SHA512 8487baa551a68f7882aedaa8b809089bf2e767b0055f292dab4074d48ed442cabc250297ded91daa2f2a1dcb950ddab5ddff60466ec84ab739a240b8e2665be0
-EBUILD mini-amf-0.9.1.ebuild 780 BLAKE2B 71f161d78e03ba49a455f3baf8bce10ad8b694472672badb01192a1080381b666668dff195dc23fdcd9b22fbd87cbe530e870a816f8458fa60d91ab86ae21053 SHA512 70604f36b5ff0e64347ffb44011c3467721c0dde9b3aa4262e9d9988b664ddda157b349d1e854547448f4e5b9a42050e4f6bcf95168e29bf4589079fe545e379
+EBUILD mini-amf-0.9.1.ebuild 770 BLAKE2B ed68e62a347740b21e8ee4add65e28db5bc77c10d54b99f2a1ef6b8ea49f5eee16f937e4d911347a2553f523ddd5b63debe4d8ea03603fa8d6f21d75298bd2f7 SHA512 b732af1cd7c74326c830c684d3a4726e4827a6a1d202f908ecd88d3316253e7a47b403ec910858682f4f3ba70f28aca4a54fdf78d95486a6da77d85dde312c80
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/mini-amf/mini-amf-0.9.1.ebuild b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
index 8822219afbf9..5bd4f884b383 100644
--- a/dev-python/mini-amf/mini-amf-0.9.1.ebuild
+++ b/dev-python/mini-amf/mini-amf-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index 53abd689ad25..93691f49068c 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootstrap-0.1.1.tar.gz 363121 BLAKE2B aecbbab8a0ede98d52cca778d6d8430945f3b1e962f3bd4b3a5c0d544c51d0a06a21e4d0b15390640097d57b8f30ea5f271d201ef9ed0a15ff034e08e1529e33 SHA512 edaf4178f2a5914bf6fb7daaf4dfeabe42eff6872e60ca78bf748b55bb2e487742ada279696ee6f8aad87106d38e7bcf0e24460b85d441b5f77e4f64a99a4b66
-EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 392 BLAKE2B 80b780a82bbcee765ffb1a0bd108a22b7b43221734a920e0f8f2023901180823411871edfc05f2587dbcfea7fd30576638bf216d04daed8ead7d556e8c46b843 SHA512 e0a0e17c6c3391ccd59f86f580bed1a9affb4972080d2dc0e9656789ad615eb490bdab923a2eef344e43482ecc3a13987280bc9a4a09da3e238fc0dfc9844c47
-EBUILD mkdocs-bootstrap-0.1.1.ebuild 410 BLAKE2B 62aeb1f0be7f045578540a2e69d41a9b3342d03e1e444d8f80829e647c4d82e4b047b3bec7e1584f53c091a3187143eccde9da383c888f04c6970b0b8c31a867 SHA512 7c3ce4252f8f7059ca641726ff234d132ddee491665e70670fe8ef3a9628ed71c6a3f37f19ce11e502e072b408cb5bef7cd134f81b467936e104517178e35eb9
+EBUILD mkdocs-bootstrap-0.1.1-r1.ebuild 382 BLAKE2B 8ee230dd78f8553bcec0ab4f9676956d51c3fb6d6da4c12493552cf74b0411267eaa9f31b8f76686b109e9a184d2860c1cb0e0839278a0a3d6ecc017d2d301d3 SHA512 1f398606a8ddecf7d03f0e9f11c4789306f295b4787e95d621ea09635c5d8656cef1aab86b6adbb010e668d60d758d15d124ad45fbe9f34e5a64764c9487e95b
+EBUILD mkdocs-bootstrap-0.1.1.ebuild 400 BLAKE2B 53ce97fd3ce7f6583c73dac7ac1689d736ac3fcda957e30b59afa22420704be5fefc99824df6f1917865d526906190fdd0778093b98ed5156f155db2aa29827b SHA512 7b1ab1893bb652c5b1e2e0f9577367756a2ebb7cd8344a87a2577517cc5d017f7bba6f9d90e7adee6073de102459da61c236b9ffc1a76492451b938c7ad21be3
 MISC metadata.xml 244 BLAKE2B 984a07400477f088442a2ed1491b8f96a78d1895f5186dacf5ff5c9105199d82a7df31deacd1d5986338db1fe2e2de130bf8615965fe2466492b308fa9ee8a0f SHA512 c767d00b3250438eee0e53e0cfb185601b33c09743d3d4ad7131254ba752a065465b316a279956587a70715920bf7563f420ee1fcda261eed4510528fb78e1b4
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
index 070124cc0f37..d9522fbe9b32 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
index 628907c1f976..3a26b9a98edd 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index 9ce4aca72f13..b0f9930350be 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-bootswatch-0.4.0.tar.gz 4409488 BLAKE2B 219d341a995f39e58ed5aaceaf0b94f468b21a9959220f598cb7d6370c550f67591fb8a480583a0969d6b6bad94af84d4b874ee80b63b430c6f7177a0e2ce46a SHA512 46ab2f40fc5167dd96e7dd6d80b99696f371c46a1f0dca029dc444d352da71c0f05f765acd67a7a79a9e3f15140c0b0cec4e395fa247b4bc09f3b77d69b905ec
-EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 394 BLAKE2B 446d4c6eef09ff038323d23bae0c9e1e6bd83951f4fda49c7fbd759b4ad4d72aff82fcdb0c8d40abd4bab5a2475fafc24b2b2ce1e10ad398a91db1c580956521 SHA512 706fd00d7cce525a2e0247211addb71f530badcaa73e7c36cf4c758ed4dc0a1bbc43c221177f54cf1cfe56c39f79065c84b1cfdfea7226088df1d78e5a5bbd9f
-EBUILD mkdocs-bootswatch-0.4.0.ebuild 412 BLAKE2B 7e551cedb8ec0b611f7d8fb8e42f6e4c9a57fb624ef39227d473268a57ebcb4b589af6a3ea1eb5964c125c6eedb4655d75dd704991fb38fd97418a1ff615bc36 SHA512 0439a70daddaef6e17e3e078f48a9a1a58c379a07ada5afb0d75789bbd2f7f74aa6d894e8f67f8bd6b76aa4d3463aea2b9a118056a3fc8d9bcc334eff8579095
+EBUILD mkdocs-bootswatch-0.4.0-r1.ebuild 384 BLAKE2B 3cab96cfc33ffd515c6083ff6867cdaba2af358380bdef1ddd912a5a870a897d953530cd5dd070f350f87a0ee4c58f3949682e6a0423961dab394aa4731d480e SHA512 0a28f4f6d129bca601f8ad35a863a7097cd12a872141000d515fa49168aab40f659061f9b60786ab104cdd589a709a155250c77544fac0895681bed74577f77e
+EBUILD mkdocs-bootswatch-0.4.0.ebuild 402 BLAKE2B 85080a19f3ca8db69a820b1ec999d131498eb386975158b374871725e7a19147bd72e81a4e1855540bf618ff928d75b6fc3a208292e149126e8d829b614e48ed SHA512 2c64c0617d44b05b48da85634588ac578b0fe2b54a900948a2a70c5f81f21a13cf50859dc039ff212f1a991d097718cf2ffabeb1b5b6dd0cfc331be2f4190b1b
 MISC metadata.xml 245 BLAKE2B 95cae7ad600443b5a08b11a0193a4a30ffa6b084ae5d92b416adfd5d2324224f9f0a2df337d8636b031f3d48e9e615c44f3d30e91021aa39fce748a8a5debf57 SHA512 683cc090312ac3e11fda27d1b788d7a5c1686600d727f09b441de333753d9737dd0228a974801e8bb18ed6470f61264cb8af45ab90faf077a8e431f328fa63b0
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
index 03c8ba148de6..10d16c4539a7 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
index 9a7d1ee9b0cc..04376952225a 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index a60dd20d9059..a83878bc39a2 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-0.15.3.tar.gz 1805972 BLAKE2B e6619fa0bd14fefe96de5abeb9243369b1419e7018705ac6a6d58fcb40c01aff380c3b4ca514af0a25da90092f39776abe42d19a67f7e86780c5c4111884b230 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8
 DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451470fea4ed11de1cabc0cead3508bffbaf2303d33904ef0bee8f81cfbdacb0fd095ee53d6fa7c09f33274c03af SHA512 9f6b1ff5922fb58783d70f3912bb0170f927ba0160f5e48f71db2d267030208bd50997f14f4626fbfce891ddce7f97747ba05100ea96cdc24609341d382f039a
-EBUILD mkdocs-0.15.3.ebuild 1080 BLAKE2B a185448eee60477aa43f335ca78a63cb5695b0295e09a99b76848dc08871d27dbed4d92741d6e452d43c7dc4166fc818ad3c9cf13610291abece201f7256943d SHA512 c7897ace97331df8640dd0d53f544757c98ad5d912a6ea63da4ee37027fab0c9abb3d9b6ba2e39fd4543b732c5d15b73e50799d4eea743e70e998137e5ec89ce
-EBUILD mkdocs-1.0.1.ebuild 1340 BLAKE2B 00acb8ae05e6737b4ca10372ca2b42168c4eb4fb9931d166a757f78c9bc4d8269c75f460090bd1f7b03827abf38cd863d4af35919de3b3a905b700580e2429ba SHA512 63588f217bb4f0931eab31d6c5583184b03036a8188b101aca6ef3eef7932e8472f51365d18c34b52d4886c7ae9779a59eec3251af7c345896e2fee94348722b
+EBUILD mkdocs-0.15.3.ebuild 1070 BLAKE2B f070f5293016c1e04fce21f395dc7eedb9079c2685cde71274f6fa2e17af6f90f231808ab2b20b37b35136cae26c2e13be3e55d19db80bb13b6c4e7f6633e283 SHA512 1fc10a6ced330ae8817f8e0a433d18b75e815e1e53487ef4634df7dd986d49ed11b2180de5d778d2b7295bd08cc74150aa8b2cd6d88f6c0b7d76ef79dcce3515
+EBUILD mkdocs-1.0.1.ebuild 1330 BLAKE2B 3edfd28012c8c5e7ba052f78ceaf6e3017b0531bacfc9bdc53f2ce6862170d0402f787d49262eb1eb5a318232bb8010e48d85bb8f9ce613639409912432e2c50 SHA512 2bb387eeb33cf09541f5b98f7df6805635b51e528a5440d7f4cd436b25de77723a865c1d46b6a766bb470acb0d2d1ff8fd911b5f4e7ce74ba57221412ae93a28
 MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
diff --git a/dev-python/mkdocs/mkdocs-0.15.3.ebuild b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
index 32e21af0b96c..113f50d10b56 100644
--- a/dev-python/mkdocs/mkdocs-0.15.3.ebuild
+++ b/dev-python/mkdocs/mkdocs-0.15.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/mkdocs/mkdocs-1.0.1.ebuild b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
index 411cce64172d..a6585445076c 100644
--- a/dev-python/mkdocs/mkdocs-1.0.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/mmtf-python/Manifest b/dev-python/mmtf-python/Manifest
index eba8582cd562..1f96561a89c4 100644
--- a/dev-python/mmtf-python/Manifest
+++ b/dev-python/mmtf-python/Manifest
@@ -1,3 +1,3 @@
 DIST mmtf-python-1.1.2.tar.gz 46309 BLAKE2B b21d53f7cfbdf6f6bd4f0f3ac31a846e83ce0ee98faf77fa8d06de7520c4aa64a259e8b43a744a440a6cf1a10ad461697334683364698a68222b690301bc5554 SHA512 92afcce48c2de186cbf9c2cb39c94c5df14ae0eb613862d41b674b7d2f338855ed81be23fb14d16d2dfc8d33415d3904537ef4a422e3a52b78d461b609e968ca
-EBUILD mmtf-python-1.1.2-r1.ebuild 474 BLAKE2B f2df91a32ae23e295b74f53a680304b4971dd27d4000234b37dc2acddb2749c36e38762612ccee9c5832d0bbf20d47249615ab68e676977f2814efef79211d4e SHA512 7740ef9d08e2bc7d5e526777bc3905c73105706ed930ca12117ff1297f69fd5914ccac2dc23f5012de6d456a05aada1038fb9349e2e10b3823dfd4bab859ea4b
+EBUILD mmtf-python-1.1.2-r1.ebuild 464 BLAKE2B b316e8f8cd44fa02f3991d751e8a0567d952dd9e678a6984fd5d23b0f1a1ad6b1e9473ef5a36e86dee79c2136c4f1925784fe60911931a9f2aabd38256ee164d SHA512 9d80eb7f34c2ac5296bca41d83ba0f29e23b3bc4c7f673d8152ca0ea4c6da8ada252c500d4fa7158590fdb5e789c33dde9cb1fe6029ef09b2e718f0ea44dfc4f
 MISC metadata.xml 430 BLAKE2B a69050101da1e1dccf6b335506250cfaac02f1b87c87946d72aa1c3649c2f5ca107c4772b9dc410088397be824c59b2c9e6e611ba548b7b007aa22e7d9a12a46 SHA512 1245d1c1479afc4dde1a787d65342997754715a530a81d73fac1512a5d20e54fb36c80c1be1fe017b1ff9c14ee786f3b0da6b1a7bf689619285c7a86d5d376b5
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
index ae52b3eeb899..b7977d728d5a 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="The python implementation of the MMTF API, decoder and encoder"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 56730851cc9e..998d066f093f 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -3,8 +3,8 @@ DIST mock-1.0.1.tar.gz 818644 BLAKE2B 7bfe02c413c2f98a2d98ca9cc40ca8831d65b3a509
 DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca47f6ef5a394bc80cac10898b611146f28da93e84c4b26c23f25708be3c8fc6b61062dae099396e351861d8 SHA512 10cbb78b89f2e82abfcadc035a526182f83b59df4775cd85acfdbeb4505791c63b7a3761e6126a08d9aedbd07ead8632ac2a728dc07a362f4aaeea694bdecaf9
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
-EBUILD mock-1.0.1-r2.ebuild 1113 BLAKE2B c84a813e9bf501d2c65d5a47bf4dab44ca9aaedbfcbe3577de19328f1915ce45e4fd1dbbc98eec54807f9ae1f2477b4367aa97ac6127189d6c09b6ee038a1615 SHA512 4887ed0715c0a0a98bf2ad01b7d913edc32b8d166a87bd158424ef839f95804b999681cd2b3ff729aefbc55ad65ff8c3988fba6d99fc022b0aa09d32dad02fbd
-EBUILD mock-1.3.0-r2.ebuild 1064 BLAKE2B 0870756a130f56a03066197c233da04cdfdd77646502538049d36d817b9d5d41eba4dd12e47630325e8dad3a1c1db414b1ac8c6c6f0377cf3a974684fa67623a SHA512 4481c46edd1ff20648ca2a335ac8927c0eec77348546d6e291e51f0489596f74c059c983f7fa92f80a197ed2a70a3079f8707a8dabfee80cf506007b023d79a0
-EBUILD mock-2.0.0.ebuild 1074 BLAKE2B ab8ba91ba11ba2998a37536ea7e9f22ba2db0bd6f9dab46e3a8004723a419833547101f65c4ef3af08ba9b71e78f2d4157f4f128192afb05e354b64bb97d6e39 SHA512 68cb05eab7e1fad09e14261df2f3898b67b2c61caef5ba46b7f68b08b66b8f3606c38cf064e781bbcef0061854fb7e3295bb14d137297deaa02c4818e12e6d43
+EBUILD mock-1.0.1-r2.ebuild 1114 BLAKE2B 0b556a88ba7319d91b05789190fbe52781be57f905ca43b23da6591ff30d38acf67496397b4671b2f785c03cd14844a9d4f87ed028c966cbca46ef3de86b963a SHA512 113f299cbfbba98c6f906ac93866e8a6a975092c1a44f3490ec8d32bf891e3427d0bfe8bbc1088a6c222e7281f08195bbe9b5bd20b8a07b4570bfee97f733018
+EBUILD mock-1.3.0-r2.ebuild 1065 BLAKE2B 90c2be33943ff0999efa5d6b179e95ac4712faa2b5077f4d3dc46627dd1644c048bdea96d1a3203b9be7a82cf1f75b4e317b5ce5c43f46c45cedeb21c0f40170 SHA512 07bd81f45bb56593fe5d9d5490c9f030ffe0a7fdf76cea4f3c39ff48633fb456a666f42f0d65070eb2617f62981e7c4598a5ce6da3c0f4b1261648dc46fee8be
+EBUILD mock-2.0.0.ebuild 1075 BLAKE2B 831127824f1f31f4f732ea263180235a61fab7e03824b94917496616ed316e692c98b38c5f2f5154954a252faf74ddf5ada0eb07060180db2311fea8be101133 SHA512 cdfd2dd282049ae6068442971a40b4b6a9d1cf9907be48be27f1456451738ed35baddf66111710f045f375da7a2bb981062a63131c8243078d30934930c4a15e
 EBUILD mock-3.0.5-r1.ebuild 1469 BLAKE2B 3075913cdf16e2e2265a7e4493d0e51786764ea4574ce0fdc8f09843b97e4141cb1c21bcf2fa563da568a5489d038ebe44dea9b0a6457803e5e3f3a77a7c968e SHA512 430c90e5c0884423e0d85722e6d1b0449689e28718e63fe462a548f8eef1064c55b04f19dd36723ed90a584a27eef59d1bd2b7a5adac4e75488eb5d572715758
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 9a140d32f3ca..bee491b3248c 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
index 7ffd78eca39c..2789d2fb07cc 100644
--- a/dev-python/mock/mock-1.3.0-r2.ebuild
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index e3909a4144f8..f57e98c27c96 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -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 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index cf589d961bb0..2974bd85c449 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,7 +1,5 @@
 AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c614e32f6b8c18e17fe0c03c1bbb599438d052ed241590634c6011497adbe0128544b93294ab464af SHA512 09836864043b8f9d7e8eee7ed9bb2613d3ec34b90a1af3fc30239c54ea901a13b7ab89bdd3dc49a42873de783d1f622cc8b691b02f48b04947dd3667b4dc4fda
 AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
-DIST mockldap-0.2.3.tar.gz 22369 BLAKE2B 0021951556c0b8ea1f043b702f4d8f8719d272559db3ad8ee4e49955bb17a3caab4083a37486366145d8a7aea927fdc0528c1194f849917471ba6174b52bb46a SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788
 DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
-EBUILD mockldap-0.2.3.ebuild 1036 BLAKE2B 8eb536df1c5e420b1ea5ab11b1a12471f2cb3a3015fbbabb7bfd1c39611e738f8a7a9695e4a01c6dc0e6911275a1dc22b265e3fb3cb2cc0760d6884d86ab5f8f SHA512 cceb24ba4286a7c89efa4c37c03607a80219e6d0ff919f24358f40d9153fb9795c8f03f1e57f41eed58d1e9e35f1597b9ea248888d9c1f0d75bbf84902758326
-EBUILD mockldap-0.3.0.ebuild 1244 BLAKE2B 9a6fdfe0ace53a61f454c098c29fbfb0cb4e0047786028e4c0e1b7eb3009c7ca1c0fccb065acfb7f06b4e551eea266cbe77bee47847675686f6836fb106784b3 SHA512 61326491c4d3896d6d2acb64e2423d962929564ab13d01cc4bc18fa2ddb05be4cbadf9d4054d71aef3adda667d0aa2948e2baf645c5bfc607565b3ead77cabd0
+EBUILD mockldap-0.3.0.ebuild 1234 BLAKE2B ca18ba1971e7d9eff54e89bbdd3363718d8763a6d93bc0e77a5e52988b6882dd0e64030e7c815ff205d859d6c95242e6ce131ec236d01b9a6a7dcd2bb5c417ce SHA512 20efdfb1f5b9634afdf0f2cb84c167797cebc28fd06bd787ce602c0248d0b729307706cc8040da3b66748a0d241f560463d45f5933e984839519fb61bf7de30b
 MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
deleted file mode 100644
index 657816c34298..000000000000
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-ldap[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Disable un-needed d'loading during doc build
-PATCHES=( "${FILESDIR}"/mapping.patch )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "hashed password support" dev-python/passlib
-}
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
index 2897568f71cf..32a86dee39e4 100644
--- a/dev-python/mockldap/mockldap-0.3.0.ebuild
+++ b/dev-python/mockldap/mockldap-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index af6e3b27fe5b..d117f6276985 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
-EBUILD mongoengine-0.10.6.ebuild 810 BLAKE2B 24017afb6cd21e334d917242b453f7698c1395b62a53e9774bdde4fccdfb1523d57acb33493d0acb4750faa082a1d6a9c55a7eb46f2f4c839fe5236eae3a0565 SHA512 205fd957291f16505fc6e1234807c065e938a07061b8287896e85147115110dce3c795316b056754d0b28925796fc9b49c15de2bb613fe00f034d3e24480ecbe
+EBUILD mongoengine-0.10.6.ebuild 806 BLAKE2B 022d0b039cd0851e35826d81fa101feebc0ccb39b329479ff30226c722463b686097a922f2d9d8fa9754a67c6c1cf018741b00c0eb40ad07aad2538cfb1fc7ea SHA512 56a5a9c81d02f628a1b50f1c789531e8c1b4cdbd97ff4bf4a3ae29de3f74025cffbe24cdeaf18d6813f13c2d8f93dfcdbceb7dea6464a6650d07c5c1e180175e
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.10.6.ebuild b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
index 3f9c15e2115c..88ea7449889c 100644
--- a/dev-python/mongoengine/mongoengine-0.10.6.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index a868c044c025..6802365d43c5 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-7.0.0.tar.gz 70103 BLAKE2B fa7556019ad4c2e8905698c1295840176b763bf1b7356679eb3988112b962adfbdefa82e7ca7419d350b40186a3ec5015314cdd7229dee867bd03fba716165f5 SHA512 730add0e26d62abd2d5e49cb662d58db244a241e272e16d05c25c7bf2ebe8a2e28b2b2b5038082d5773358b50e05d5f9a93f88957dc1b13daf30686047f41bc5
-EBUILD more-itertools-4.2.0-r1.ebuild 1067 BLAKE2B da5e9e9887771ddd660135341b18d81227a69aba53dfd42b346e1d82d666d57ac3e7251bacdf90c62a8a1df2122bb10d288ce8df2ba671b53c3a7f16e09dabcf SHA512 63f2913134bfbccba4f8db1ac386f04bab73e96fc1b920030346acaa973a0f73e1b614f38b29d0e3a50b43454463e00846b73df7ca45fb5538eb310373bf9b5f
+EBUILD more-itertools-4.2.0-r1.ebuild 1068 BLAKE2B 71681837817c7933889826817f6a870235d145d79788be9ea982fa0482e2725c6b8191cd5ad251f896d17dc0604f39fd82579c36fca7161529026062977b04fb SHA512 e1dad897ddca7430300bd6ae153855f839a67ff43b6767c46773137347da537a2baf9db4305534c813f312389f57be50d4c64b28314d62124ce56accf83e0252
 EBUILD more-itertools-5.0.0.ebuild 720 BLAKE2B d38695e00a0d31f0e6db08ab441d91baccbbf54057a9dcd483f99e71ebcd5967464ae5bfd772cd0155f8e0fd8c2024c6eab60d74a79ef97c60a377577e145e7f SHA512 5da4eefd8c2a282f60c1b9e156d0dcaea6af83811fb186c2b6396e2adfbb606182892e3d0483b5e10a7c31896b36364b2c17461d266fb1a322cb1cd5fd9b7f68
 EBUILD more-itertools-7.0.0.ebuild 667 BLAKE2B b92631361dae585dc017fd9af152c508f910a0477f1f0f9db781e7c856a6746a3d0e3e4b7fa6bb565b60a1fcb83093712ba09120c48801324684f4243c0ccfe4 SHA512 6f45f5f954c3e3830b8f9b0fb72cf715cf88ab08f44b70d5f2a5143d35940c82aab0c7ac898f9f6bb0b13f94f706394449a917719b9b07d6daf709f8557af12a
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index 1a03a8da5a29..2c5bcb663bf6 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index f8335ce52296..d89a70307c8a 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,5 +1,5 @@
 DIST moto-1.0.1.tar.gz 731617 BLAKE2B 6f20c07c0635a8c10f8f70530aeaac5ed7c2136d4fc87ff57774a95f4d2e1ea8cf1100b9f0871b29138cec9059de5746a9c01104d856f8248edbb648cc4a78e0 SHA512 3171ea3e8f9d267960a7b82caf7e42b86fceba5a80e96d35b849e4e72b7fc6aed94090161219a520f9c1b4050f7de12e0f6c0d560ab1f90ca43fc0387b62d377
 DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.0.1-r1.ebuild 1311 BLAKE2B f3522cb86375c4449245bf9e86608c7cb056d2c67de63cd731686ee5cb2d13830330af1536d2941ff84045e38cfedec343b3bb27030512253081cedfb805f712 SHA512 9a57095399ac8b233052af9e7bd4b32cfa337888341d9fea3a9cb0b713dfbb68f4da61db7ba6d26562a9af6829a0a61f18b1af5e0a75055cb039fbbd9dbefb85
-EBUILD moto-1.3.8-r1.ebuild 2440 BLAKE2B 0ca64c0325360f5a96c28626127fe0e72a41ec7d70dc36546dff944de420537c9543a501f997d5125f334b62c47bc69fbb579e24fd29c6011b89e2cbda0ac45a SHA512 a2346e4caa543c2ccaaa6041f7ff50e9580224aee641200a32a8aada67307ff14fdaab827d7fe36d27e474ff63737141a87a1079196174ee245bb5c3a283180f
+EBUILD moto-1.0.1-r1.ebuild 1301 BLAKE2B c3c96ba828b8422098df653022e88ed0fda247770eb1bcb97a804a67b0fe37f7f2224f5e066aa63ed13b68a3fc889e4f488b9f0a130dbf080520dab95741bb2a SHA512 8c3c1c010021ffe2d093cffd740fdfcd3698d741e991f8c4ea273823803a999bdbe45a498c4115d1401e732c636014a4d4682ee9ce27d799cc2f012c0bc76537
+EBUILD moto-1.3.8-r1.ebuild 2430 BLAKE2B 214f9183932fbb966f996064fd732dc8519b7f41d87b7e33b0a2fe79e9906f7c6b9034a3903d87eb6af2c7b8f5c770a0d1cf9111e52cf9ad0078c9d54a8d9343 SHA512 85fa106d9a92ef7f1c92416a0ff9b488b19c5155c948d42ba67381826dfc93f4be327781ee8cb0d63abf7edd1f3c8beb130204ca2c04847febbb232df9daf60d
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.0.1-r1.ebuild b/dev-python/moto/moto-1.0.1-r1.ebuild
index f0f54f5060c8..dedcbb200161 100644
--- a/dev-python/moto/moto-1.0.1-r1.ebuild
+++ b/dev-python/moto/moto-1.0.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild
index e574b40c5605..53588cc521fa 100644
--- a/dev-python/moto/moto-1.3.8-r1.ebuild
+++ b/dev-python/moto/moto-1.3.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mox/Manifest b/dev-python/mox/Manifest
index b5ea2d102bbd..738a57c82a64 100644
--- a/dev-python/mox/Manifest
+++ b/dev-python/mox/Manifest
@@ -1,3 +1,3 @@
 DIST mox-0.5.3.tar.gz 31266 BLAKE2B 7f8d22519a462270e08b5c126fa3afd38d6a643818c39c37105133583585e451f3447155b48666c590abe7166660ece33368b3f3f22690cda10ce4a4ff908ffc SHA512 122606264ea8bf83d38f8576c8208fd1bc17cd76009390f516ed4bdf705d49ccfbeed0fa3e9ac1940df3969e0254662c602c497d6c6833108dfcacc59f1c789e
-EBUILD mox-0.5.3-r1.ebuild 549 BLAKE2B e896fec17b17d23b8e7fe5d29d51e390489978cb75b44ca20b4781c4ec8574c4e951c62de8c0a70fb12b15f7bf3cea4d62267b17b2bfe4b96eee17000c7a29c2 SHA512 528730d1e5d4adae867f2e508ee122735c6aadebc3f8d4e77bd674d1af5ec4a58a848fd7000e7de62208e84f2f7c86ba0209ea29d7a1319d0ff880bd4e40042d
+EBUILD mox-0.5.3-r1.ebuild 550 BLAKE2B a9ebaac4ad6491e5f78144ccb57a463af6c35eca883fd92ded32663214070f8178c866f8cf7d76908ed41d5d2db17862a242afe0820cec041b13155681b77b4d SHA512 a883fba2406f336153c92d598120742969cf125e41682c8f78415dbed3b992d0513d47bcbfbed1b1c8d5dd11f7ee5cadd2ad35615b0cc38665a160d72e3add9a
 MISC metadata.xml 368 BLAKE2B 60b112ef7d37a6b06bcb2f459f45795baa307fae9edc7e159e8d3c13b475d92339838ce36851ea365c5b594aa7fc4883a8ae5e2187db03d3050c9471d5523ee3 SHA512 8a818882c4865dcffe190d21bd89abde52ffdec8bf1190653a011cab2c1e9182e4196d2dae54192fe8042573730cf878ee3e260308623bff6443143dee590f9a
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index 269ce19d7eaa..2a6dd2a8a3cd 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
index 8fdb149104f1..367b1330fabf 100644
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST multipledispatch-0.4.9.tar.gz 7541 BLAKE2B 01a2f27a694c08b2bc32864e91219685402ecab63d94ef7c2f0c889772a773c64309c259d3b35ceb7e24567efceb8ab350134011df7a1172eca3a77b8b96d6c0 SHA512 b59f73f6d500c5cbb5e45eab9f6ecea45a211764cd8e7adbbf85c29510862bc5427f13dd652a18feaa9f930dfed51fee76411ee659ed8f961c0e5ba664878c1e
-EBUILD multipledispatch-0.4.9.ebuild 507 BLAKE2B e31f1fb555102731b8d35b8e95c700c3fb8e7cf014f4d907f3eb5dfd745930f182695c02df1cded0f255c0f9bc429ea2ca2bd394b235db87ae82e56037d673c2 SHA512 2bf335a28002eaa9b341ba960a6647f80faf52d1bbaa6243fb673830d152ead5eb3d54bc98b6381616ae2fbf4256f7a3c1a349b100cee568c6c5f4656c8855e9
+EBUILD multipledispatch-0.4.9.ebuild 501 BLAKE2B 77d53d3a8250a8f64ea39794974cdeb3722d9f280a5665be4a06e30015ee8573f894f7bff1bf724b03eebf6bf78bc088d5ff83b79a39a5b7cfcf27ddee5e9b3a SHA512 a9b3a2cca361f03cd58cdb29f4df6283a27d9417773382a3e15f870498f11b44f23dcb67685e8ec171a1abd95517eca333731ef20791a1c7e4db0e4a481f12b2
 MISC metadata.xml 674 BLAKE2B d3ead3001d5d1c37cb8b69abb3e07dced3530dee4073e2119d6febd9a0b98bb19bb324218b685ae6072ef7fd5cbe6b7bf4ed6d42377f0bf011e75c2badb7cb78 SHA512 e67081034601d04f6218239e40ea4f7c9822496b3d2cfb581ae49d513445e5aca281293aacc79bacef49adb02235bc00c8598db88e7550e3f509a1f304976a39
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
index df34b4fdfa19..e4fbfbaba504 100644
--- a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
+++ b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 05debe896901..390d602866ea 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -3,8 +3,8 @@ DIST munch-2.1.1.tar.gz 6565 BLAKE2B 81d0ea79df9934ec4fcd4d650dde6822258b3dbaaee
 DIST munch-2.2.0.tar.gz 7108 BLAKE2B c01635adbcc1083dd539317f6619ad15bb654d1f5114d3b5f5253bbd1bf92a860d3b030233f85878780d33ca171bd08c44b37c9bdb538e4be868704861c4372f SHA512 420b9fe4486aac00b3a0d747995df46bb3fc72a5bcfa4fadbad3e3a50431493f69ca76294ae541042aaabec6e01794f8f3c9c03a5c0d6058e730dccb62e42e45
 DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.1.1.ebuild 469 BLAKE2B 4afdfa204748b6a6df5b1bbbf50cc05a8ed10c184492928c2c3bad5463f686f4461ec5f274c8eb676b53aa17df273d4139f2974c59bc48d5c5d92ccadf766f19 SHA512 5079e3e46e93235eee8e51093208a28f21736d3ab8a315c906232afac31c4af1f060d916e54713cda948d6468703de010020bc24147cb353cbb90650b1c9a928
-EBUILD munch-2.2.0.ebuild 474 BLAKE2B 57203a5fc0138be2ac56b75f29708e526f687917f21a209d54a85f1ee0a80f4f7fbd741a288d3bdbe9fa9c3f0ad6b23ea32efa5e855146bf16236378aef00ad5 SHA512 335a3e7058b9af2cfcca2cdff05fe9afadd88e9c4b36c45ea69aac9e68a48c04ccc9d3e035e306ca118a12f95d11c2e7f0be5713d7b39226167186ae8596d2b6
-EBUILD munch-2.3.2.ebuild 509 BLAKE2B 0175e524e839580194e2527681a8f76e6dce7bb14949bbac414cd752b82d12006b8a5e6ad5ee5ec49a9427e963a46f76ec6fd7ccc2774a6fea84771fbfb7c75b SHA512 cf70dae16687ffc1523787a5f3c510b414e688e4a9aa364032cbb53c56529631d814b38ad6f506162c99558c925090adbb0dd8e702dd2aa33aa72e2be1c94705
-EBUILD munch-2.5.0.ebuild 686 BLAKE2B f7f6c467c4c922f4140af766a922fae5739b34cb6a70c3a6ffb4f3f150c1f3d7163e37e77263968292863b548966c3e9d17bdbf95cf1092841da0f4eefebb50b SHA512 ed052b02e30b0f4ed284289f63043025ca9460d6866f38ce6ab5789b958a2d9d3eed311288a46190b75fbb0b12401d8084bc2dcf033c080077169cf22fa28a2e
+EBUILD munch-2.1.1.ebuild 463 BLAKE2B 27c492191cdc81efbc511378f0230c93a84f6987a2fd4ba5f4bf04af6215d5f4054cc39de7b7810e87996959052625e599597c0215e30764eec9351662ca3d65 SHA512 d08cbdaab4619350cdf71f865c2693884e1b2117b1a533d9c0ceb14a2fd31d1f42def047222d8f80149e53c584be7efc25e0490780aac4ab15c4c8975cb25104
+EBUILD munch-2.2.0.ebuild 468 BLAKE2B c0674aca72191b13efcd0445f4c3105fd0e2bdfc0ff2356e5e072cd0985308e6775dacad395b431d6f5b1f1246d835ca482a14d0844a62063d491af08bcd80ae SHA512 1bc9b3b4736418e1f832e63634f36ff695af49d4e6b6d0a40a87fbfa312db09e8541f475ef501a7e4559f52802f9af16ce7a85bb1bea6e78838f7ee9d941613f
+EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
+EBUILD munch-2.5.0.ebuild 680 BLAKE2B b6799da2b458bf30a0f779066921a8fbaf09988d69c6e4d69bf1bc81993b0631584a3fbf9ed55268259737fc370c18471950893130966aa94f60bcc073298186 SHA512 fd7d9e245941b512b910c30f2bd589aa99ad7b669d67a6318ff4590914138836bd69cf007df6a0be686e5b964840b5f5f99224f4326ff9a6f38c25034d5934b8
 MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/munch-2.1.1.ebuild b/dev-python/munch/munch-2.1.1.ebuild
index 18dd1e8c2731..8325d70a55fc 100644
--- a/dev-python/munch/munch-2.1.1.ebuild
+++ b/dev-python/munch/munch-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.2.0.ebuild b/dev-python/munch/munch-2.2.0.ebuild
index 66d6986c4551..0a4d192cdd87 100644
--- a/dev-python/munch/munch-2.2.0.ebuild
+++ b/dev-python/munch/munch-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.3.2.ebuild b/dev-python/munch/munch-2.3.2.ebuild
index dd72180cda06..f3b03120e566 100644
--- a/dev-python/munch/munch-2.3.2.ebuild
+++ b/dev-python/munch/munch-2.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/munch/munch-2.5.0.ebuild b/dev-python/munch/munch-2.5.0.ebuild
index 76667adf2c56..ce4b3ed6928d 100644
--- a/dev-python/munch/munch-2.5.0.ebuild
+++ b/dev-python/munch/munch-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index fac4404e6966..30b1187ff623 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,7 +1,7 @@
 DIST munkres-1.0.12.tar.gz 12126 BLAKE2B 23fbfa95f36ecb386cd04a375b046c3749e5cbee727d72c4d25e250fc86de80720bda897400f03d8e079ff7bd6589845836f7656eaa4f18192eb64a7258946d3 SHA512 9049fd350b739c9095b6e1da8fe0041210d4723ab8c0c6a7fc9943392bebf9eb224c6f420c8158a47607277e13fba2f3c7803ee222d58e8e3720d5647f44e596
 DIST munkres-1.0.8.tar.gz 9277 BLAKE2B 9680a5b8bd20a4207ac295ce535899c4ab123d9e26ae44d652c55601ac62f345a683cb133cc50b276dc1330a11a918bdd26c0f7832d908e05d47dc795592b38a SHA512 e0afda8b91e51d177b9e2dc66ccacce849649d1a7d0e756884ac030acf4080076aa428182c5e9366613ee16db338ba7dcd3c38977de0888781b1885f08cb8236
 DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
-EBUILD munkres-1.0.12.ebuild 510 BLAKE2B 543885353e3286e6a1c017215e734e0eb29f0175790785f3d8d703b3d34ef0568a6d43414b42f013daf21fc309ace98e0d6dc57778ce414b61ff3bb8a40783c8 SHA512 17a79c37d80a016317daa21a840e4f47b708e70ca06e7694521b2b4a4a5cc1882d38cc068938a94ecad9be7be495c28154b9a7b1350a953fab33beb319a5f8c3
-EBUILD munkres-1.0.8.ebuild 449 BLAKE2B 4ae30972befbc948b213845543d828118ed784de4a87539cd5fd3095f3ccf3754dae203dcd0cd8bb8cc07eef50b47d9263638fdc90ad35782be04a0472c3961e SHA512 0bfae34c6ae6d09c3b227a85b2ef28a140ef638536f99cb81393be7abffee536a782bf3218bb7168f79e0f0672b734c0de865ca0e315d5e5bf690ea05cd2949e
+EBUILD munkres-1.0.12.ebuild 504 BLAKE2B ab7ce95b743f290b0b9cda4784ee7879c589d9d1150780c9cab4f6f9c071ca8c6bfcf217530ee723458a5bc8890deccbac48611faef3b6f6a404b77dd6096ef6 SHA512 d06147274316f2a82b7fb195fde23f5610214487fd0955fb303c345f15146deeab1c04906fc61762656c084222cb1910459985059ede5f1258ce658898cd9dce
+EBUILD munkres-1.0.8.ebuild 443 BLAKE2B 92762ae64a54aa14996220e33ae1b3756bafd1fa7c356d13f254f57507026b61710235e214a710ebc64aa9ee2d41192dd0d0840ba2f4e276d8410cbd2a1709b3 SHA512 1369884711956a3d2b20b05412303d25f71011d1c12f43ddb788bb62c3dca55c167c7f3907a2c8336ac863c42f3c70ecb4fe18a85c43b1528d92715e5c25cfcd
 EBUILD munkres-1.1.2.ebuild 518 BLAKE2B 574005dd5e45197a7459083b0eb7476fa61e60e1d0c3d77dc707d56c6c6348a235bee1c8581215dfdb30fabbc5982be5fce9665a328795b40105c28af8bf2c7f SHA512 512dcea976343d60d2276be53dc6d92e5972d8f302df9289221e4cfde8d883f5ca80d4ee1e10182866fb49064b5a580f42c4b9da17bc9ecf2965c65585cb5395
 MISC metadata.xml 688 BLAKE2B 65040255d996c7256eada45681cd0580caf8922cc53e33d5816c73c73ac5686d6d4c6240e7b5904c22a0944c73f944bec9e565bea5ea53ae51deaebf777a0c56 SHA512 471f6eb808f978275dee54f9404c36a5a39d47c72caa9aaa5f2ad3bb455983f9c46a3196d1246d6830a50624d203b8dd2b68391b09b9b2e933c74bfeb877baf1
diff --git a/dev-python/munkres/munkres-1.0.12.ebuild b/dev-python/munkres/munkres-1.0.12.ebuild
index f4fb12912d8c..cf35e2e118ef 100644
--- a/dev-python/munkres/munkres-1.0.12.ebuild
+++ b/dev-python/munkres/munkres-1.0.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/munkres/munkres-1.0.8.ebuild b/dev-python/munkres/munkres-1.0.8.ebuild
index b45efa74ca8d..303b83cc4d25 100644
--- a/dev-python/munkres/munkres-1.0.8.ebuild
+++ b/dev-python/munkres/munkres-1.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index eb3e3b71bb60..e93318f13098 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,4 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
-EBUILD mygpoclient-1.8.ebuild 1168 BLAKE2B 51532a7b9ed5c6999454c0af075bc5c85430b2bf1f26524090c991fd8e8758bad7b017bd8fb63f0fbd8387fce76c50483bfdce385a74bd54b48b48e80699b6a1 SHA512 cc3e91991e43cd63489877da29c1d5844762dc6422361f888fe43403449c108cccf70f5e60b1ae91620d1a71df9d0ed3eb3166afd96e94c0ad68a6aea9a42c47
+EBUILD mygpoclient-1.8.ebuild 1162 BLAKE2B 421596e541fab433939909bb344f30728e484a9cfd71f239ff2f9630e9ec1844cfc71dafe2e26618a59c7fbe7e1d6e7d9cda2fedfb754c5a2032ab72d266fc96 SHA512 04c6ed5d717f4a6a60447cc8622295c6c3d2f661f50d5896e4ed95d7b66e3c9a61c30ed3ecaea6408170bb91ca249375c7fab18a55fb065eeb4e10b1d5f70ed7
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index 01df10cbcd92..fdbdb4a3a897 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 86d28a64f38e..4fa5d61bd319 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,6 @@
 DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
-EBUILD mysql-python-1.2.3-r1.ebuild 837 BLAKE2B 715389a9e0b1f7c60cf4fc05301a73a2a77ae6907a1b9c9aa84dcb319920879a3ff03b5b568622e89a465a112eb248b0974e8e9df637afc31f089fa6bf21881c SHA512 e7e5b671e49b919c91c7f68d129af76d311ec5de9cea59912c14394d145b6e075da0a114d06f9deaf8fb380eff0e124381f15196029cd05e24ade2a6de9ec646
-EBUILD mysql-python-1.2.5-r1.ebuild 1104 BLAKE2B 18a2cefc075bbb03fa64167277dee72e9ee31df7680b6991a4e720f1d60d9bc90e3ad5037237f61c3c3a17090cbdc8e9df530c4dcb29934073bbbe887220d872 SHA512 0998f6c8193910ba4a43335a113704a2ab3f565752ad90eed65dddfd663fcb038e34714db1d3076b151b358ca38dc045e6b172f32dd3305a96e7a02639aa066a
+EBUILD mysql-python-1.2.3-r1.ebuild 838 BLAKE2B ca860652bb36dc29196a3cb3d3565371299ab457f25d07e933f70da347f380ea289572f4239eb93ae4cd814c8185a24f6d4f8088770964454b7b5ce3c2500dc9 SHA512 ab72bea2b631c8bfd6e81b5e796e4af6058762afc940a7aec7e3fc87f5704811b9898cd122531778e40a279df7d8c545a1c9d0b7f10b2487d974f0f7225e0e05
+EBUILD mysql-python-1.2.5-r1.ebuild 1105 BLAKE2B 94d55457d0d019b562517995d1ad8947874cc8f4906ac929420c1da413876c8604fedc8a05758af84667d8a93dccce668f73c614091645c109a42fbf2ad99a1f SHA512 37e5ddcd74d30faaadfc827dde3a4fc615649fd908adf3b8ab507cb42c63d70cebe188965dd207d60065f4254f5e92cb7d8de2ccd5d7cedf7a114d80427cf92e
 EBUILD mysql-python-1.2.5-r2.ebuild 1147 BLAKE2B 9bdbfa08bbefa0c30130e98974b38825e448ec091feaf014bc64fc686119bc971ceb9d13980b786a38f5e417e502d072c2ba9783428838fca4fc9c138f40b7f8 SHA512 bedd508e9a74418b195d15655d8dc713bcfccaaf10157c80ba3d52e54128360c6382c3c3b53a213726e72dcbe42899c393c56865e202de97962cf2026c9aeefc
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
index 0e7490fb6e10..e2c943e79cfe 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/mysql"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index 8b56cb87b2d2..b9a306b810ff 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="virtual/mysql"
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 475af07dee5a..7f0fe357a4a6 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 839 BLAKE2B 940e4053da975201775c0612406ce7ba167eb4a2f4a0985b463cec782e4537dc665f49ea9521a92451518e0c17cc57338dbdb908cf581abe97ac2500ffa47a6e SHA512 d4426d757c8988f6651cd578c31b3b225b770c6355f11f1b77f45f5c86caba08d6cbb86d8f11aace4813cab1a8340a6afb16db7b0a9ab77615d4dae3e8693e32
+EBUILD namespace-google-1.ebuild 840 BLAKE2B 0cc01de2f4aa35fdf90074fb457d2864fcd02c2986753bd27d42c79b6f120dbf124f8db993dbfbbde9db92a9b8e231a3d2bd9d8fd177ed1ac496b157dd4428f4 SHA512 e68c66b58b721c933e820e57f5dd93ec655208cb1abf4f3cadea111646ef9dd74758b41159e65ea461b6664cc2fb8f0f3be824e98d91c230313fd77dac3d6009
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index c4343407b2a4..1f2b268b39ef 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index f8d790e19285..0b064686e183 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,3 +1,3 @@
 EBUILD namespace-paste-1-r1.ebuild 826 BLAKE2B 4670459053d09c248f9419f2017b76701e8c305d49bbcf4bf1a6b140ce91743a499405ea50c0411206a346c72df89d9fb2c7cf28319319d59e785e4acefad08b SHA512 7b14c1ecfd3df24a9c9dc824939097b8af64379c100705917236b8de51040aae81ba5b49941f255e6b019cedbd2f3ca1ddb193f6ecac09c456e25b2ff58fb70c
-EBUILD namespace-paste-1.ebuild 802 BLAKE2B c1ada77bead56bc606bcb25b6bfe1163f05327346c21b30e228e72376ce722ab97bce96eaae9f701ef3e125f5d7ff9dc5a78774aeea432f9f7ba3edb5629bbd8 SHA512 49b165354356570a790366e2102958d3be0c28ed0cb628235ca4c2a1bd30cb1182deb9d278fc61f8428073bfca314aae29babaee62a40498ed0c30dd2a07f992
+EBUILD namespace-paste-1.ebuild 803 BLAKE2B 8d52cd1f3e4b211b6006c6fc758880ae44acf1dda217dac0e8542ca048d0b04073647f7757dc3d50e4811f5cff7548bedd7e27e1a303b13ba82691101b689e83 SHA512 8d6d4935b2ee573f4f3068988b1284825153fdd948199cafea6099b6fa0eabd34e906b42bba39565319dd0658e9468efdb5c02d226aa67402831af8acb01c569
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index 6dc41eeca30d..7df8c0ef142e 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index 48eb841bed33..2440e50ea01a 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 956 BLAKE2B 311c26f5de8f12db5cf44a51071b1884c7f36686e7c8992146235113625b23282915b514dfe56d787dfee71c484a013e9711496ed32213a7c6658c57d80c5ebf SHA512 2e44d097bdb52780b14408c58cc0c844c4427f971e4e0cf04480316a402c9cdc411ab7213558d7118249833c352970851605619d2a97820d6db30b897abd741c
+EBUILD namespace-sphinxcontrib-1.0.ebuild 957 BLAKE2B 2d98af64b30f8dd202812a35544adfb8faedf60acb506aa145133420de82ba458a6d7de67b436210d6cc90ae018cbfe52e26411ade149942bec2e83f27f2a91a SHA512 1e8bfdf8c48f79c453459832a49cd2d4e78228f0732d85e3819513a30c2af2ed140efe502935ff06281d52f308486e9c06b983b677c9d72da9de54815628cf15
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index 604aa5a559f9..ff6187a8f2ce 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index f04593be3a96..4318827b6f14 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 903 BLAKE2B a0758d623f03282c76e7e56da8db7efa9a3cdf0d736a42f5e5baa6168400bf7fa6e9975cdf8bc10416e8ff4116d744deb7172f1c933accd56f52161d0bb10aab SHA512 f52d8432403ef6c98626cf4eda0d9d3db30ba97e7746071e93392670d20f52dd04747f3761fad24d48e97d97ccd666f5bfbf9df9b26a05239dd1eeee5a6f4f2f
+EBUILD namespace-zope-1.ebuild 904 BLAKE2B e54e8a8bbc71cb382f549772fa59ccbcdd9a45d7d09371dff56f4caeebb83455b01957828dc6ce5b3408b873711f58406cb4e303d4259ed6439b129beb0a3acd SHA512 e8ab2e6e04ec99324d2eb69c0e5e9ddbe18e7fc567f743c59879aca538db88a92d700b0f418c84ad87a99056711c4d4c90c94746ead31cf1fed88e0467a8b64e
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index 49c0fde0dafd..060e0490c123 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 399630473234..abaa8614311c 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-4.0.4.tar.gz 63116 BLAKE2B f4b15cd105ff79c17eec2b94371596c9a75f7389304f2808449da2e68eca6d9754871e4ef983a9bdaef43049ae64dad5f7c5ac46e55c5c379a79f6f5fae579fe SHA512 e1c00de6fec56aeda6dedb547edfb2f819d8c129feb938be9cee64cd106485d75b2af12316d73b6e79c90694b0d489ddbdc29635e3df9569466d062cabbed461
-EBUILD natsort-4.0.4.ebuild 755 BLAKE2B 5ecc4ada606f6d4d9e8ad7cb06fe281c03aa52168363b07a81182ad2d67434fd5008a755f30ef54af8bae7ccce053c87d804110cbce6741bdc2dde413c6ee837 SHA512 079c315b65ee9126b6f4835c4b35eebeda9e8b09783a143e96ad4fedd22e53576a883cd3accfa6dab8d26a4334b94a6f589c227b0adc4da6210bcb6ef9b970b3
+EBUILD natsort-4.0.4.ebuild 749 BLAKE2B 23d18e0c4c30db473bf71943fc684486571f8362b6ef948b5e4c1894b393ccc4f25a82ab17b750b7b1d0953d5f1250ce5e2f91ce77a82dd9f476016b840b5dfa SHA512 e0c248c92140b32743082fcc7647782b68a9f733fb205e19f3a7743196594831cbc70eb04fecaf1a630513eabc6ba9fc2ae30b9b2be74587526132aedb1b3923
 MISC metadata.xml 320 BLAKE2B 96cd91c11b726c96e73c34ec02c004d240cc88e5e3991ad5bbbe5db1052a21faae41718d467e0e26f9a0813d55c7309d23320f55fcaea41be57a4f8af4ab9520 SHA512 6ddb8e2538028ac71b41a224ca0c2f8a322aa12cf1eb779c422bdcb7796aa342394dc4f6ed46695deb46b5172cf156f81244935db0c4a5eb340537d7caab8916
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
index c1b1def091fd..91d2f74b244f 100644
--- a/dev-python/natsort/natsort-4.0.4.ebuild
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 RESTRICT="test"
 
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 6ba2b5d1b008..c2960df571bd 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,4 +1,4 @@
 DIST nbformat-4.4.0.tar.gz 113683 BLAKE2B f86d85d4f8bd7b2253a958b7489f8a21efa439cd75373740b4aba215aaf2b63c32ebbc88541c9a7c57bb80ef00a996ba55313c3b830063305b9a9b41b713aef4 SHA512 46cb78bca374ef49c4461f230cbb8eb4af611d7be395a448680964c759d47fa8558dd07de96c43921ca171c486707dc823e278b724d9dab51bd30c3dab47ff6e
-EBUILD nbformat-4.4.0-r1.ebuild 1246 BLAKE2B a7dc7c8583de21427e6c5eb04fdb5d419b77f208d4451039b35bdf5b3781e49d3c3228873ea5d185bae32fef37c92480e9bbbea905ee76980033b5be5e1f4fa6 SHA512 4c14c5068ce30873817c97b0f0f2bdb850496b991032f7989684a6a0460fcf15c80183121df0be8f2e24fb0e88c30f64363f673bc0ff258453ba63f8ee116b97
+EBUILD nbformat-4.4.0-r1.ebuild 1244 BLAKE2B 05e194add2b79c08e6b6635de2f0dfb5aecbb3da1de181389d1427a704825fc564633fd5af2fa41a18e434f77b556e4e06fdfb49500f59479802fa9d350091ab SHA512 5b1f9548ef925c350dfc7502fba1487b0d0ebff2ce3a2ebf359313de78e8548594d6be59e49a68fec56b58b22cbd8965fee139e62b17f88940d36d224d2492f9
 EBUILD nbformat-4.4.0.ebuild 1301 BLAKE2B aa5a3b9f8b0e72835ea15a5977f2fd77ca6784fb2c2d87c887bb532ace8f03abc6ed00cf04068bac14a98f3f50ef8319ba83b50bdf949ad2112fccaf6dd80092 SHA512 96b04949dc388fc21642229979d69d6ee799b868ff701af61eec8c6f9aaf5e0ebb0a87bd919b60fe896ba9baa100f9119aea8a32648d642d938b216eaea6221e
 MISC metadata.xml 647 BLAKE2B 0d115b188530f78f963105d8e9e4246328526a00146c79590a288f822a3326521950b0be1fdb348cacea47729c6600a99a82e57b02e191147cf0a05821187d26 SHA512 74b3a7a494e4ae1cd6407c031978a96d18de1e142570f5a42071df743bc55a8756271a3903f2bf22fe5997440339571c41a1210e7982bb1ad46468f84690a05f
diff --git a/dev-python/nbformat/nbformat-4.4.0-r1.ebuild b/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
index 3f52ecf3bf66..61e1acf0cea6 100644
--- a/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
+++ b/dev-python/nbformat/nbformat-4.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index cbfe981d3b38..dbcbff05e731 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,5 +1,5 @@
 DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
-EBUILD ndg-httpsclient-0.4.0.ebuild 796 BLAKE2B 3c63c149f5032f3d0a8cde9d39210c2d6ab0d40dc1b0f56e7f5d2a6eebf283fbb2718f3b327f6a24869705524611b11ebe702a79be95b4c45bd5fad8b3cdc700 SHA512 9136eb413d88f83d3e8321db4bcd57c2ac7792c3591437996c77075bcd521b0844981191c936efac2c03359a731c185a4a100560d436f5fa072145ed790ba3e9
+EBUILD ndg-httpsclient-0.4.0.ebuild 797 BLAKE2B 114cc9d20b84ec0919330441da6501ce50ef6526dbd9beb38ae6963814c3ea203b32bdc7bf09462c29f5811fc69e19e51d38c3c50ef1a3f0186e90c216e47af7 SHA512 39a2e7afab6c2d985897e650c3696201cbf2e0370ea0c569668201f2133bf8007d73b8ac52f92f49288b4e1684f81ab8f6d440e32355a9fd18222bb352beef90
 EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1656 BLAKE2B 3625e426f0d4490b8f0b7a513879bbb65562dc9adb2d6d179921c17f619be446713829478f12aaf747a6e96cc273f634f502833df4cda2365e0dc5b15eedbd8f SHA512 21a5883444f24f8ba8d71f22f9489e5b77e763b631211cc3599698d94c7f865a3ce782f399718cea07022bdcd6824c777338f83f108f5ca6af15576a2462c52e
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 646ddf8ddf43..a96ed1a10945 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -15,7 +15,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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
deleted file mode 100644
index 909677044094..000000000000
--- a/dev-python/neovim-python-client/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST neovim-python-client-0.3.1.tar.gz 51626 BLAKE2B 80e68d02d41c7891fb88e9386866f87a1c78acc9e279de4ce4c7022333f8da3b68ffe7c598c84ff9c6386458639b6ffb4aecbfe72288866dc147ffc6197e94e2 SHA512 9c1599aabce9f0e1133364f8e91dd1b57cee107a11d400f530218ec7ad157c2f58134c1e7e8fc27649b4d8953e27c51bf6e4f0e7565d8c3dab94788759eea229
-DIST neovim-python-client-0.3.2.tar.gz 51954 BLAKE2B 8e0a5eb510797db260ab501b751921f5c98551a06cf874eecff270f5f92da5d24539b857b4cc08494be9dfed139fd3bcab1cdea75ee87d99cece8e1f48f7a1c5 SHA512 c6d7c1a2955c63ac2f59bc57e190886fe0ee0238951ac26205b537d394b2ce2fee3611e8651ae1da5e6e7b3a1bd3bea36912b918b26e01bbb3354ddc2fbd77fc
-DIST neovim-python-client-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
-EBUILD neovim-python-client-0.3.1-r1.ebuild 763 BLAKE2B 29fe7b29cb88950bf6db283846b67b89932925bec4ed4a2e18d5d64f3eebdf72eaf27fa5d4d1c3a12ab2d2460cecc3486e708a2b83473bd69cf7c1ae91a0afbd SHA512 862df85af117b9c3f64e89915330e760eca9df6a839de3c6d9f79d39312837f385fc248c1cf6c18a529caeaa6fd14bed1e29fe6b63d0ca5430c9177a0d53693d
-EBUILD neovim-python-client-0.3.2-r1.ebuild 764 BLAKE2B 5238e8a9d7b3f27cc50f59bb8b85e94d7cb7229ab7248ac9b64723334e13acd2312db016a1a23ed4514bff2e934edc40a25991d799d9309a6ecd8bb993d15a4f SHA512 89c85f9176e994bcec372d68dbe7cf712336acc75ef8763ed5f7123a5d355d8846f6fd5128c18d81ee025446896eb5a3d1894a860c33081a60e69803b23ace47
-EBUILD neovim-python-client-0.4.0.ebuild 839 BLAKE2B b8338370b7311ae99382dbb3b53f32f0d9c11ea0d97bb273f2c88f3c95c60fe408d6723a08f15b274d6e14db7d9cde30fce01e7cba593c001538e84fea5a2ffa SHA512 d8b3e6e240cea0dbbe04f04b4092ebe5d6a8e70a40680b6342542b1b32d6d7ff78e7b9a0737367621c132b5c1597c8698e691ce2045ae04654363542411300da
-MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
deleted file mode 100644
index 22c82feb3766..000000000000
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/pynvim/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
-
-RDEPEND="
-	${DEPEND}
-	>=app-editors/neovim-0.2.1"
-
-S="${WORKDIR}/pynvim-${PV}"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 94e6374ade64..93169a6f81e9 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -2,9 +2,9 @@ DIST neovim-remote-1.8.6.tar.gz 434012 BLAKE2B 1fddb5e4376d3d17c2ff0c00e5f98700a
 DIST neovim-remote-2.1.0.tar.gz 437657 BLAKE2B 056bcc1edff5225b478e72f0b0ce3b8f296ed49d9d8a035bce88b6d26daeda884640f9f6a50b68d91a8ad38a4980f554385e799302a541ce2d6985110357188d SHA512 23f6e98d57d856477b51c77aaa417af8a7a9aa02821f4dbd4870af7b3f9de07c4ba46ceae036ddb17382de4829238114dafa4b2b6d1e6dc71f1d9b4ba935b562
 DIST neovim-remote-2.1.7.tar.gz 438133 BLAKE2B 37bcbabbc4336f31ddb20aae27c748fef80924d095ef285a27105b8276a89dd681a9ea210a4b1286cf7ae5461364044fa97889b803c0de15d18df09e0ad78e2f SHA512 544c2b60b751cd72da793f1ea69fb0fed8990f009320ce6972cdb17af5ae2cc526af85bdc57f03a85cee1b8e3fdcd357a99a91252e44ae0761d3772f1714c240
 DIST neovim-remote-2.2.1.tar.gz 438078 BLAKE2B abbb056a10acb1c4e21c0c418ee2d6003869340eb34df0c0374b947fbbfa2d2e0f64f61ad571a6cad7ffad7374f1df17a519795e61b37b8d6741d566760759e9 SHA512 04a16a1ed5f4947b4fd763432a14fc565300abe9b480037a462f0c4700535d4854012ff08ac64234dbb1fccc1d3f5ba2174f94effc5564879fbcd1c83fee26ae
-EBUILD neovim-remote-1.8.6.ebuild 658 BLAKE2B 9a2b73778662e287b607ebb8bc63a67796f8b2c66dd606672cbb01fcb6af09e2d93f51167b9487795f0c9fca5bf6fc59b6294120bbb2a7cb42408b1d3feb8966 SHA512 de1e544b27e02ad6a4df3c571397714bfe7a4f0d3ad1609f307fcc04a990f0c4eb20cd68c8569ce69975815b7be9d08071767ad14c08cb2369f1d6941cae617e
-EBUILD neovim-remote-2.1.0.ebuild 790 BLAKE2B 6cf59275886ba16caace980eeb9844bac7f47ebb6ba53383116c226ca9b53b8ce08d21ad8406b47c3039ecee43fb852cb2b8ea11985bbfed21fd48e7ae6ae4db SHA512 42f1eecdaae54b3b074f9bd03a3f94c62baddafb4163d2a6868e227cdd096f5f6fee66a2b9d6a9e0e1b11d84999f536bfddc83cd8ac5045812fcfbccb2a30bf3
-EBUILD neovim-remote-2.1.7.ebuild 794 BLAKE2B 25df6b13501ee721659d4dc576a19df7c36b8fa6c9036674faa615185d59881acbe9c4b81d0dcc55fe7e218a0e013dc8ab7491583221c0af50694b56c8a845c3 SHA512 e9cdd1d654e97774cf44655d16023d93c00dc7c443cedb88bedf171b72e93e23c1956fbee8470606d8f6657b20a0037870b1d720b5c888ce41441430ab17fc8d
-EBUILD neovim-remote-2.2.1.ebuild 794 BLAKE2B 25df6b13501ee721659d4dc576a19df7c36b8fa6c9036674faa615185d59881acbe9c4b81d0dcc55fe7e218a0e013dc8ab7491583221c0af50694b56c8a845c3 SHA512 e9cdd1d654e97774cf44655d16023d93c00dc7c443cedb88bedf171b72e93e23c1956fbee8470606d8f6657b20a0037870b1d720b5c888ce41441430ab17fc8d
-EBUILD neovim-remote-9999.ebuild 658 BLAKE2B 9a2b73778662e287b607ebb8bc63a67796f8b2c66dd606672cbb01fcb6af09e2d93f51167b9487795f0c9fca5bf6fc59b6294120bbb2a7cb42408b1d3feb8966 SHA512 de1e544b27e02ad6a4df3c571397714bfe7a4f0d3ad1609f307fcc04a990f0c4eb20cd68c8569ce69975815b7be9d08071767ad14c08cb2369f1d6941cae617e
+EBUILD neovim-remote-1.8.6.ebuild 644 BLAKE2B 52de4b555511b929e1d40241631334be402c47668abcc898087e194b560b50c3851622dbfe376fe16ea0f7844ac977afa08810c849e4e6b3923f599c491adfe3 SHA512 84cb7ba281c31b401f6452cd4247eda876ae44107ab56acced3eb666c6867e337bc66c8aa1bd1125ab89ccf9fe5f2044a8e4f5d8490f14e232879ffba8341de6
+EBUILD neovim-remote-2.1.0.ebuild 776 BLAKE2B 953727e7e184ed0aeeec67024549cdb6c40c0284552641879a24392ed8eedf461d9f09b19d3ba6ab8a94dfba6f5dee43bf24e00a995da4c36072e64585c40a84 SHA512 f222eedcb60d385eca0d8aaa4b21c7289b4988d704d728853ddcea50af98dca63eb69ef2e3e0af659f2a759ebd8c193757965a6a7aa8952d2e036feae2b0b5fd
+EBUILD neovim-remote-2.1.7.ebuild 780 BLAKE2B c5d5860bdcce80cff8a3d9eae36f7bbef915b9038f4333dd3425724716050f523240bfad5b19b8e3cafbd3438c1683021d399fd12988721e93c245a37599a425 SHA512 c7c5125a5c37bf7fbe4b9d0e00da563ef961acc9affc8a79391fe171cb88e0fbf582c67e70258e0d2e486dd397557ed53a24b8093bae66011b78b39b0d770fac
+EBUILD neovim-remote-2.2.1.ebuild 780 BLAKE2B c5d5860bdcce80cff8a3d9eae36f7bbef915b9038f4333dd3425724716050f523240bfad5b19b8e3cafbd3438c1683021d399fd12988721e93c245a37599a425 SHA512 c7c5125a5c37bf7fbe4b9d0e00da563ef961acc9affc8a79391fe171cb88e0fbf582c67e70258e0d2e486dd397557ed53a24b8093bae66011b78b39b0d770fac
+EBUILD neovim-remote-9999.ebuild 644 BLAKE2B 52de4b555511b929e1d40241631334be402c47668abcc898087e194b560b50c3851622dbfe376fe16ea0f7844ac977afa08810c849e4e6b3923f599c491adfe3 SHA512 84cb7ba281c31b401f6452cd4247eda876ae44107ab56acced3eb666c6867e337bc66c8aa1bd1125ab89ccf9fe5f2044a8e4f5d8490f14e232879ffba8341de6
 MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
diff --git a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
index 58a2f8750763..1fbbd4b01461 100644
--- a/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-1.8.6.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/pynvim[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
index b77a7afbcb56..656a91d4f13c 100644
--- a/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.1.0.ebuild
@@ -22,7 +22,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/pynvim[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild b/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
index 432971bdad31..c650f0f08352 100644
--- a/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.1.7.ebuild
@@ -22,7 +22,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/pynvim[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild b/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
index 432971bdad31..c650f0f08352 100644
--- a/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.2.1.ebuild
@@ -22,7 +22,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/pynvim[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
index 58a2f8750763..1fbbd4b01461 100644
--- a/dev-python/neovim-remote/neovim-remote-9999.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	dev-python/neovim-python-client[${PYTHON_USEDEP}]
+	dev-python/pynvim[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 17cef62da570..c97f25c57f94 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,3 @@
 DIST netaddr-0.7.19.tar.gz 1622835 BLAKE2B 31e2c2a0f6f0b0e03494718364f93dddedc13714ff9fe12823fccb34c0693987c01e50e37d10497613cfc226a47b8d55593ed48bf25a7f7e64b7035b83511d12 SHA512 8440dee19d51828cd0dee403ec8c2fbc70e42d8c7c922d1a6a2a752100f9a313c521fa5e0789e024af0998f713599d50cf986e96867d3cc62a4143875e52d6bf
-EBUILD netaddr-0.7.19.ebuild 848 BLAKE2B b7c75b8445763a79078ced22c57a8f5bf61546c26fa0a987a016a3ad474d3f09a84bffb5c38a6d98faf2a3949572d657cf8fc36aaeedf4aa3da520d45f2b9e96 SHA512 cfe5476747281756570ee5b0322c0c75906a1831e4edeead627c0c5e24e32ee8162cc9104862ede0d5b8a7cfc47a1587697cce348a9c2c52c7e1403a5057bf60
+EBUILD netaddr-0.7.19.ebuild 838 BLAKE2B 161387f8299bd0e35baf34e2c4fd755b5f98a1aeacba91103ca4350d8d8ab77b7768f3304f7ee52ef9bffbb2f74eacebd759525df77f2de91202ec7b4b9d4d26 SHA512 e19bc679fcab9aeb24ef104e87b8115536144f79ae360d08b7ff98dd7caf66a043301cd99d9b82cd0a5508af78a3b6f791312ea96b65093a43b7ff64d4521699
 MISC metadata.xml 486 BLAKE2B a7a912615f72839971663e2dbbf5e4bb7fbd87a22cc9bf1080edb6756553f34eea3dfedb7487df85f6d94b0d9d835f5d3b5cecedf7f03e54af2026fac5e09be4 SHA512 91e00ad588636fbfc6edc9212349e9c04227cd388cbffff622baf699741e5875019eb80a811f91c14a76f9c9106bd35a9a45ba9caedc4c145c04b9913afd1a99
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index aa1cc9fc8ea8..b8ebe5eda696 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index b6f8c916afe7..2108b7741d1b 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,5 +1,3 @@
-DIST Nevow-0.11.1.tar.gz 563061 BLAKE2B 7763816e44a9b388edd0a77ad3e814514ff2ed2d28c156885bc6517860e17347a946c7b890c4d0688c4c08f60d76832403a772b4754d527c575aa4d8b4f7f3ed SHA512 a7e52fbf6915498e77a41fb100d4c688fcd0567deb56ec946adf1b1712bcfbec7b7a55c551e414606218146772d5274973af7851a78878635e900a4df5193a53
 DIST Nevow-0.14.3.tar.gz 548818 BLAKE2B 64b5bd46511a4c6c10bdd4335d1e2789e7dfe22e4e4bb014c03fd4949eb701f7f79095e8a239a974d89f0831399766e1b0fad0011f102c70af375d9460a7b63a SHA512 5488be9c771dc9d9b348ee705f8cb1f47400b4789ea574f5ed68c54ecb33e6cc2928d45193137921727f560256e16716adff66ca5179d2a79eb395e0d61c2f05
-EBUILD nevow-0.11.1.ebuild 1017 BLAKE2B ca230d7ab5def154b4514ebefe66377a3e155d8a9a164508769aaa3fd94d440a57ad12ebfad04344c4660672d2d4e0ecff27a60fdd4c42d73b43f787b71566d6 SHA512 3605a23ab8ce892362679158ba6503179c385bb2a0ccd4b74df9f806517306dd55255065aeb6d70b52d20952051fcb376c017267f10ef62f36baac5285ca7ead
-EBUILD nevow-0.14.3.ebuild 1279 BLAKE2B a7b812accb2044f4a01a4f1f1263da20adcf07e2ffd5c6a66ff522a3933a434587abe090c6047348a38d5afb22e5bc43c7710638033f8b1bb3952ca7f27b3a73 SHA512 90fde5aefe40eb20d54c9867a3d6dd5a9cd354572e97ab6942ef80c181d56d78c28b0a44f88d0bd6d547c1f0c93fb30ac515a0bebebb90f5c22872976cfd0917
+EBUILD nevow-0.14.3.ebuild 1280 BLAKE2B 184718ede840240b916b05c6cb6fa9862043a9592c15bd4b414554aacf81dffba01e3f40d4ccef6f84538e9aadc09c88f482e39447156b54c724d878fc943c76 SHA512 05bf25f7853c72a4d0d77278cb31291a17a17ec248a40b7c6d5d41ba4071a4c73e4e93ab60c3706a1c04be29d27dfed5c5a5f146e5c64e15dfa1dee06b2f507a
 MISC metadata.xml 308 BLAKE2B b7948b5e8794cdbcc882fcec0ec0c4d754e44232dd1cb65932a8d92193b16751bcde6c0cc4ea6f79f93083d948b9b64dfa8ea116d085cc87f121cfb9a2c1160f SHA512 f6315f9350d7d43c1c2df8665f38e6373a1b24ff9950001472333ed45aceb10fd7dcf376492643e6af0a995f561f3fa171341303a4935bd55d97ce2fd6db9229
diff --git a/dev-python/nevow/nevow-0.11.1.ebuild b/dev-python/nevow/nevow-0.11.1.ebuild
deleted file mode 100644
index 5522b434193c..000000000000
--- a/dev-python/nevow/nevow-0.11.1.ebuild
+++ /dev/null
@@ -1,40 +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 twisted-r1
-
-DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-TWISTED_PLUGINS=( nevow.plugins )
-
-python_test() {
-	trial formless nevow || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	touch "${D}$(python_get_sitedir)"/nevow/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# TODO: prevent installing it
-	rm -r "${D}"/usr/doc || die
-}
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index 0f52ea39e2d5..aa4687207c4b 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 7cac1177b305..b2a7b0f86ebb 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,7 +1,7 @@
 DIST node-semver-0.2.0.tar.gz 10236 BLAKE2B f4f48761a0086b8a2e79307427b4dc93954362452f653042582024cee593b4b7fefb1a14d3d4ea6832255209b054c9bdb05b02cb101af1e359a1266c472c5149 SHA512 7c636d94a262723c5e50123433c9c7af38424c46711c1b8e001931b242fc9703a084a0426b75e6884104a4adc6104a298355bf3c1604b9cae0ddab7d5f11b430
 DIST node-semver-0.6.1.tar.gz 17952 BLAKE2B f7d48f7d0373acdad56ef6745f09653163f3bcfbed26820ff77205d7bb479b0c9debfd79f719d3eb973d3cec06b0bac3773f06351712c274f90a2dcf5c658694 SHA512 d1f406d6e82f02c3e0eb0f4e1506279b00e7f31875f45bfbd7f87e6777b46676003bb7b39241bdeae616c6506dd85c60e61217460c55dd5079ea87cd818cd6bc
 DIST node-semver-0.7.0.tar.gz 18090 BLAKE2B 669da955b62c35be1a0fccbdce8c66c9de915c5498052858f9f0ebe6a07109947314c904b2077b4306b8fea9f1d0747ab7dcb63a803b00555320e44ea0a59081 SHA512 9e11af16ce7a9a7f2aacd77ff14c8aa574e62bc27f902860b97fda5cc8ee19f54118e90ca39241741da657b87ec2653239b0c4255570ffe4d1ad49e2c9484e74
-EBUILD node-semver-0.2.0.ebuild 768 BLAKE2B 648ae6393a622ac00c2adee49ab067687421793a55d239909487f886a53bbb713cd5c85394842b402a324654f52f0b6c181af4134d40dcf53bac829a92a8e059 SHA512 74813bc1eb489c3ddc256e9d747dc97888af565188720612f94ef600df0dde535feaf9e9e0f621c05e20294350e1cfc6ac326bf0989ba7414af5a07761c57c97
-EBUILD node-semver-0.6.1.ebuild 1101 BLAKE2B a405a2ef3db9b02d8eb9a088a3a76a7ed8495408ba33e9f9c41b95e2bcb1899d0b5b42437b9cc2c917b012bc14025cc3424f2af5a3a535949793ce660a970fb4 SHA512 237042b16c15f43cd71d069e647ec041d11aedf6735b5d7d8c977b02a41a7c1a326fa1c69b72367bab41e4669d81d1ced0a97a7121bd9ceed0172cac32f5e0e8
-EBUILD node-semver-0.7.0.ebuild 1101 BLAKE2B a405a2ef3db9b02d8eb9a088a3a76a7ed8495408ba33e9f9c41b95e2bcb1899d0b5b42437b9cc2c917b012bc14025cc3424f2af5a3a535949793ce660a970fb4 SHA512 237042b16c15f43cd71d069e647ec041d11aedf6735b5d7d8c977b02a41a7c1a326fa1c69b72367bab41e4669d81d1ced0a97a7121bd9ceed0172cac32f5e0e8
+EBUILD node-semver-0.2.0.ebuild 758 BLAKE2B f098ce1d42cacb81514e8256e6e685c8dfe0e75abf3f9797b6b7126c1b3190e63b0ea1107499fab176ee1e49cd14b001210e88060198090fbff8ac11619a5051 SHA512 a8e2aed8d48041177ab0b9ee6d14e04a0345e1e8a283b8a389e9496c7c7a0f1774b8fbe34c00c0a522eef67feb10ed4afa7330cce55ad05e0aa3bb251181757d
+EBUILD node-semver-0.6.1.ebuild 1095 BLAKE2B 54dd3a46c336680a5895f6e7644361c14623a5523241761d8a726b67c3d09c5299e0ebbb747cf2c7a0a02c4d181e96009cbd62317fb06272885499c207e7b9eb SHA512 4e4dbcabe94c90ff3d1f526f06940c4a5f9d551b0cde67bd6fac362bb5d4e2c72ec96419460092814204a090ec178b431f530f9a06b5153ea03678a0ce3cb7f1
+EBUILD node-semver-0.7.0.ebuild 1095 BLAKE2B 54dd3a46c336680a5895f6e7644361c14623a5523241761d8a726b67c3d09c5299e0ebbb747cf2c7a0a02c4d181e96009cbd62317fb06272885499c207e7b9eb SHA512 4e4dbcabe94c90ff3d1f526f06940c4a5f9d551b0cde67bd6fac362bb5d4e2c72ec96419460092814204a090ec178b431f530f9a06b5153ea03678a0ce3cb7f1
 MISC metadata.xml 786 BLAKE2B f7fc468fd3228c485674f4816c1cab1f5220024f39108ca033e4581233d0534376dcc907629774716b5cdc16e7d243e884fe6d17a57d362342e5edd32a4a8f81 SHA512 51b36d6a15b21c6490ba5f19494b23b94bcbe4a5aaf28e6bb6034596b850872bece0a066f3ea6f11f610759492e1060b3d932736254ff0af7a895a9261d74799
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
index 9e3e5f76a05e..95684d15442d 100644
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/node-semver/node-semver-0.6.1.ebuild b/dev-python/node-semver/node-semver-0.6.1.ebuild
index 50008cf7e635..bd3817b464ec 100644
--- a/dev-python/node-semver/node-semver-0.6.1.ebuild
+++ b/dev-python/node-semver/node-semver-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/node-semver/node-semver-0.7.0.ebuild b/dev-python/node-semver/node-semver-0.7.0.ebuild
index 50008cf7e635..bd3817b464ec 100644
--- a/dev-python/node-semver/node-semver-0.7.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-cover3/Manifest b/dev-python/nose-cover3/Manifest
index 7283908eae58..7f7ba4d97991 100644
--- a/dev-python/nose-cover3/Manifest
+++ b/dev-python/nose-cover3/Manifest
@@ -1,3 +1,3 @@
 DIST nose-cover3-0.1.0.tar.gz 14494 BLAKE2B f122523a7864d440e096f295281a0a3d6c8d979a338240751e309c83d67508c7199f2ce377704e864a01c3128b0999bd1e40080bf9b77858216e1f4512c09b67 SHA512 208dbef5bb46a403cb51a9490e68e2f06c6fb08c016a9e866959f5fef1d091ed5c3e502b4a579566f37016a0b665ff969a14b160c78e0c392452198134c20ef5
-EBUILD nose-cover3-0.1.0-r1.ebuild 532 BLAKE2B d7550c5c0193744ca8ada07f3691fdd607080fa5645199bcf0478d65f211328627a82fbe58d97bde0c4c7d6bea3f47317da1a9c2ca4e2a120bea9a51feaff72a SHA512 32950335992150da30256eba3084225721d74a1d868e9049c21955b3473b18bc84f0ab3e218f04dd2692ac1473b610ec82f1f036d1831f8a5b89a96fdebf148f
+EBUILD nose-cover3-0.1.0-r1.ebuild 522 BLAKE2B bcb46b06346aecb64660043bab38745b1bc6eb9877fc49e33146cdb360db38553f9e75cdaaea3e970531d99c387230ecb9bb37d7c0de88b08e0ab38a2ab49e5e SHA512 ed867d7d4702887c9cd7891515341bf34388c6ad3dfd0c7e38f8d3c88bf05c534ee187ba11bb18cbb2cc85da9c09a4b0a4ddd953d4f264e356ef40768d8e237d
 MISC metadata.xml 380 BLAKE2B 1632b64e711e43097c787f4815a210312bcb4c8442c66c85bbe20d4c96ee5b9544ab02022651edbcccd0c7fdad48086dfec3b59b116c5ed4b3f3e349d146215b SHA512 ab22ce51cf402314719b4d03710dcdebaba1cdcdc2eca7922937595728d1c003def562285840e7579385e4b35e9ef44b55fc76a0628959d225e91938888cd464
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index 212da362037b..226eba9744a1 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index 2c5c9b0cb4e4..ed10a9773341 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -1,5 +1,5 @@
 DIST nose-exclude-0.4.1.tar.gz 5930 BLAKE2B f0aec0bd0a31f1b778b0dd22efd12706cbcf609e6236418f10b863809f32886743020d7d9a5f26c890f575adf117f5af19fe2fa49eed12c9295f401be0c02f30 SHA512 07dd869f948fb6e6f23dbecc316d08f23701f30ace3755e560f94deeb62cb2b5e1f5690477260d8d3a7f634e3e9959142a340f4fe0886e2ad12852444244ca3f
 DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.4.1.ebuild 573 BLAKE2B 4ecb6ddb14da08ce9ecaaf6036507fe28118a54cc56b03d9a2e17be31975fced41b8eb877997c9976ea636b76a2187729f85b413f090f5586e2a9ca9b0f05996 SHA512 06c9fc9ddbc39a18998bb505b3267bbeadd5a1138ce21b4b04bfbbf18546e2dc968555113d34fd1896f186cf043e4fcea281c0de427aee4aed85b3a793aeabf3
-EBUILD nose-exclude-0.5.0.ebuild 588 BLAKE2B e4aec82af2f4e4772a07be7c07da2701ecc95c8ef488b9e3b2d268a2f80a439e27103419c57fd70e3dc8649876ca72b7fcde01fea803bd632befc00cb7a400e6 SHA512 7cea1112f51421edcf67daae9743c374043eb6b742a8f81de9b6a8bae6d27652e4d8766248a2a9a1988b6b1868332b06bb82cca1a15aabcadd92b6c209b646e1
+EBUILD nose-exclude-0.4.1.ebuild 564 BLAKE2B 5a106830e3ff1a865dd5660894f40063d3d511b6724eec653ebac98d854481c57fa8e76122eef66fb26d8759355f456d94aa6519bfebe285996843a2a2b5c72d SHA512 1b60f76a9e9c236fcdf1813031989f60dc8e9f1d414f8029a3d5b7b3928d4c799e41780e502e11e9c40cb74da398871c5f027d5289b39759a8354ec1ebd158e3
+EBUILD nose-exclude-0.5.0.ebuild 578 BLAKE2B 8f6b6fdf7bd3d876a66111d57ace47cd9b7326d2f52af382a5367a5698ab2ef9ad96aa75c4e83f1d51825ab4de79dad8f7e6be8572f9405fe0dbf02d2423cab7 SHA512 12da6c58988c45442967179b0e3f0d6694f2d2dcc1eb0046af859781af12c8415c5646a29a3b47cbb36f2cd66cd21d962dab09fdda113a7e3667df2d151c2e85
 MISC metadata.xml 680 BLAKE2B ca3883ad1541d7820da0f260ad4b42fde6af5f17c5b2e830eefe40ff16e03db89a63bb3d450acb51fff3ab5d59cf06eb125cfba96317163c5723c760bbca61df SHA512 77c4bd6bf1d654c9b7a5f22235a56a4861b5cd784dba4459916580e623ef5017c52a79af949bc9fcdcf9ac66f8f84d8646a61393f5c45c5d732693486fac5ca7
diff --git a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
index 8d66bc233e26..c675a7d23288 100644
--- a/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
index c4906b4adbda..3742931b221a 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-parameterized/Manifest b/dev-python/nose-parameterized/Manifest
index 280b4d7bd114..683552a3b386 100644
--- a/dev-python/nose-parameterized/Manifest
+++ b/dev-python/nose-parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST nose-parameterized-0.5.0.tar.gz 10363 BLAKE2B c149af7a4c909ab34ef6da01355b6fe69e5d965aa5b03d323f3207974c888ed5adb8379b3ce043e31baa5bf269e682b966b3a6d46e39a39be777e7bb1ead20dc SHA512 812e3e0a44f1db323f9c134b7438ea5e2c63232b04dc4d8aa59d153253183471784fd4960ffb18f23e14c398e4633515ff933bdfbfdb6954c44af97235d3cf91
-EBUILD nose-parameterized-0.5.0.ebuild 554 BLAKE2B 775214af45cfe6b814a4fec9bcc1ec20e3de9f2580d3aac4d0b8441e93311736b6bc9e0cc3a6c6f18b6167993b367a124400cb851d1323337b4c8f8537e1081b SHA512 b308f6608ff43a116abbc3701ff4f71728992f24fc88220f283d5d8fe2adddb6ccba5d661eba42cc43088a47b13c5f54ce7f764af2da3db4a0f81ae53da4379b
+EBUILD nose-parameterized-0.5.0.ebuild 544 BLAKE2B 52b545ce0efca98151443d3dca5246c24534f5ed8d9a91878fa70b02b57f35ec29b7152141cda62414f0324d5b858b6e31e169704c47dc44f2d7a2172b895340 SHA512 31d66957216d2f39afc591a279b470784695b72f5c334d538c11d5db5fc08cee5036d29c832e453d72f110b2862bac84a00e68932d98eec71f46fd4d73f045fa
 MISC metadata.xml 557 BLAKE2B 4d3521c481995f51817adc64c6ec24360ca387dad6ae23b068ce5bf5b9d23ffaa3ffe86ae41a48d551e2fb99a31b4f94131c7505e45f3b9d9d75c4d694db8a3f SHA512 8b5b5040fc5c105f62c02616b5493f3ca7a1fccfb769f1a94dbf24fcbaac62b908005d119b49d115400c9d4b6a0c5e6a5cca2cd368281d8e1678d26750fe2f86
diff --git a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
index 8c94bd96c1d4..8124d798a361 100644
--- a/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
+++ b/dev-python/nose-parameterized/nose-parameterized-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose-show-skipped/Manifest b/dev-python/nose-show-skipped/Manifest
index 618a3ca4343b..208952c4452a 100644
--- a/dev-python/nose-show-skipped/Manifest
+++ b/dev-python/nose-show-skipped/Manifest
@@ -1,3 +1,3 @@
 DIST nose-show-skipped-0.1.tar.gz 1768 BLAKE2B d79272ac7fd065fe28b589b3234abf527911326d1fea1c23ba0840650d2741846b188788fa9cbeec4a56a78737ccaf8c781ff1f9ac97a5b1d1d79161ba3ab0dc SHA512 b6f3cbc8fdc6af7f6298ad54a5b06bd053d27197368eef1e006aff438d517dba549154eb3be35996b0bd1c291537729438f52709b76c507e20c496b6e504f5df
-EBUILD nose-show-skipped-0.1.ebuild 620 BLAKE2B 4fb5a8d3d9a0d16664e11f7522655c84b4f951e9a7d4bde2f9e3ec018cc9022efc8d4e61994f90b1b93a74c7aa2760c47d2f862782e3caff09c1ac4b833f44c1 SHA512 db7b2dc4398417ae69972c4c0226d134abeabf247c2f2b04361e76e5745e97a3bac461c79115a7148fda61b392f1d4ac160bb818b15c80abfc14d6200a085baa
+EBUILD nose-show-skipped-0.1.ebuild 621 BLAKE2B 05cfd21f447df65e74f67c7b00e3ccbcb40b902830480f0a14c44aacbe997184441aacc23bc1c094e6d5d355e30192bc70aeeac6bf313c07dc92dca38dd123ca SHA512 155f0db91cd7b14ecc530f6fafbae321892f006c36bf17c54b85bcd4f5c88b2efc7a1060f7572ff7050f7dc7c52d3ee13197d54235a18e0186ba561d9dd9a7e1
 MISC metadata.xml 521 BLAKE2B fe86fa52febb5f3de9c44e66437ce7c0f05d88dceb9708cf7f316d6e4002dbdc53496d2bf0f568fbc67a92f01a0f439b4e9f0b561cd49cf16e0591034b3bdecd SHA512 de78277716b856994885a2eb0d7906f3643e1b76ad263385063770581c8c11cdea081cdcd1724182ddef0c799438f5bf94b7de885b4a3f314df6efc935aae2a4
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index 443fa1ba47d9..d7b0471a4d57 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P: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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index c6d91412d2fb..eb6064641094 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,7 +2,6 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r1.ebuild 2458 BLAKE2B 38342b0b09f560ea1bacde303515c545b98ecc0bf825d9d1b038267ea3f7e53869add6380a4260eb1ddb19cc0e3ba336a6622620d52d49df81922186b735f7e4 SHA512 06848700629f37ec30b7b5013d074cd12073930011de2edbbd7c89a701765a3df4b1212af2ffda334cd30c9dc94636f153d6cffffbe77390880fb930ceb5649a
-EBUILD nose-1.3.7-r3.ebuild 2763 BLAKE2B 281ce6e5aeb2d27a91c65d36df890aac70892a247829c094e52b7037b4e3eb06cb51215a25b7f3d776229a090cfe396971ae2d435e00875cc37eabee69822259 SHA512 182c287271f30d4803255e09ce126962d52994eb3aeaec42cba73d3920461a70b6ee61a11d9e049caa6c10f9e5aea18b7373580526dd3729e63d9c2ec9269ec0
+EBUILD nose-1.3.7-r3.ebuild 2764 BLAKE2B 5336eb1c51d1b04fac45645008401e4903af02d82292d9b905894b80f3b5496b1bebdb5c6725caab5d37c100838b9aef75583274b0038c1429d46e7578bd092c SHA512 57a6eb071cd40c1459278d2aadfbb64af093f58c55f810316eb344797016dbcba4ed1a83e514e1cf7e9c7b381ec419e17c7b21deb1ed1f69d580244cfc3baac2
 EBUILD nose-1.3.7-r4.ebuild 2981 BLAKE2B 389e3dda09e4f3bbf0e74750ba90f255355a4ef04abff50d893b678450534b69a2ae1e0c776338b63201c37514f221f987947c464a23739f8163339c4643abb0 SHA512 aab57e3eec5b480b49880811cde228b109ec665f0f137b193187d1214c4a2a205e92f2ab6a3c748844ea1a3567bf89cce8460997b383b77c50c57912ff33c05c
 MISC metadata.xml 499 BLAKE2B 9d6ffb5484f11c5f4c46e0013d4e93d01afef48339e83f4e4fb7d86776267256b30da1aba61c2609e5163abd012a57bc820ab77ad79577e748b56f7e8c327cee SHA512 c037d0a22b7bc9f61c10d8223932f2ebdaab4d9ac538dff56ab7e6fa263734992e8834cf739b7d787cd1243af5a9ccfccb81c2c0e4d2e8889498a707c96bd44e
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
deleted file mode 100644
index ff808e17ad4a..000000000000
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-RDEPEND="
-	dev-python/coverage[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
-
-PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch )
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile ${add_targets[@]}
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	use doc && HTML_DOCS=( doc/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index 2d073ba12305..ba71a3981d5f 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose_fixes/Manifest b/dev-python/nose_fixes/Manifest
index d637a35670aa..898d46a41cae 100644
--- a/dev-python/nose_fixes/Manifest
+++ b/dev-python/nose_fixes/Manifest
@@ -1,3 +1,3 @@
 DIST nose_fixes-1.3.tar.gz 10033 BLAKE2B d6b7f9bdfb803e59be6eb400004f595ad717da7f8967c38006206f51dd599bd42984dab6a9f5ccaf30a74d119da55ff0282b3bb5c9bed9c2c37360865903f12b SHA512 2e054c04493cf11f06ee8977d4922290dbdd7928a4fe4947a76b6cf300c2d16796b578e48c0ea514f3c5a38e011fa9779e7d308eafa0ec12cc0622e124494d93
-EBUILD nose_fixes-1.3.ebuild 959 BLAKE2B 184cc9e294583fd421b18efc74857e73f9ddc07cb5f29728b2a4d89f3cf51d8be44418e890dc45cff0d9c9cf8699333ef718f3429f04b2d7ae83629b98df31de SHA512 23e097eabc1425f4186ba9d65bcf2a8cb64a8b7faa5768eecb6722b2b73bf817c30a598d304500bc80f22d34d1b4cad1e0a4fbc08f1dcd2b4f39a60149e4e0a8
+EBUILD nose_fixes-1.3.ebuild 953 BLAKE2B 0c88274fea6e7f97a91ce3165849053baed866ce59a0d69eecbae681114ad63a59d4e23371e07479197ea2d79ca27da7b427ad7e765b04665c2e2b3878b6f04b SHA512 4fedb3b4867ec21157ee07136451d36f3978d8117e998ca4a64f4ebf600fbce76d768e757bf64573c891c8ee4aea2f2cd156da4326db99c527bb68abed5e1742
 MISC metadata.xml 323 BLAKE2B 940bad81d1f68d7efc154f3f4798633c74ecdad7b897f08da784fd7b79857d7ce690592e2370cf3a62cb213a696d21805a03d65eef15eb634c000543aac47219 SHA512 2795d2ebddc46db61f304647a32627fb1be7370348d66962cd9901dd59e688ab7a230d4903b784eddac317bc9c2a28634fd9c7a90524be580f6979577fbfa95e
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index 5747c3ccb346..5abc2100e901 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nose_warnings_filters/Manifest b/dev-python/nose_warnings_filters/Manifest
index 74232dd7f7c6..81a45c8e1f5e 100644
--- a/dev-python/nose_warnings_filters/Manifest
+++ b/dev-python/nose_warnings_filters/Manifest
@@ -1,3 +1,3 @@
 DIST nose_warnings_filters-0.1.5.tar.gz 3895 BLAKE2B 90fe9d0255227159cb4465648f45aa33623bf31b2182a7579d2f7f17687a832b2c96e9c2b3f0b5c477d808907d92bc8567d2aeed6bd13dcd28878394e9726fb6 SHA512 7ada463840bb2e3a1c7e357c231f9c7d4c7ce9f24fe7fe1e33404df41711663c8232001f9a258898f49ce89bb542a942240cf7312ee41bc75f86ca2015378405
-EBUILD nose_warnings_filters-0.1.5-r2.ebuild 856 BLAKE2B e82bf338e84a6300906975eac89bf35d192c011bb828c9baaebe42eeb274deb922bbeb0dfc67fa95bf6c02c5b2867d45ebe4176360cca31a394175a060ab55dc SHA512 2e2ec0477b2bf2026702d8c3e0dabf636497cf38f06a35f71c4aa1666063b00bda18faed24267ad0b2c55988bb321851e9b3060fc7c4d1d4c0149520aee5cca5
+EBUILD nose_warnings_filters-0.1.5-r2.ebuild 846 BLAKE2B 99c1d5888d75a3ebfb3050ba76f4a3139e6b825f8504ce28eefca3792be52a361b17f0d7418432df6e545e5305ded754d58667841d80af7f8d63dbce71c706e1 SHA512 16d3ec434bdd29fe5ad32e644811b559f4337d654838c408aaa58c7c9c4001490476721e727fd1df8e3af8694ac559e68c58a660334ba4504750332138d6c5ef
 MISC metadata.xml 393 BLAKE2B 077fd1e2172a4fbf35315d6597ead3dcf760145272ed4855df1b8cfd484addeffbba47bb7334c9fef8b404b70f3a136d8687d270dc22607306b68a79fbeb764e SHA512 5a579ee892244135abe424c05a9ed28ccc0d04e2e0dc87cc14187de9b5f86e00f8c51a762c0a55333f92370df2e982cf82babee6dec27205f15ede1aa87bde11
diff --git a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
index 62c712d5d4f5..1a3527617a3d 100644
--- a/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
+++ b/dev-python/nose_warnings_filters/nose_warnings_filters-0.1.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
index 71534a9889c8..ab97749ed93f 100644
--- a/dev-python/nosexcover/Manifest
+++ b/dev-python/nosexcover/Manifest
@@ -1,6 +1,6 @@
 DIST nosexcover-1.0.10.tar.gz 2744 BLAKE2B 21be6cef21fac2e230d87df6e49ebf5263c5de35f68d4576932b0990f61207c17e8d38a533f57ad59cee811ef94e3e3fce4b436a7a17396952196c8613ab90a7 SHA512 dbc3bc3379676d56711c96a4cf2d6b46ee77b5b04ac6a5fb2d58fee780ee547664738b9c6b248e3af64b3d0b7e6c9b44310c8e7025551df543c547da4239f52a
 DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
-EBUILD nosexcover-1.0.10.ebuild 624 BLAKE2B d514b5e651339fabb380687f86a7eb6dba977ff777c7fad1be03e0213cde8e70f55da38e6964cc0e7be8d36b53d82dc63469e9e20064e0261221d456d3b6c13f SHA512 25ac218d7a0a9e077e17e5a8fcdd10e79077ec16a9a1668884f2f2a9c15c46deb61ef13931503791a918de9ddf727b5a91080f543355ae5f8bf0013cdf8f4822
-EBUILD nosexcover-1.0.11-r1.ebuild 637 BLAKE2B b2c0ca4905de6c0142d9f7bacd636f17689ac27e7d8af763c3ef25ae4e0af857eb6efc49936f74f98bd3518bb9b4bacf269061541506ada296db14c32e835190 SHA512 63f50155acbdb37ed3cebbe6a08a3c47cf1f148da793f50584e4d037fcf8b70f97cc1e6a8554f81473887c3376835e01795278c7d9c58b0070ffc085c74948b9
-EBUILD nosexcover-1.0.11.ebuild 637 BLAKE2B da63584167c8bbb28130fe215a78e055c40c5affa478c88893d9bb05fae308d9422593f3f01b73c079e210fc284310e468893cb376d56766b5b3bd97e7797ab4 SHA512 b430e5c5ba81e95bd22d1ca994e799fd3858562497e464e8b84763d8b1f7cd875e65212268d37dfad604eaad735a1678287ad4dad1115313439dc8f512f9804b
+EBUILD nosexcover-1.0.10.ebuild 614 BLAKE2B 72658e3212705046500d60dce5eb89a7efaee5a0d8d43c03159b4bcff7db80e836729a312090c5e7980cf0397d26cefba9bd0280b5f03eb48cf0efce78b60d32 SHA512 99b7d6dd056a79c93cf41b952b9972f227b7eaab13fc14da2e5de853ffbd8a1e4a0dba41867c4268edf5c4820e65e261fcd485bef9a2052d46e718f272a2c387
+EBUILD nosexcover-1.0.11-r1.ebuild 627 BLAKE2B 9738485dcc007eed40b3053e21c9febf19be8eb30166314671f3a82cc9f8a5689fead0c3d665e2dca003f161e931b8e8ac4904d02d1a5cec3c85d5aade8478d7 SHA512 c8f2ebbab1f782c3bc0e2a6ba33416cb19751157f15c2044f828b9106dceaaef9a9f6befdf8d68620a3e584416d4b13261140c3050e75e0a774ac9a09e2aead6
+EBUILD nosexcover-1.0.11.ebuild 627 BLAKE2B bc6fcbe6f187bbb1278f953135d02f1d00bb1953f339149a1bd2568a836e995536f617ec2e4a135738e47ff7b55274b59bb030c1090f2e367a0e19598a52b11c SHA512 31abde1ad20a154cdc27f9418b55cadbdbb95bbd0063db40ec75b1c09330938ca025d604a4d592fb646d53c116c0d05abf27bea97e1fbac50c3514d15c08daad
 MISC metadata.xml 498 BLAKE2B b05a2fb406d49aa821b926dfdee1f45f12dfdb8bbd40fbbc064e9b3823a9dd6ca85609f860cac25bcf7dea29aa4f6050324fa36c6950a9f2c7240e4ddfe94790 SHA512 04961083f04775b64d14ef2be39d6a8a2379f6c82234316d29dfaca2941a24dbefff0abca2c5e8efed29a4894885c65ad49bba5acd0a30a8e71ebb2d0fe98e59
diff --git a/dev-python/nosexcover/nosexcover-1.0.10.ebuild b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
index 2e2d2dbac0cf..3fdd107dfb6f 100644
--- a/dev-python/nosexcover/nosexcover-1.0.10.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
index 9c6f9f53676d..13429d1c0402 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nosexcover/nosexcover-1.0.11.ebuild b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
index 028f5240d670..82c73325b504 100644
--- a/dev-python/nosexcover/nosexcover-1.0.11.ebuild
+++ b/dev-python/nosexcover/nosexcover-1.0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/notify-python/Manifest b/dev-python/notify-python/Manifest
index 39ef860043d2..4318b7cff013 100644
--- a/dev-python/notify-python/Manifest
+++ b/dev-python/notify-python/Manifest
@@ -1,4 +1,4 @@
 AUX notify-python-0.1.1-libnotify-0.7.patch 916 BLAKE2B 22fbcd4a8c1931fe78a342d5d82df71664f803d6eb935003c0f0e46bc7f562b10b038983744ba16b883db72895ad7f1ef57d9fadb3c9c6f93219b94aa47ce89e SHA512 1b8c1e315ecd842925335d2115a941df47569a9557e79eca734a051e838418d0fe0d315e4f8b41de219662271dbb6e1faa8398374d1728e92263c84feb0ccc66
 DIST notify-python-0.1.1.tar.bz2 214514 BLAKE2B 7e7496b817abedc5577751a6525ca928c6f7e8cc51aeac810a0927e46533d93d4da73b5f76846a68cde025dae24000601a5745eb93037b149177d4941cbdaffc SHA512 67021af81d77b6a1ead4ee2a0ab4e8684c2b60c672ab7aa09a8f89d71cf646453d9be76455ac28616d70645019946db1731a7021fbb91fe66d9e057fcb3815a0
-EBUILD notify-python-0.1.1-r3.ebuild 1283 BLAKE2B 0b2bd349589d28decebc3d02120c553f381339c635cc68fe7c86096066fc341123f649529deb0a4b50bebe96b6e9a8b66902d89951585d7d76de722dcbe8c081 SHA512 1aa4ad78d84382a1842475ffa4fe904882a3eed0279ec8955ee4962c05bf4d8e97bb7065556e702cf7f696894d9503dfe6ce4f602158b6d0a4ed06d0ee4e1501
+EBUILD notify-python-0.1.1-r3.ebuild 1284 BLAKE2B 57e8e944df94b61a35b94fb3ebfe4a4a07f8d05daee93940736a2072fb91e37bf1fdf1ddb3c67660d1b8ed36d34196a366754d9c6eec832dd2641403c1f34533 SHA512 49aceb588cdce6ab75292b5cdccd9f17f542016dd2c0e5d5e54e291775849a22fb7c6d13a03511b126c2062a68f7b06a5ce431844e4487663171bbb30aa463f5
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
index 0377d6128370..fe0d5ed06b6d 100644
--- a/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
+++ b/dev-python/notify-python/notify-python-0.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index a0e9e82bc7d1..c0fbc12e751c 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -2,8 +2,8 @@ DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec
 DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
 DIST ntlm-auth-1.3.0.tar.gz 40684 BLAKE2B 74c2b914f508b5291cc2a23ae99417db5e5ad9fe107c03f63c795bd4da202db2f1a4f6f289645d2164e708a5a5a2e3bf626aa749dff3367420d669965c462b71 SHA512 e2d5401161ba6f9fed377a7bfed501d49ad64d5104accd7df298747abade34a3ddac9e68332416a3ab68156e9bbf7a8de6a8a271542d080cafaa84ee19f01986
 DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
-EBUILD ntlm-auth-1.1.0.ebuild 476 BLAKE2B 65d84ece4a44b487584516b0f53fff76266cc301adce2501909a0d8862363c481f1c00a3090052446eb6fafc27fcefa8d395a3bfe78123e403310c9f1e8b8dfd SHA512 15ceafabc3312a9037ef6006e9bd5c53d02b27e56f5c24e76d602324cf984c15ce7d95c1a7f4068e27a47323d492051a57c661751d2960e5b4cda63b41e44fb5
-EBUILD ntlm-auth-1.2.0.ebuild 476 BLAKE2B 65d84ece4a44b487584516b0f53fff76266cc301adce2501909a0d8862363c481f1c00a3090052446eb6fafc27fcefa8d395a3bfe78123e403310c9f1e8b8dfd SHA512 15ceafabc3312a9037ef6006e9bd5c53d02b27e56f5c24e76d602324cf984c15ce7d95c1a7f4068e27a47323d492051a57c661751d2960e5b4cda63b41e44fb5
-EBUILD ntlm-auth-1.3.0.ebuild 523 BLAKE2B 89925d7c9dbbe26b0d7335d8d4814f860b2035394b08193d49e92ce34032fa9d8e21677b011c9db84ac1fb74dae50666ea00f40e834c9effeb4fa8221c83db43 SHA512 adf740f026802b87a64b2997c66d0a3ea4bf86631e79dcc442066e29c6f70980e36a8e467f9379ab99945fd81909c919a96d7bd70a1373fc68c7c7275f72fa6d
-EBUILD ntlm-auth-1.4.0-r1.ebuild 523 BLAKE2B 89925d7c9dbbe26b0d7335d8d4814f860b2035394b08193d49e92ce34032fa9d8e21677b011c9db84ac1fb74dae50666ea00f40e834c9effeb4fa8221c83db43 SHA512 adf740f026802b87a64b2997c66d0a3ea4bf86631e79dcc442066e29c6f70980e36a8e467f9379ab99945fd81909c919a96d7bd70a1373fc68c7c7275f72fa6d
+EBUILD ntlm-auth-1.1.0.ebuild 466 BLAKE2B 0cb17e871694c673b235738fd99d7a6b2af5b26fa216ff70c313d184aab07b459753ea13c419d61faa3211d8e70ab05f62354db1ebc88e648d067d36d51bf840 SHA512 49261a38c2cd7b9ba3f160d3517d4400de888d2c67a99117d34aef74f4b27ab6f2821373addae42d07e7a5c001441d9613371c4dedb2dc00006fa25b1df5dad3
+EBUILD ntlm-auth-1.2.0.ebuild 466 BLAKE2B 0cb17e871694c673b235738fd99d7a6b2af5b26fa216ff70c313d184aab07b459753ea13c419d61faa3211d8e70ab05f62354db1ebc88e648d067d36d51bf840 SHA512 49261a38c2cd7b9ba3f160d3517d4400de888d2c67a99117d34aef74f4b27ab6f2821373addae42d07e7a5c001441d9613371c4dedb2dc00006fa25b1df5dad3
+EBUILD ntlm-auth-1.3.0.ebuild 513 BLAKE2B 9153dcc58e486d49a30c80afbcd49988edf684a13856b2e57c0803700db76e788b134f0fdc2f63a503df65b19e057efa22827984db6571cccde13b2e868fbd4d SHA512 2a8c6982c2b662724e010de55ede58c0d91b9c4f90834c03bb47fb2b0446c7f3178b39e0e5765d6be8c9604e7cd13696aab2a9f4a69a36a0414259bff0fca841
+EBUILD ntlm-auth-1.4.0-r1.ebuild 513 BLAKE2B 9153dcc58e486d49a30c80afbcd49988edf684a13856b2e57c0803700db76e788b134f0fdc2f63a503df65b19e057efa22827984db6571cccde13b2e868fbd4d SHA512 2a8c6982c2b662724e010de55ede58c0d91b9c4f90834c03bb47fb2b0446c7f3178b39e0e5765d6be8c9604e7cd13696aab2a9f4a69a36a0414259bff0fca841
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
index 4b2433e20090..f458dfd91960 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
index 4b2433e20090..f458dfd91960 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
index f34de2bf8fea..f0903195190e 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
index f34de2bf8fea..f0903195190e 100644
--- a/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
+++ b/dev-python/ntlm-auth/ntlm-auth-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 82e04833598b..e95986b7c174 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,7 @@
-DIST Nuitka-0.6.0.6.tar.gz 2011509 BLAKE2B 1a5d37acd50bbb7d1a380306aa18d68ab6559fe3d90b988032cd36458e5ec663c2ba1597f50da89c6b2360f35cd576a2219860b0d74bb3d835db9525d10f22bf SHA512 d893e49a2f91d310b4a86ddd1566990b66ae202bde642af8b7e45554ed6b2abf4b6b694bb03d020b15d9b748c0dd31ac1a79c77fcc9d15468ce37faf475e8beb
-DIST Nuitka-0.6.2.tar.gz 2064701 BLAKE2B 9144bbae98584c64a642ede1155f26f88afa1ffe6d1e75f88039fe99f191e0939efc5ce7e71b2b9c661004213990e4896a392e2fce995a0649d45ed5b3a18168 SHA512 94547cdabaf6c591ff5d49179dc4538fa624b40a6d63e318aeabe371b7cfdbd9b1c9c41918a4ea1dfa816a7222c5587ed17c1980d89be6d9151ecc8cdaa8c5a5
 DIST Nuitka-0.6.4.tar.gz 2211662 BLAKE2B 4831782516503f128911321bb9755db9ea7d48fe0438dbff1fbc9ded3c690dc0d2f4dd14f0f5a5b8c66cb2b8e8d380e9658b590a48316497b42f78e68a8ae5ea SHA512 89e882b5fa37fd5a1357f69e13db7c340bc6d5471e18b7796cc1b7bd9970c480f8fecb9a7b11e19e41e936c5f90ef204b7409146a362beb6946f3d8f88cdf93e
 DIST Nuitka-0.6.5.tar.gz 2239333 BLAKE2B 687b82863ad5cb78d1c1b3b353ecee8a44eccbcd73eee70181bfe274d7e9d6011323bde9e320cd13c8c67deeef86de5e93c61592b56ca9fa9412fcfa3d152a06 SHA512 785dc60b4a42061401066ed510a3bc82988a0f8947372dcbd381c7b9cf6c2907c9cc0510c8188b0526c7fa3d9f3ec43207b46190a8485cf1e546b5316fa6dbdb
-EBUILD nuitka-0.6.0.6.ebuild 611 BLAKE2B 0cbb2f8b442e92e0d9b86d97433252377dade212cc7a20c21eb855c07ed301da43fae6631986eb11feaf7ef3851c678da99eecbec07f3ac35037c97971e9b2ab SHA512 69858efc5cf84fe7365abcf6dbf77a99584055771a5960a9dae10a858c78f352e1e7b07bf2377ecb7fbb98e5ae05b6239bc96f4f3be0a8ebe484ed18863f67b9
-EBUILD nuitka-0.6.2.ebuild 604 BLAKE2B 3704b5e9b536cbe7470b623cccbe4c0452560238f9b209c563e91e58e74985857f6081110a060ec43387e221fed6b2a74ce465b2f61d1cdad12d4606c36f330d SHA512 810966bc5bba9019145a085f4506b5b1e6981711bf77ee6649957e5bba002a75d93c6eb5f91fc017447d709a18f16ba17682738c76b18ce1f143666e5c57a1bd
+DIST Nuitka-0.6.6.tar.gz 2276002 BLAKE2B 74ada1032d5eef3068e6c0fbd088437014de8752b71ce98b90bb868bb7241efe301d4fa1ef661f00f54730ca3d27470cc6c804bc2b394085349ad9a1aed0feb4 SHA512 82752105fc5b5d5d09d460ba25a6424420ff055ea841a32c6e32ec9099870ceefe06dcadab347fe689cec94f4d8891a4125910f7cff504a8aa736139b29c2a8b
 EBUILD nuitka-0.6.4.ebuild 608 BLAKE2B 570f7b1d6f1d083697fb43ccfbffacc3e3453feedce38d96d01ad3cc0830b1a0795bdb544a244aad9d50955eaa996f8ae4c5eac1907ada04ac048244b65d0027 SHA512 abd45235a5a25cb265c0040654caedb1a8cbf78e8cc9fe4f1a7e175c1a512db37c8d7a34ddf254a9b2bff68e68afc0bc341cf7902f6248a9b418a2fa6b0160f3
 EBUILD nuitka-0.6.5.ebuild 593 BLAKE2B 8325c93f8dc27e306eadb25769cd9dd5a0ade20f44c39a133caac09c509482a17540c8b27df9b47f79737d800c48a373d4e7123fa401cd0f3b05e5ee5876046e SHA512 b10ffafcccfa17fb29d9c741355a3e97c7c3310e0d4eecb0d3509be81864fa96fdabffee1c8c10d63d37b6d6b8d9270fa0454c7ba059964e3d59845023b038ac
+EBUILD nuitka-0.6.6.ebuild 688 BLAKE2B be99eea725e484957bf4d260081f6bfa20b033bf1e91d57e5eaae809095be5b7b122ce9c3a72199e4653e413ccb74dee083107cd331ede7afba651f6990b83c8 SHA512 7e1c022f0ab929c82d536ae2ca54817fd1a644bc6c6ebe73887d2518041f29dd5e1eac51bf4284204887e5b68dbc69ce141b9b19e09f5c597bf192d6709ee0ca
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.0.6.ebuild b/dev-python/nuitka/nuitka-0.6.0.6.ebuild
deleted file mode 100644
index a90782ff64ae..000000000000
--- a/dev-python/nuitka/nuitka-0.6.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="http://www.nuitka.net"
-SRC_URI="http://nuitka.net/releases/${P^}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-util/scons[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${P^}"
-
-pkg_postinst() {
-	elog "nuitka needs app-admin/chrpath for building"
-	elog "stand-alone executables"
-}
diff --git a/dev-python/nuitka/nuitka-0.6.2.ebuild b/dev-python/nuitka/nuitka-0.6.6.ebuild
index aafc213fc093..08ab6c59bf2b 100644
--- a/dev-python/nuitka/nuitka-0.6.2.ebuild
+++ b/dev-python/nuitka/nuitka-0.6.6.ebuild
@@ -3,8 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 eutils
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils python-utils-r1
 
 DESCRIPTION="Python to native compiler"
 HOMEPAGE="https://www.nuitka.net"
@@ -14,15 +17,18 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
 
-RDEPEND="${DEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-util/scons[${PYTHON_USEDEP}]
-	"
+RDEPEND="${BDEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${P^}"
 
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
 pkg_postinst() {
 	optfeature "support for stand-alone executables" app-admin/chrpath
 }
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index a77f548d4700..27871284f07e 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,6 +1,6 @@
 AUX numba-skip-tests.patch 494 BLAKE2B e871220602a0e27045d2223cddb74372f9712600336d1193d79db878cf63c87b96c832e5e2ba734d07679feb0b43cbbb38c1310431035ac59a3a15969e353dac SHA512 d4f4eecd0daf793cb7b6dd8cb2c1a462e8dc726c5f8212aea5b22ae837200c70c7eb331e6018f83bc895096e0c8e93751f32fea624de157ab154122a59304069
 DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
 DIST numba-0.39.0.tar.gz 1782489 BLAKE2B 77a6afe587ce3ae0ccd782e329e626d63ab58b84a2aeb836710fc0c13dcc88e16ab36e7426c6d9ff88c6d5be854915128dc2868d7fa71511ec9c8eea9debffe7 SHA512 f9cabf39fea543495425ba326aad34a52d317ebef61e5b298588764214bb396ea43871d32875f0882a36909bb12fc2e3807c38b5fc60ff5d9e6dc9ccdd36bf6e
-EBUILD numba-0.37.0.ebuild 1123 BLAKE2B 67eef98205c03b5eed92dfb12a0b624f32107d20e3f4d1e624bfb4ab54b05b454b529fc0380fd23c3d52feee5f4c5d2ca1f8b695c45cce4db9d455a5e26baaf3 SHA512 eff449200d782b616e0077051a82bacf41503c4ca30dcd80f3d7b0a7ffad10f402c8b1d589e10bb3424a30db058b53687eef0656baef8a97f6c549ce13a52254
-EBUILD numba-0.39.0.ebuild 1125 BLAKE2B d9711384e82b8c38f013013e31ab23595c7989adb6d37435466c73ff65a22086118c1218be848315d1ec2757a4522c8cea822023f3906a9ecb2b5266e0add668 SHA512 c00efe2af53f18fd8b490a770c5f6b10544e2a39dcfc38fd0a26ac4e726faf28911de14b53ac4f38e75f578bc8b1ae3757e71c69f8fdd824db43d3fba43ecabb
+EBUILD numba-0.37.0.ebuild 1117 BLAKE2B a33511c08346f3b9bfb13393ec90067b245878ca02ea81ca6f736ef47f7dd858b165b626c2dbf40bebae959567aeadee6206c079faf450e3db2655f259fd70a9 SHA512 bb43e79936c8d7384e1403ab3976abdacc12100b69688ebf4527eec2976c1aa106771284708d39a2e31ec38537ec6943ba7b86defc15e9f690d478c008e9c9ff
+EBUILD numba-0.39.0.ebuild 1119 BLAKE2B e11d6d6a67c20bc1cbe158b079336ca8fc292549f1b0cb25de070eecdfe5bfa0dad20ae4b691b791e5ebbed32534e5b5d8cd4bd4b1b550ccedcf5ee5355c14ca SHA512 2432b442956034d85a6022a5cd0dec5ccacf9f47de31ae1863f3043544fb9f5c8c99fba32968b0a311e0d4af3d378bf4aae6f4fb119a72d6595c18980eaa1b4b
 MISC metadata.xml 817 BLAKE2B 38ad9b5ea5c0882357115f2e0e10747e482de1f49deb0185a258172d520b4304334834ca3a78a3b2360aff8336a29cc248e7478a0bfc6e0833e3f9ea8d2865e8 SHA512 16271bf2dba4edb77e4cf05f95e9bea6c5534890c1303f6d10b9b7449a26b05ab43acc28fd5691d1433ce15ee87214c5a414dc652eb019bb1fb87acfa37150e6
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index f9db222ec831..19db6acd29bb 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numba/numba-0.39.0.ebuild b/dev-python/numba/numba-0.39.0.ebuild
index b7559a744e07..4c52fd569a33 100644
--- a/dev-python/numba/numba-0.39.0.ebuild
+++ b/dev-python/numba/numba-0.39.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 0ec218f01ca2..473f13ba9bdc 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,5 @@
 DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
 DIST numexpr-2.6.9.tar.gz 94419 BLAKE2B 22492c1c59306fbd93174b5bab2ffaa32628c52cc570871bd6192a4589b65b6f679a77c8ec6f37b0a2ac09f004364a2ba87ecc26f459cb2d4b3b2705196b9fdc SHA512 d43845fb63c1e7b645b282d251f7f112784dbc04b61af1ffcbb9646cbe2e3a9f5d38aaa000f7d49880abe44c25205a6ef1e284577d36868220a197cdc0e55166
-EBUILD numexpr-2.6.8.ebuild 1385 BLAKE2B a53da3819f962e909c12628592b3069b8c85e306e1dd7f8e225f491340abc657af249a1c362fbd8e6e9754138cdf3554ccda4e9c391ca7b119702de60287b5eb SHA512 1d842aa3325a928e799ccc048d5cdd3741c74c003a9bb8584385f6eb4b8509f56a9585c14db249b8bb885b6dd193f1255cec7cad4ea06fcd84f6226da6ddc484
-EBUILD numexpr-2.6.9.ebuild 1395 BLAKE2B 14075fbc6dca9f960502383df450a46819cccc21bb8ea0f7c04c7c3bf85013f2df2cd2ad21bc0de3e896276290f8e432c79b4fc649854cf2ad2ffb542e24781e SHA512 2de765cee05461b6bd2af8f38dec068438ee9f742ea652c9ee4418a7386b3f6efe8be0955ff2ec4e690236bd04fe0f5951cdba59d5c58f3d461cd9b6f2eadbcf
+EBUILD numexpr-2.6.8.ebuild 1375 BLAKE2B b96942d508d368fefafc257790474b5466a1030ecaec56eec91f5a8ec1453b0d1058bbb2a44bcc9775719ed9a337fdbe940260506ae58047bc05cfa97264331a SHA512 1cd6df149179978fe645d84181e4d021452f6adb5476909bb5de448e4e863c3416cd5c3948bd04866aff20998b141045da5c25ff93ef61bdf2323e2558e8191d
+EBUILD numexpr-2.6.9.ebuild 1384 BLAKE2B 1079484cc597630dc930b9d9e497bef95903cbb8284ef5aca62a1ef95f452f3bda92fcf9ecece5eb00e53e5197dbf43e6ee5b3fbb37942454ceb27eb3b4cd343 SHA512 f57becdfa8847a6752dc1194d4157fb3f9eabd8375260a73de18a2f9af889a42542c53b95089b8b95eb7d4c9e94675f4cefa1d3f82f49ce0abfecea0e5b7dc25
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.8.ebuild b/dev-python/numexpr/numexpr-2.6.8.ebuild
index 960a34ddb3fd..525466c4dca4 100644
--- a/dev-python/numexpr/numexpr-2.6.8.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/numexpr/numexpr-2.6.9.ebuild b/dev-python/numexpr/numexpr-2.6.9.ebuild
index 08933804d0ae..315336382eea 100644
--- a/dev-python/numexpr/numexpr-2.6.9.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index 2f0cd3101b82..2703db1057ec 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -4,4 +4,4 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-python2-1.16.5.ebuild 4400 BLAKE2B 72633645c512ec0a25e573112b17f3c0c7155bf2dd75c501fb0e5639d4ba34e541c3048abd3c218908ec2dfaf65503721a97919c97e544f9fc4f29d2492f0b5b SHA512 2e9250eb0829e298fed57153e13706169d07aa49650251d9dc9602fe7d55f6e094b462c02f2931a2ff8f06bd932fd75279d884314090f8eb201c021afd58f2a4
-MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
+MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/metadata.xml b/dev-python/numpy-python2/metadata.xml
index 020b40648ee8..02598282f7e2 100644
--- a/dev-python/numpy-python2/metadata.xml
+++ b/dev-python/numpy-python2/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-	</maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 342593084493..cf1aff24e546 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -20,11 +20,9 @@ DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e
 DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.14.5.ebuild 4103 BLAKE2B eeaf60f0d6dcf9adb805ebbd4185061dc21c81d2c5064d1f0c3ee838d68d0bed5f52adeeb138f8ac84fc9ad0e8cddd926142c9d2ca1867b05f1342993db54403 SHA512 c3f585498951aa39e160cc65391fa2d91a08e41981f82daf11562a80e1c1beb4100d06ee619034f0b5dbc211cf06e86e5e26518538d1bebdb18e6c267a8a46ce
+EBUILD numpy-1.14.5.ebuild 4104 BLAKE2B 66a822debd2636ebae9f3c6a14d4917f69ee69f08ab28ff3448d8f206b30a25791a302b9a5e847b7d8836738d46f75a990bd4dde2c06278c9acec2944cd479cf SHA512 6abf839ffa1ab6003f88129909bb01cb7f968f10b861fd7978d7baf213b02ba3a791109d5b4a570af01f78c3f538d9dc969dc6c35c025b583256e1e0ebacb189
 EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b
 EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be
-EBUILD numpy-1.16.5.ebuild 4223 BLAKE2B e8de035eab95a811936542fc223d71fce1c3a98c01b6c4f6f064d0fecf231acf4e3d28dfe368c09a06a84f6e95eafc7bd30eedd4fab5d58afc1f97bc792996da SHA512 2d47d1a95f0e2a7677a4ac29ce44ba519fd620c732bce8a2df15cbbfc6d198a56187e837e19ee27bdd8ed6bf7bd4d04d3c67a78e09ec0b2d4da8e0d74df04d41
-EBUILD numpy-1.17.4-r1.ebuild 4079 BLAKE2B 7a93dfea3a35b7e85e7d97d47d14e4b5931412226b52c2d1cc5f18c075f5c6fed2f0612db6d82f484482382558fbc67fda1cc991f640c1c8a04d8cb71588b84f SHA512 2f4db1cea02f6094bedc19fcfea6d0a5390efd3d71e763740a1663d47c8316487d82cb4233e428e831266fa5e88d46441a6d097ef0796b08e6de6d4e9e999efe
+EBUILD numpy-1.16.5.ebuild 4216 BLAKE2B d1c83265184bb1cb7cef4788338f84939e8cfbde256bb487fa1fe8c892bdecc6517abf1d715fce0a36fa4e3bc5bb0aa76e2e1b450c42bc2bf28b634356bd28c0 SHA512 4831a3dd6fc1bde2fe0b07900b6b64d5967e5c57c463ff3fc4b1b9433682d525bcfd99e73d6f8788c0ad6ea18e557f5d0f408949a12574b61d8d3863ddc473af
 EBUILD numpy-1.17.4-r2.ebuild 3624 BLAKE2B 903d92b51a841916dd84edf5be6d13d5229c953bbe55067dd265a3ceb40dae50d8bdb3b0b26fc49863296c23a106a1e36687ce80650c0bee26006156bd470f98 SHA512 3d72c6a20b64892cdbe7e918825eaf2bfb2ee952d102e9f6dacfd2904e14188b1b3870fe4bfee63aa038c23c5222532f2e96dff1d2686b3e7d156294057616e9
-EBUILD numpy-1.17.4.ebuild 4230 BLAKE2B 8ef305e01f0217df28459560322e08c13fb14f9447b094f65627f129f40cde81dd4ab9932226f2d9f1f1b610d0baa785028ed36487dc7e3e500eb8e666a00ffa SHA512 95dc8135ec99d8427e71f4722d7afdcbff4a6dd85f06b038ba1e6da488121d0c1d738a13b20dee3a0815ba9c749c4f90d641aca83d1f9bbe54190931837ce244
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index facc76fe7b19..94fb9ba2ea2b 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index 8f51b01deeff..5a795c637b56 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numpy/numpy-1.17.4-r1.ebuild b/dev-python/numpy/numpy-1.17.4-r1.ebuild
deleted file mode 100644
index cb058ebd2d35..000000000000
--- a/dev-python/numpy/numpy-1.17.4-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.17.4.ebuild b/dev-python/numpy/numpy-1.17.4.ebuild
deleted file mode 100644
index 3db67281f36f..000000000000
--- a/dev-python/numpy/numpy-1.17.4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lapack? (
-		virtual/cblas
-		virtual/lapack
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas):${incdir}
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 1007a006f6b0..98fcce06836c 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,7 +1,7 @@
 DIST numpydoc-0.6.0.tar.gz 32464 BLAKE2B 3296da3630c20eb2b1e0aeac4c5c4c912f9011cdcec0f54145532759d0b3ea7bb68529e5b3f5a1d640f3bf2e574fc03c3e7bc29f6fe1afacdcc92aadc3766fb5 SHA512 aa86854cfba93f27540eee8a7937c81fe006e1d96b556b66ac643d9673b413fac357762068ca5675f265c7d2a80b0ba000416f5ddf3fbac2bfe4315fe0f48aa7
 DIST numpydoc-0.8.0.tar.gz 20488 BLAKE2B 8af3bd363e288a66dfe84c412ba3d2a1e4afb7021f665491496374b47e0bab4756fcb5d4196abfde0e64f0acec91c18a7eb6e5314767f88e4932bfd3086e18b6 SHA512 8302c7eb6518b46823655ff26776beae35011c9842b6ed61d1db3f7ffd1f34ec695ffde0f0be91152ad59510a5904445ed6dcd877f9b1fb520adc8d9f895635d
 DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
-EBUILD numpydoc-0.6.0.ebuild 746 BLAKE2B 00c2c15675cbd1ea11252fba6cf486507ecf477c7ec7674317d07b7d48cfdc011cad5d8eb68cb4ac7fb05fcbf217758ad9fb971021047d935f0b03582d5d0857 SHA512 783e25ad16c880d3b2872366af650d6274f8c89703fae2e74da1f538b1fa9d5a28424ea3ac2a1d7fd7a69b9f3eb151b65211d3a133f288d86060e227f413bc5c
-EBUILD numpydoc-0.8.0.ebuild 797 BLAKE2B 395ffc5333dd87defd8c346b6d6925065dba7afbfbe3a4ce571163ccd6f42d3bff07e5dd24d45662259d3ad2995a546ec5f5bb65bcb56ab25644a23bd730c126 SHA512 1c38cd6dc1351924901ecdad7a4f9dd5bf073f415ccf764ccd238971f789ffff70d476d2f2055e991bfb18a5564416fc015ad13b6d16e37cef734d8a286b53cf
-EBUILD numpydoc-0.9.1.ebuild 795 BLAKE2B f0ff2fe014d6d1650b95107a78288678aae825faf9611396b351f273974952cbe392b5a7a56f689fd51f632ebabbe2d78d246d7c53101e9b82737b29ac88e59e SHA512 d9562ff14205b382d3e23ec80306f74cf96004572a8f2185bcacaf7b799268801278ac9fe83ac1023f435ae51de449d86e309471e14e229a7ce20549c7183ae1
+EBUILD numpydoc-0.6.0.ebuild 736 BLAKE2B 58defa35258be4b6723ca5e14414e6e5d1bd82bcbfa01beca371285bc325066ddbd6d50d4af9f4b2c124a293cb1c2f45200e3fdf6abee989c8a676610c492563 SHA512 22fe897962bed7939b45c21c649f7f89a345b11f759db914056b4dd4335f7fa9049a47770f9bce25e4483cdbc4ec1a18d2338bd883e1c11018ab4eec803d20d0
+EBUILD numpydoc-0.8.0.ebuild 787 BLAKE2B ebad67507c606f05aedbd9ced48ed67d0bbc393d4d06fc10ffcbef30eaa72fc7967a2fb687b881735596d1cb3c429070779b6aab04ebfe4c7e5e080cac9d51a1 SHA512 51ac878b91f5a7bcf156e476d00029aed3fadca6d47926a9adb9e39e78ceff4f393ed4ecf0da2ea4889e0ce37733fcdbb6a0a009a68921724322ad1f29f74de8
+EBUILD numpydoc-0.9.1.ebuild 785 BLAKE2B 048550a91ee787bb374e78ebe07296540360f4a9d08df5aa8411c93499feb69a033a0ca3e24f4b60aa0ea6f782c625f04d059fb30ff8ce3d409d4a7f84488e78 SHA512 e5366f7424b91f721c03c418ebe6d5dfb4773446d86cd0efd4884bf6b78f5701d51a77bd240aba42d76e37b1f86ba6257c112abe17b4da8b14f56cdf2b3da9f7
 MISC metadata.xml 321 BLAKE2B bbd5917a97e564f5abc495cb2632e42ab36ac1e2441be7c0a375224af7be481b00e5b8e60b6762653401021104b0094903a62eabe9a221020390a74753fcc258 SHA512 51803da4bebb8d1ac7fcc0e33ec99234b4f497a2817361032712c35ea57e9e58591fd675c9273d7627f94c60e010878b9dd6a6e8708704f36c945344159880a2
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
index f361a74250f6..e80e7c9d27bd 100644
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpydoc/numpydoc-0.8.0.ebuild b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
index bbdbcdc8785c..4af5a76d0454 100644
--- a/dev-python/numpydoc/numpydoc-0.8.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numpydoc/numpydoc-0.9.1.ebuild b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
index 14c536f66acc..bae859555ad9 100644
--- a/dev-python/numpydoc/numpydoc-0.9.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
index 1740db33f3c4..aa611b07fa16 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 1024 BLAKE2B 1bf8d1a84a90c805ae8029fa3d25c3edab2e738b04e6c5d4d6fb71bef06672e311756dd29cb6464389b34abf130490101717009a2c0b2a75667b607001e703e7 SHA512 3532f143242d744386180e21cd490002d2fcd274b06d0aabef1a444caedd008eb70c2c7315582ac34a5acfb5cd68555cbd6ab8d282c10f45ec37f60844e1b9a1
+EBUILD oauth2-1.9.0_p1-r1.ebuild 1018 BLAKE2B e2f142d79dd571d64fa95617bc510974ee7660a0dfd4909117b35f835c7159aeed3c15ae9066e41cb60dec4d8f54a88a638ffa2298be41d211e5e538d9890c54 SHA512 f301ab3b1ba9f5d4a7be418f859dc4415752849bbcd7f676b4ec2e4a3f187bc405855b67678bcf570661152cf34e07ba3d8999fcb50574cb058d494e5cb52482
 MISC metadata.xml 371 BLAKE2B 6c43294e3af678e152bc35ab923bca43990db39552673b6dde5206eb5d82199ca46d4162d53fe1f62b09ec15ae9b54b27c5c5c59ca3957ccdb532feaab63147c SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index b2f0f827eb1c..402c3098a7fe 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index a35966882377..7b16e140159b 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -2,8 +2,8 @@ DIST oauth2client-2.0.1.tar.gz 153127 BLAKE2B f7e7ccbe42effedfb94abe4f78e2ea0286
 DIST oauth2client-2.2.0.tar.gz 167484 BLAKE2B 60c7fc941548874f436df094a94e97312983f88af8ca472c998cb7121662363793423d420fa3e7e83032b82a3fd22a76f9331a60e3099785ef82d3fb5a781356 SHA512 1e23c3f655e955dbf0cdb2b78613768ca4c6eb4336b555e3553da212fd762ba12329584f108d8145810228cf44da018675b38dd152b06e58be4eb18d4f8127c6
 DIST oauth2client-4.1.2.tar.gz 184731 BLAKE2B 09ae16a94b1f6b3eedb02ac10d660d8fda78faa82da5fed75b2a40308049c7d78951d593352f2e02c7bd9255e75b50c20996d12f451c20e1dcf2c32f54008b07 SHA512 908f0e32f0ef76c3eb86ee34118d4100bc08fa34aa89c561793bf8c55078f07611935ee6aecb6d2ae2f7e96a18ac3bc25af0321fe564f26042ff2bb5eab30b18
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-2.0.1.ebuild 1107 BLAKE2B b97fcde5f3c8aa7da8b29c04002605d1fbc441c2b0265ea07262c3ddd7770b98db9582f86e38ab15554c603b6468de88979cd50c8c1c2662927227129f85d586 SHA512 1c7215364cc18328e4d9bf44b8279344e39d09e8ebf109636d05e5dec6c33bad0dc3c8232bb7de9fd3e6212becc60ee9f2370c791081ea9cf38a56ea40168eda
-EBUILD oauth2client-2.2.0.ebuild 1110 BLAKE2B 84e9ef9785d6846e37e76ffe68ee188aea1be5a4e5947e8a143e30b3516154f67a103e5d905ea412f96fdcefa68b749e0bb89359fb6a493bf8bb22d35e860774 SHA512 2a807f26b11fdc5bbb9f6605bef327d6ebdd629c9804b65ae2e89012989aef81643642b7475cfe52c1b2d56d8923c1b3aa0e8eb66eca329e1d303ade4d645c17
-EBUILD oauth2client-4.1.2.ebuild 1716 BLAKE2B 624d8491de253283dce3b11bd8bc97a35ad0b282ed168632f844825a010f4275507b730f9dbe84f2c850670e11241ff933d093882b38b9dc311e4e66764cd938 SHA512 52a6fcf09a7294dd507ea678dbcc5d5f8feeccdb47ab2c63b4c0bf93c63b8435f2794d0ec942c5cebe28f635b412c1c0922ab6b7b0c4260ddef26ad7864bc72d
-EBUILD oauth2client-4.1.3.ebuild 1720 BLAKE2B cccb8e56be25babc71a62fc85295b6fc61ed4ab767f3064194b10b156cc804e79df9438a1006bb4180a9d7aa979319e7c2deed22bf3825b1febb9f0533587c1b SHA512 0b0f9d22a2fe97b2bc99883947b872e20053eb8f0631f221114dabee747d98a8756fbae10e6a71369a4ba2fab0f4e1a040b40a6f780777faf3779d81ded202bb
+EBUILD oauth2client-2.0.1.ebuild 1097 BLAKE2B d30650c0da5c221db26861d7bacf59beab47cf33fce2ac9cbbcae7305c1efa8bcd65e538e6c9a907a0121fe868d8dc40f9abdf30a9ba05cc2caab775fb0e9b1d SHA512 4de836c988ba4b049c8d3b7220a76b462be968e406aa3f9fe4061b86bd706e4de3320dafee41903bd55bea6354311e25bff60e30a3f9c655d968b44ecd7bd082
+EBUILD oauth2client-2.2.0.ebuild 1100 BLAKE2B 14727511c7e60233259c91c21aed6dbd936bbd2ea3925cbee2ff24ecd5715d9e966ffbf6428bfbdf9b14a59d4d54e13b0e3efb53ee1e911de65cc4bdf3c4504b SHA512 d5ec7ff601534b24c092ed91de54372d350c5a72c3bc913edbd55afe6cc19f26ab08bd97d3fab05260b8a845b1d709ef256aaa754ee4ce93115078210351adca
+EBUILD oauth2client-4.1.2.ebuild 1706 BLAKE2B dbabbf3ee83a720e64fbb799a3ecfe24353c8119e00b9893633edf7b7074748c0b049722b8f45e8649d91d226ac9805c6b6b4d83db0fa560078328ac01c13fc1 SHA512 0758668f8101d243676b1cbcd421046b30b77813eaf2b36b9067575039cb1f169890a14664175cde572b04b0543332fcba25c0f1fea0f8a283277796d7348cc5
+EBUILD oauth2client-4.1.3.ebuild 1710 BLAKE2B 453a063488eb6ddbd10bf4d6999bd68819b58fefd6a0b4c98d71255a18334d51a764161fe9412b6a84f34281c0346d69839b61fefb08e0661c4658d97038128e SHA512 3123b85858f142dd7cee1ce3637def52aec511b434e47cb39370c249abd9af6677a8068ac88b466d70a10ffa3dbb95e88eb3c795865045b04b92505c83ce6fa2
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c
diff --git a/dev-python/oauth2client/oauth2client-2.0.1.ebuild b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
index 9e4fe5bf637b..d9abd69e6a8e 100644
--- a/dev-python/oauth2client/oauth2client-2.0.1.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-2.2.0.ebuild b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
index 750cc3869f83..1e40b242be1e 100644
--- a/dev-python/oauth2client/oauth2client-2.2.0.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-4.1.2.ebuild b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
index 5a6e3debe7d4..8a4381e866db 100644
--- a/dev-python/oauth2client/oauth2client-4.1.2.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauth2client/oauth2client-4.1.3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
index 22cdb28cf896..9142e679b208 100644
--- a/dev-python/oauth2client/oauth2client-4.1.3.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index e95c7095d3c5..d43defc5d472 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -3,9 +3,9 @@ DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e7
 DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
 DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666716ff8a6f7331febe9f41f38e5c5abceccbbac41da993a389ce2f171dcfb6fa7d75b09eb70d08e09d56b5e8a80 SHA512 3d966a540e3aeb2c4e72ecf60c28a596de1e11b986b68f2a2aa8b56efef12fd1a0181d64e083850843f38e329d9a6a401c244c02ae61f06af428d8188ea0864c
 DIST oauthlib-3.0.1.tar.gz 149303 BLAKE2B daf826a3959f56f70b7f52ac1fc98d8ec73161316235cf7f0dce17469999383faa1b11c50c9645748b39938ae1d24dc3dea3908b68daf8c838f99df763bc361d SHA512 88ee266f764488090b849c036d2475c31dab0d8b18bd6afd0450da6aa0982ba17cdada7d0c25791d5efcf89601f69ae40cd21c584540448c209f90d36e0e98f8
-EBUILD oauthlib-1.0.3.ebuild 1053 BLAKE2B d8fbce07ce733eadab005bbe8eb3a4ad6099bf3bd50f1670c6008be960511e54396f2c63e154eea404d618b5062f1c575bcdc3875299f6a14e743e48829707f9 SHA512 9e274295be29b7c70519ffb76126fd2940121fc3e33f9a703085d4a1950f5a46a8b358362fc3ef0f1849cb22b6ec4817a8a93e838315062b8385e59f8dbaa743
-EBUILD oauthlib-2.0.2.ebuild 1012 BLAKE2B 5f8af6bc172798764c9d6ff7581046ab9f9e5953d5b8fa317fe42a51f60199d289c9b3b39ebe183ea7db031f6f24a05d41ac1a16a16c5e5309ac6a2068f515b2 SHA512 b17a6919986ac4f784984ef2fb619735ce3c3f9599efee44743f9c44803f753b758159ec490d5a4ea93796d0587e99f19b03bc39a9485cc591590dd2278adf63
-EBUILD oauthlib-2.0.3.ebuild 1017 BLAKE2B faa8d08f51ae940c3e9b99cfe9698d1692079469c1c4653dd5ae22a8b166da2e9f292cc0175d33b7681c37d44e3657ac55acfa2b843730a7e194a94f26b2015d SHA512 edf7377464103c2366fb2955b0e237738c2f2903cc98f3f1634e9984ce77e3d88dd8490367218c06e21976562a8c899d1f35637533133d96b162e5e8d578d94f
-EBUILD oauthlib-2.0.6.ebuild 1015 BLAKE2B 65b5b70c0c6aef08ddf1e85c13c9ed2bfe9807cf2452e0f205d63dd4ebb8499ca5c1ec9d6fbc7e8de01e8a136af9c6ee0b4efac760788ab2cc2361bb74377220 SHA512 a3f8cc088943f60f1d8a0aff88caf71da246114fe4ba6350d3b6bc8f4626a9f538a60329bd0e52211192943c4938f71ff43d754c9c1b5f2f4625321cfcca4a58
-EBUILD oauthlib-3.0.1.ebuild 1019 BLAKE2B 3286460e880bee9f0197760fd234f5b93b680d58aa710cb9eb6d65994731f05d41d22d2b11553ec613c3c91026fd3ca67391fb406a32655804eeacdd1b530a73 SHA512 02d52b9cf81aa5a67f9965330f821bfeff65db9e077837ce61a526ebcaa341168cc42d5262ae3ccf1390ec72a0aad5f1656ae24b95a320b05adb182cd376cfb0
+EBUILD oauthlib-1.0.3.ebuild 1047 BLAKE2B 51084d4e89202cd1bcca5938daff5beb27c90b8c851a0f164469bace1990397efd90ff6df6afa7e82504af99f23aee7c0d050353f46098a17968f7f1bfc99e35 SHA512 b6fe16cbd1b550e4023f0e0c4dccd240e74bbfc97a3459aa48569b965f008749d5e8bade5ae430cf9533f0cd16ada69c34cbc27697fed3dd65c02daa37c10ac7
+EBUILD oauthlib-2.0.2.ebuild 1006 BLAKE2B 2268ef548aba6fc035bf0e96970f3fd3fb2f1436f1b247cfdaae3f7608f91f4ff97eb653e44b2bba603bb68afad5f20828cb17ffede6860a43075f71c508ef65 SHA512 3e568f512bb7b1c1e2f09b23069c8a21cbb823642be978224252c590f43c2c858955ee59099e0ffebe16c580c2047f4e961d05e9aa3f3af73c8f21ebad002f5a
+EBUILD oauthlib-2.0.3.ebuild 1011 BLAKE2B f4bfdf1c4cc8d28190847632380725bdc4e9a2717da7776ca9905c2a9ca9a96a6e5ce3bb1cb2350b91006ab69e00d717b3f08ad1f2b899c16f8e8b46b231b3d3 SHA512 e5c3f731c9ce17897ceaa6fc412fc7eabbb1a905edd3fbcdd091b7d9a37fec35b60cadf1350f355d0b7f0fad545fa099e44e75169717c18bb26106d030222017
+EBUILD oauthlib-2.0.6.ebuild 1009 BLAKE2B c0e952806b4f87b2ea41d92c3641869c97f9a5a568704f9103652a1f1a6cdb4e9d7c070c7c24f5af9de006b8d1aaa0224b029798b590a228350fcaae96069673 SHA512 9b1b5d09f2b3abc7b0241b40cccfc406f4b0e42eb105fe210d29ae8ef77a4a489921f8f280e5260c359d3b2d2d7cd0905da3365bdba4730e4b5012cd93276fc8
+EBUILD oauthlib-3.0.1.ebuild 1013 BLAKE2B a500e415b464f4b60d7f95680d61f5d861cf447697690848fd8d8db82b4dd91622829f51eca6cbe1702e3f05cf8d74fa631d669b211c7e464c5c8a8ae78ba8ad SHA512 4f9767f0ca1b7c90dfb57b81ccd6fda01a6130ca480461ee18a797b40806322ab500acc5055452bbcc34c2a79ef45fa04e6d01b756e14e446195b04ba66c59e1
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
index c35a25ca5860..cd88fbd27c5c 100644
--- a/dev-python/oauthlib/oauthlib-1.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
index dff3a303aae0..8da8bed1f82b 100644
--- a/dev-python/oauthlib/oauthlib-2.0.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
index 6ef2ab25deb8..083d04c9ba2c 100644
--- a/dev-python/oauthlib/oauthlib-2.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
index ca6606d22ae0..603854358c61 100644
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/oauthlib/oauthlib-3.0.1.ebuild b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
index 91d9d1fc10cc..b27e06f49d2a 100644
--- a/dev-python/oauthlib/oauthlib-3.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 22768af2f6e6..f160be9128fa 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,9 +1,5 @@
-DIST objgraph-1.7.2.tar.gz 545016 BLAKE2B a124e5fff089704a7ec24a0e4983e8ab52a074a557a5b885f57819bf2ea5cc667ef0b007931b32be131ee56cb9d39798b20f999670ce7112b4f906c151298ce8 SHA512 22012031723060b47058c00cd97035b53238f8cf49c4e51b1f7735bf9c1d5aac9a5f0bcbe605317952f9b9390fc3bf247211082b4540e05cbf76670c27861ac2
-DIST objgraph-1.8.1.tar.gz 549402 BLAKE2B 8694f051c9771f27aba0d6927ca15b230a388a6b9d153e9b7ea8e9878283165a4444850e9774c58fd0185b5debfe8aa85d6f94c838d0beb477ed98820312e205 SHA512 c09e66aecc5dadc5a6e3d93e0f97fa6e816c5cbe968540400ed3d1248b958c955648cb2b4247ba00cd2388302dbcc178c55686cd2b95858b965a2717c6ff0c90
 DIST objgraph-3.1.0.tar.gz 629772 BLAKE2B afa34613d8b05399dec1429465d81b026000ac22c0d345289ce7b2c9c7cc0a0bb6db0054bc7f92ab8d0c69e2d40cf860dc46350951251c106e7718daa8efa0fc SHA512 4b997ff1942556fdeece39080ad00d915136d314add94e61e4b3102e332ce3fd029f7082fbbadeffae63f157f05f8af4871dc5b7ee26926d790fb043ad8f2130
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
-EBUILD objgraph-1.7.2.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
-EBUILD objgraph-1.8.1.ebuild 508 BLAKE2B 1c2845c5e133b1d133cbc3600bfdfe3aa3c677ba5389ade4d42040ee2cf0d512da18ef481e8f52e6fddcf10a94859868663193717c3df485af9a8ba940c613de SHA512 360edf2e238396fcc41df3aa253bf4c5d7d3ecd87d2f4630c8be7a7bfce6fcc96afa34b1d86fc019d7da640d9a85c6d2f8c7f6b3ade3025f078b177df7f77d83
-EBUILD objgraph-3.1.0.ebuild 599 BLAKE2B ec1ef0653bcdee6b9be61085dfc971838dab1e8fbbe8de3d8523543d145171a5cf1707a39d2f758741467d1ffca4b35b78d198eb98b28cc39cf7caa38ae4007a SHA512 ac9cae63232d812b58423894bfd2389ee9c1aa10a6e4304fb1b031c4d9f8d1cd217b860823b0f900c810e1e50e546904b993816d4f7e7a8801bd24bea84b99e7
-EBUILD objgraph-3.4.0.ebuild 668 BLAKE2B c1cbf95a769a39106eb89fccd82825694387e7763f033b6a0b43bb0746745f767267486a764af972436448bd44a58b6dfc7996ccbf0e9aaa9be8b8706d0cab16 SHA512 87b2417287afcb44c68282ecd3aa1eeb93eb183a969a1d268f8d7b41ea4e258f0d82a25f08204e3a8427852d71c52392b9804de049fc65fe6e8bc4eb3c2ab7a5
+EBUILD objgraph-3.1.0.ebuild 589 BLAKE2B 5a6366284274f838b5d4ec375107c6965f45d4165455458aa12ec6bfd178581e3c3bc527f8d9cc6ddacae276720e57e9a5efc849519bba3620cdb5510fca18ce SHA512 baca623f2dbd6a1db055b76b923f7cc21ad8f391711253b9af13b63f23b9d947d959c61e5b34fd30d9f67cfc2b5d9b5d348144a56ae62e53ec270c4ded004191
+EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 24820d2f8c6df3cef1b6fc166be2114f2acf96c5ef0d3ff078ffe04e3cdce49a3954c3d59c21e54af6ab53fe769d587eeae1a044948fd76f3a85f433c4f9bd37 SHA512 1c50913293a5bcd90781f0e72af07ee49f8541dd52e1b839ae71bf25e7a3600a5b7c1d8804aeb5841cbd62c8563c106ec2b2168b3cf29162f09c197d2ba8ef9c
 MISC metadata.xml 422 BLAKE2B 079428e0094ac67f67e608a3f99dc09a92b6db7de99db8603357a134476f73d135a8605c6c86c5acb8c1d796168badf635ddd526b7710d40cda49451457fba48 SHA512 efdbee08e75b435bc2c976b80ff251eeeaea1e806f8cbcfbc288711f31831b4aca279b303d3e261447c3a8eecd5997c8db848812951c86c02f01b74a9c1de146
diff --git a/dev-python/objgraph/objgraph-1.7.2.ebuild b/dev-python/objgraph/objgraph-1.7.2.ebuild
deleted file mode 100644
index 90fdb9d51925..000000000000
--- a/dev-python/objgraph/objgraph-1.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="media-gfx/graphviz"
-
-python_install_all() {
-	use doc && local HTML_DOCS=(  docs/* )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/objgraph/objgraph-1.8.1.ebuild b/dev-python/objgraph/objgraph-1.8.1.ebuild
deleted file mode 100644
index 90fdb9d51925..000000000000
--- a/dev-python/objgraph/objgraph-1.8.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="media-gfx/graphviz"
-
-python_install_all() {
-	use doc && local HTML_DOCS=(  docs/* )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.1.0.ebuild
index a931e9f2ac4f..f9012789b42a 100644
--- a/dev-python/objgraph/objgraph-3.1.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/objgraph/objgraph-3.4.0.ebuild b/dev-python/objgraph/objgraph-3.4.0.ebuild
index d8a26511b0ff..ce1394a85973 100644
--- a/dev-python/objgraph/objgraph-3.4.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index f5fe6c5d7278..672a6d2c176e 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,3 +1,3 @@
 DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
-EBUILD odfpy-1.3.6.ebuild 927 BLAKE2B 849a9d9103b39795f7695619a6d5e614b795b29e5bf7feffba8ae694c8ac39a9cd03f9d54dca788dcb61da4d948bd47ca999faf8e3441dd1d4a77b5ee597f0c3 SHA512 973299152963dc76eb6ff4604d73e99f49e9f706d0265977f14009eead7c7a86818cd982773b7ce287a457150792cfabb1c81448a78742d43cbcd2c46ec5a380
+EBUILD odfpy-1.3.6.ebuild 923 BLAKE2B 23fa3442c6697ca799e6b992c54e2f3ab1ccd3da31dca67439eecc3c674ab1cf0d07a0ca69ff53aae94f212ee4a3f5e8090de4de10272f43f11d35993af914fc SHA512 5855381bc1c4aabace912c554f8b8e868c14951915ab90d93ec50f5bac16e34ae505cf4bdf1f9e82c1b88a3a036258d0bd1d98921a150bd0476e502913545174
 MISC metadata.xml 308 BLAKE2B 4d370440c480d97acc4b9b2e51aeb78f27227e8dd2c5acfdb99747b6b2eabdd624f8a8f90af28287849216d874bbcc81bb9ca8cbf78c1221e947fd479476b1db SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index cad4cc3cff88..ce7cc64b9f96 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # Classifier: Programming Language :: Python :: 2 :: Only
 # py3 fails one test, pypy anpother.
 # Notes on page of home repo reports support of python3.
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 5755fad9de69..d58935da4c99 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.44.ebuild 667 BLAKE2B b3f1d9af0a02cbcf9d7e0768f6488ab687d866e0f2696a9e176286a2b1d14cc8ab53c1d307f184546f30f56a69063a56c8b5338c3c3dba48803b59c38ffb9307 SHA512 8626cd165fc43b0192ec5ee9f113f56c35040e0e6c0f10d3cf02a448c43ef8ffb9a23e20148612a6d09ca69943b837e7c2ac523d52bd93216ea6fa893af70f9a
-EBUILD olefile-0.46.ebuild 553 BLAKE2B f5d9fc5005f49b12d0f8c7790e2f8c17874288e57ca76733bf49f6779815e56283f93e4bb75e61c027828f18635ca902aa6d7315ebcb68d99cab0df9625afc8c SHA512 195e75edd3b8e94aa8e0f21ed78c9a7e2c438f64682d1733479e2f7561a6e0f495195beca7cf31daece3546349f4897f58a5389974f61b3b8b5fb6fb1a9eedf1
+EBUILD olefile-0.46.ebuild 554 BLAKE2B 42a2d92ddf625d158ae07f7c442bf1a3de587f9aaf03a269c48cd8186f464319534d325b17dfd5b7b5621bbd60f479605c78e4c0a824f8fd8eed53071e779328 SHA512 04ee955a17718bc449c6918d1b0b5154142498b98703832606bf0a98a4be129f4b20a79324139ea00e97f017e83efe5657a5367c5e96499ee03d7cbfb654c2e8
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index a6cd8aecbec8..b5bd63783cd0 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 09e99c4f9671..d518d77e31ba 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -2,9 +2,9 @@ DIST openpyxl-2.6.1.tar.bz2 2403827 BLAKE2B 26abdea047b4d283f3d0e3ed499c1d7247d0
 DIST openpyxl-2.6.2.tar.bz2 2404387 BLAKE2B ce63ed51bc2f475fc12f510307e3cd417321588aa1a9adb5f8b780249898747babf211137d21442eceaff01bcfb4f7b8f3092b3dc64f751aa2b26d404d11fb74 SHA512 e037abd13e050e25146b016c578bb50c008b7c74a19702d9bae14b594ad5f30d352f8443fd5021a169991a96f5d19b84a3acceb9b05a713e8526ad478fffd31f
 DIST openpyxl-2.6.4.tar.bz2 2406293 BLAKE2B 5395820c2b7a1c6f754f80d33f629b438cbf6421b91d8f3c0a3cd4b4105b84f1b4b90ec1a5557193924718e462af1720c166fc37295ebd0c3b0c270f4cd7af7a SHA512 0880c61b2f2fe6162a1aaa6815607ca20cadac3e58a92f737bc4c7a5a867a0d731ea3ad144d552fb2854b703b7426f1c8c3b3d8ea6c64ab2485f9733f0fabc61
 DIST openpyxl-3.0.0.tar.bz2 2405154 BLAKE2B d14e529c73cebd3eab6a4d93dc38c1807d38a5396032b4df77bc7af5d98b5b68369f1b44cce83d77592e7aca673ca497d49a1fafc1f0bcca3c0aff19486ea8db SHA512 fc0c31b1ae486f6fc8802dbd6ea2efee65e788b452240985202617109113dfccb5b26bfa94c2ac42a0ac218ff75bc310773f96122da1522537c063e8d55309f4
-EBUILD openpyxl-2.6.1.ebuild 864 BLAKE2B 0a86a50ccc789f265341cff9a30fc9364a754ee7c6d28ecbbce90d7e21a3c0cba4110afb9022af4f894bcf3ebaa9693454f684bcd9f9edaf75a508a538342541 SHA512 10d48b449a9148ddc974dfe80b3cdde877176c1d40b6fb827a7d67dffdb541cffec2e03c8fcda075752956233e4ad481b6bbd455a1b845d134cb591dce51e1c6
-EBUILD openpyxl-2.6.2.ebuild 1016 BLAKE2B 8f3bd6b196a8643d6f8ba3c10f93207512a01aee94b89447a1face0330794f5984896bc9b2b304a26fcddbc9ed07428338effdacd19d132a1fc9f4322afd1606 SHA512 a3f0660428395f98df010ae15219659a76c4ac0a02357abf060516cc38997a52e568ab93ae54ee46c55dd2ddfaf34529e52b734d716d99b8ed281a729ccb78bf
-EBUILD openpyxl-2.6.4.ebuild 990 BLAKE2B df99a3ce30c7a8f140a0614a9bf2207ab23fc93b7ed6ebd73c313f9634f7b210a98bd0170de958154a1a7dd40bd7bcaceb639ad4513357ec5399f7f71784ecd5 SHA512 ebd8fd5fd5aa8f671bdc55549ee501cd4cb11627f7ddc91a17c81f42318221f8840fb0475a6440621ca347fc3c4a912d4fd2f8bccd393574e51a7a2b94a663a6
+EBUILD openpyxl-2.6.1.ebuild 854 BLAKE2B 1c7c192dc82d252992a518e60a98b7b24cfb9e75486b07db39ed877634ebfdd4239746798d80c4f39b5f800f59d589c0f31f4f569634b98c2c86f83edc3db357 SHA512 81c38c3120fd2580ce3e8e2745a4b2a05893f98bfc8ffe5c35bc81dbfc2688b8be90f34e1686baff32174298caad4de731a10a040e3000142a653dac40ece3f2
+EBUILD openpyxl-2.6.2.ebuild 1006 BLAKE2B bedc549987f94577c2601c8ccd3335eaf045128449071ef81a5a22c3f477136c7af1e1ad7344b307fefe0e68913236d6a81e6a17b005438542fab6ae86a28db8 SHA512 f6eeb9f8b94698102cf2587c0ad4b4da3153a1693d5b4152455b7142158ed0d0c40b5ea57a9bb1ccecb80eb7599cdd013ba147a900c8971635c4156355c76cb4
+EBUILD openpyxl-2.6.4.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
 EBUILD openpyxl-3.0.0.ebuild 980 BLAKE2B fa7daeaf8a65bce12b3c09927e06007cd0ac54dfe6e8d93590e6f73a176bd73d5d4330c0d3eaf42fb60da9e2c59fd1905a8643fc33669a234ecbde0f9a239615 SHA512 de96ccce27cc480a482c5f330786ca0943359c21937f39c0f7b30e572fd8dfcfa31c29a74118786bc89576ebeb0c54bf3f379dfa94797cbea24739afba6aaf64
-EBUILD openpyxl-9999.ebuild 754 BLAKE2B 91193b5e0c419fd547f5ed78d6d4915573ac8d1ee439b325560e6c213da3d1501a1123a77db9d58ad88a349c4e8ba5552c7557071390e098d776bbc94b5bcf42 SHA512 20154f1fe897bad84d14cce2b4eb266b027a409d376bcb3f1f2f87463d54a97ac5d564139fa1d6689acfb06c13156c33340b66ca1b12dcc45537c004ae08a296
+EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
 MISC metadata.xml 653 BLAKE2B 7ea56953654fbad2982d2fb0569396bca3d32e2068bf6bceaadbcabd4b02520aea7f0ca04e810bfa5f8c3756658fe1915e53bb824eefca3c420506ddda048656 SHA512 4f8eba0d2bdb3a5b621abf9f2eee89d576d86f5a3e694b9755b0cf55e178e584afa599dad260ff5854cf6a00e0609d740727a62d1addeccc59b05f9e31e60fca
diff --git a/dev-python/openpyxl/openpyxl-2.6.1.ebuild b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
index 1c60e0ce0a68..79b1b9600bd0 100644
--- a/dev-python/openpyxl/openpyxl-2.6.1.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/openpyxl-2.6.2.ebuild b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
index bfac1ddd1532..b4e7a9f9c3a0 100644
--- a/dev-python/openpyxl/openpyxl-2.6.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-2.6.4.ebuild b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
index 433dd9136f9b..284935b4f7ee 100644
--- a/dev-python/openpyxl/openpyxl-2.6.4.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
index 35313a2cb368..957f018d2820 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 mercurial
 
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 685dcdd1d66c..ad82baa2c147 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -3,5 +3,5 @@ DIST os-service-types-1.6.0.tar.gz 23412 BLAKE2B 9e475b3905c81b2c480c98b17fb8047
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
 EBUILD os-service-types-1.3.0.ebuild 549 BLAKE2B 2d3457960e5b61578f8e01f473c78f5b6fafbc97dc813da2253eae861b26c3724ae5a4f73eb1064107186286f74b6af2eb0e6076a4f7962f44b2dfcaa7c3a731 SHA512 835024d39eff2949897a4bd67a1e05474d56d21a59e6fb37e95d0433a8c02d4a880801a736917230929f2897397c04b58738009488cabed1bb59047b8133f67c
 EBUILD os-service-types-1.6.0.ebuild 549 BLAKE2B 8509a015b1c790c2fe7bea08f423c009831f8aee715351ed2fc6fea7953b245b376af1a1d0319fba9449cd6d72c31489870051dc6180276426d1e5d2e86e50df SHA512 7324866c58376831c61d29549f46fb964e7dd7601091b06a9a0080f82ed0728f57129fe986a274b9618ed0b2281eed85370e40349a782d1c649a9ade9cecfe93
-EBUILD os-service-types-1.7.0.ebuild 549 BLAKE2B 8509a015b1c790c2fe7bea08f423c009831f8aee715351ed2fc6fea7953b245b376af1a1d0319fba9449cd6d72c31489870051dc6180276426d1e5d2e86e50df SHA512 7324866c58376831c61d29549f46fb964e7dd7601091b06a9a0080f82ed0728f57129fe986a274b9618ed0b2281eed85370e40349a782d1c649a9ade9cecfe93
+EBUILD os-service-types-1.7.0.ebuild 551 BLAKE2B 15275c1839f341179831869f8d7526d05ba0da264ac1da31dc586b469753eab4704698317a019fc88a8c36518be21d6885cc41f84e1aba8834272816026a74c1 SHA512 424c8fe3189b0813d204746853752f6c2ea9ee5a38b75c4da43aea6dfc4924dd4ba5cfbbf3efa891b9e0453e0d96059848a835f0dd8a9380e213447a1196c939
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index d82a40b4fefc..9934f1e7a8cc 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 616a06bc45da..a498e6a18bd6 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,5 +1,5 @@
 DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
-EBUILD ovs-2.10.0-r1.ebuild 492 BLAKE2B 8a3bc5777fd6e497e40173e5dcbe3096173b73b72345f3c9dd015b09406cfef04671ed8d96c062421ba85f1e285311bd36f327bf5bad5ce3e9554ccdc8d24d5d SHA512 6c14ff87f230b43cd45390550a2dfe13857eddde1a49860a53db8ebd7f35c2e03b9fef53391ac9bbd0db86fb55feaabe5530b3105b784d6effa3ed8e7bcc6c55
-EBUILD ovs-2.11.0.ebuild 492 BLAKE2B 8a3bc5777fd6e497e40173e5dcbe3096173b73b72345f3c9dd015b09406cfef04671ed8d96c062421ba85f1e285311bd36f327bf5bad5ce3e9554ccdc8d24d5d SHA512 6c14ff87f230b43cd45390550a2dfe13857eddde1a49860a53db8ebd7f35c2e03b9fef53391ac9bbd0db86fb55feaabe5530b3105b784d6effa3ed8e7bcc6c55
+EBUILD ovs-2.10.0-r1.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
+EBUILD ovs-2.11.0.ebuild 482 BLAKE2B 5bf09859d32c50a0ecb761790eff692da2f01ea1715d92943179ec59fb4a5289fe133b8ca26d72fa4edf95300e7d16c10dbd48e1db0021568362f1f90c6f6079 SHA512 04012f532bb553c7dc24c2eccefba17c234f44d3295b0fca870b3741410b50e70a321b15c575938521ecd08e97f683ce23e731ea099f7581da065cadca154507
 MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
diff --git a/dev-python/ovs/ovs-2.10.0-r1.ebuild b/dev-python/ovs/ovs-2.10.0-r1.ebuild
index 03925b669f32..ffad9a0f0909 100644
--- a/dev-python/ovs/ovs-2.10.0-r1.ebuild
+++ b/dev-python/ovs/ovs-2.10.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild
index 03925b669f32..ffad9a0f0909 100644
--- a/dev-python/ovs/ovs-2.11.0.ebuild
+++ b/dev-python/ovs/ovs-2.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 9fefffe232e1..e0fbeaa41256 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
 DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.15.0.tar.gz 79493 BLAKE2B a035a8571033e210db253dc4a301c602f9b213bbeb6fc73e9317d2a29f3b3520f43c0f6c8fa7f3d549f3fd76484993f5b905d3916c93c1daef228e9c15fa4a0f SHA512 db8179c32bb58b04019b215083bbf7490418305631a826a44965d52ebbfa9d75e08bff840659982a93c3941cecc0ef1e81299e83408731582907e24d2e2764f0
-EBUILD ovsdbapp-0.12.2.ebuild 732 BLAKE2B 88671a2eb77026cd7e1f223ede76c85fda6b5b40d1917f8cae9651d12184e5dba281ec5a95d54d91df09d2985e8b4fc8efa307e98228850147e7b3a11cde73d8 SHA512 b27482ba732a077135c29faae24f0cfcc3e07f92b5a70f68eed9db8123dac4f7613eac0b8686ee7244f9aa7ffd423b8f42186c1cc0a152480e5d257a12d8ce64
-EBUILD ovsdbapp-0.15.0.ebuild 736 BLAKE2B b93177f402d5334ab9c80a06e353f9c4aa8842590bce7a62248842daa9ecf858a6e6aa3abd3a968ddc6b257b674731024c7258acc238ef472e24f83da6a34afc SHA512 30d78515f90d0369e5dbca1afa00aaa689119459ba44138ac4479b02a77c2297dc8969a6eba5db468cf05550153885edfc4439008d061c35c81c747c0227a690
+EBUILD ovsdbapp-0.12.2.ebuild 722 BLAKE2B 2ebe5e49ce0113310dfd6284adb4c338901e5749b0c785ebb5b4469c0a32fe095c2e1e5eb5a4a7417462972fca5e8f9ee3327908f415d6e76f14a087642be571 SHA512 e1f7cc98dee6c57c47d813756ffa133f64279fae51c41c039b1ea1dfa8ffb1163279aeff9e9e3097a9ae7534c7379d26c1776cc1bea25ca1bf9ad38e2697af24
+EBUILD ovsdbapp-0.15.0.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
index 37077f33c01f..8445558ea1ba 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library for creating OVSDB applications"
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
index edf181fc4b57..92c0cf365ad6 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 49434aae7a68..b67bea7f3ccb 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -3,7 +3,7 @@ DIST packaging-16.8.tar.gz 44706 BLAKE2B 6443f05d3745eb6c4cc3d51fccfb1afcfa207ac
 DIST packaging-19.2.tar.gz 59110 BLAKE2B 8098538b8f48f4ff478eb13f3f4384d08c246b8a99711a48b2f412deaecd85faf13e24fd910a7a262c3407c5eb54939cd926e31e6f802deed0e28e0a92dfdb86 SHA512 af7312a85292f577d3e6e57154f10fb380bbdee749344ba4b226a09f22bf5ca664ed63c62cd5b4dea0be5eb5cff5c17ad04415aab8c925fa90dcae2e1c6dee5a
 DIST packaging-20.0.tar.gz 72663 BLAKE2B 39fe2c52389978d1c6d7a0a0044b549a96fd386f83ece2dac65090b8ea55193fb2334102523c5119ef29050655d81bc015e3b02c6589088ef6f5bc8e97f3aa04 SHA512 f7d99700d27d5aebbb3343f1de6ee9ce1372750b805c55a40d1a1fbeb6cfcfe2184875db56de175c6cd46e17f1567c30a39d5527870902c3c69168d025447587
 DIST packaging-20.1.tar.gz 72955 BLAKE2B cd23c407693fcfd62c6fb40d996c3768201535cf6ba6dc825a6ee9e1b456a902aa730d1151e3b4e73fcc1193236dbd5ea9cfe6e17eefbc038d48aed12df9089b SHA512 1d51e81ab8b8c552d880ae3d210fe140835de181b6fcee3eb382f0f1d6a416e9cbdaeb52a81c50c53d2c5f5cdc40ee516f29ced845868a1bf7be3b23433f21d7
-EBUILD packaging-16.8.ebuild 1426 BLAKE2B 09f077436c392bdc57cb524e06927b1a1c5c1cff91a6be03422becef6f47a49a0a6b2830e929ef76e819ecac08042c2858d2aacd03dcd3094ca0b9218e6f5f0c SHA512 8a7004680a62d2fbb728527842f6aeaab2b2f576fc4471add0da08d62018ed66f3277e54ac5d6c6e4ef1ffe839bc4cac09c5debd377bc86b0779849751ad553b
+EBUILD packaging-16.8.ebuild 1427 BLAKE2B 0497d7f1e8d41ccfebcd1c61427d2be139fd1f3b56bb4c641ee4e312170cdfb85d1ba6e5f9e19a4b14b03b411a0e0eb682b45edcf7dc659665a958016f1d6313 SHA512 6fd688774b5ffe5734d32af6565776fa9ac318ae4b38de7266212b4c87fbe864bd7e932f5a81bef961e502e35e055ebf84da1abc19a30205fdb8b3b8ce3e1515
 EBUILD packaging-19.2.ebuild 1415 BLAKE2B 712b60364c9dd21cc284ad9235e51d6066eeb8a2a93d4dbf191df826580b536186da67da20001b70fb0f68db1d2acfbe836ef6703f3504653bb4486cd397c662 SHA512 c44d324b43b3b9f3d0c4cfd75054c579371864dd40f5f038e419c39a7651a5b476499bec2121c3cfdce90a6fd7a5b47e71b6f2e19f7594b620d31b1ff9371a13
 EBUILD packaging-20.0.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
 EBUILD packaging-20.1.ebuild 1417 BLAKE2B 7eb668b201610d64b01a91d7eec7c8cd37b4fcefd0436efbff41092eac037c42fd49ec422903ee08729331f727d315cb4e35d3b5bcb4c493db3c46e3928a8e7a SHA512 a09d271d703344f9f655b4fed8827c48d2d1f026758aabf4a47440a1f83029b132c5e286c4f5c3f71cf7fb45f06865a1d9beb084015608318fd90521824a1ba5
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index e5bbf4a21873..4b36b5056453 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pafy/Manifest b/dev-python/pafy/Manifest
index 939b304b3265..d40368547468 100644
--- a/dev-python/pafy/Manifest
+++ b/dev-python/pafy/Manifest
@@ -1,6 +1,4 @@
-DIST pafy-0.5.3.1.tar.gz 25636 BLAKE2B b5281e135ba86d5bb4f259fe1bc5e2fb6f5a51519e0c2b3f7c929858ef0a54c77382fd2e6f399dfc3323db21c17b26991cc05502bcd1161f4d4118d45cd6b4cc SHA512 2d8fa30e15b9d500fac9726d9119da9f1ad24021a804b7e75d6251347f8b47f4517425834ba243a749e22517507fc27b67c7258f81bdebaa7d3b0b7f9b18e5ed
-DIST pafy-0.5.4.tar.gz 27393 BLAKE2B 9bf0601f3deaef091c1ad65a3d45a4d98747311e64244e9fa109519ab4980e9a8c822c5bba8ade73794d320300fa9693d2a9fb377a5547c6a7079fbbe9ae81f5 SHA512 91283ae831ecf50a861e9e6565d34652138b84bbf012f8b77b9fca9fe4eee2dfe358199ba77fd705792ce16173eccbf6f1bc31b88768edef02ba57fbde118011
-EBUILD pafy-0.5.3.1.ebuild 511 BLAKE2B 8bb2b9f9ed96474f6ee8611dc3cecd6f5d33dfd472790bb90f6222995a28bf231867e2f2dac939dc908eb580043b357cd3eb39e78261f92924be912a54ed7f25 SHA512 a9a575ff7544e5430fece06817de0eb8e5e3891a3908d6af6a8bc44ea23e94943d4107582c961c43c47407714ecfb7da36005c9110ec21a4c1194fa2e698c733
-EBUILD pafy-0.5.4.ebuild 627 BLAKE2B ab15b23b9c33a68184239b0b20e592c6a96293b5843bf1b948a25314cd41c6b783de656ad3b44c6755eb4a3c50c6bbd5041264159f16aad98de3ba26d0b5ea9e SHA512 9f2fc03066a87c17492fe0d2d02a7a459f1200e34b6b9d07c0a3f852ff12133b4a85b97076b46d2eea26b42f0945926cac00ff36df9f91b0b2ff8df8611ed0aa
-EBUILD pafy-9999.ebuild 627 BLAKE2B ab15b23b9c33a68184239b0b20e592c6a96293b5843bf1b948a25314cd41c6b783de656ad3b44c6755eb4a3c50c6bbd5041264159f16aad98de3ba26d0b5ea9e SHA512 9f2fc03066a87c17492fe0d2d02a7a459f1200e34b6b9d07c0a3f852ff12133b4a85b97076b46d2eea26b42f0945926cac00ff36df9f91b0b2ff8df8611ed0aa
+DIST pafy-0.5.5.tar.gz 29769 BLAKE2B 84c9bfac18fb668327103341cc01229c7c77fda5b5edaecdb662b891fcf4390c578466364b81d4bcdb1abdbe0cb32641ec6320fbbca8779621fafc011cbde20d SHA512 3b7e02bc9cc541bd66718469c7a743be5da3b0822d7cc63ec82f49c2721fe6b3bdbb87cdd9dd26b0bf05fa8bb9566ff6cc59b37baa17ccb7aae12c881faa884c
+EBUILD pafy-0.5.5.ebuild 611 BLAKE2B 51e089b709063e36ad6387376d1161ce44b58118a5a7782ac23f3b6cff95e2d98efec872c17edd8ae6c595a1356be2db063b349ede5c9e0eb663439fb9c7d354 SHA512 79eee047207528d9e58a07a320f71626848eedfc4dee28287345213de2ee9257bd5f7b742b662405ac349a56c2e8d742516f79d004d473eeea7a5f8460240c1f
+EBUILD pafy-9999.ebuild 611 BLAKE2B 51e089b709063e36ad6387376d1161ce44b58118a5a7782ac23f3b6cff95e2d98efec872c17edd8ae6c595a1356be2db063b349ede5c9e0eb663439fb9c7d354 SHA512 79eee047207528d9e58a07a320f71626848eedfc4dee28287345213de2ee9257bd5f7b742b662405ac349a56c2e8d742516f79d004d473eeea7a5f8460240c1f
 MISC metadata.xml 363 BLAKE2B 5159e9e65f41774553a894b2f11e9ca2f32b96ffb3b17cd3f0d7bbb0a56152a7a96e83c5f949bc4055c002dba93244ebe535c151d147c2c8d90e038050953f47 SHA512 7385160f1c9fb564b0b1b136409f853a28c0c4b1e87350f0c2097ea0cd4726bf1f8047e6a33c4f1e2751cfdf1349d80494d3c0149964969d25a8a999fe3dc2ae
diff --git a/dev-python/pafy/pafy-0.5.3.1.ebuild b/dev-python/pafy/pafy-0.5.3.1.ebuild
deleted file mode 100644
index 4bf1ef7fd986..000000000000
--- a/dev-python/pafy/pafy-0.5.3.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="https://pythonhosted.org/pafy/ https://pypi.org/project/pafy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pafy/pafy-0.5.4.ebuild b/dev-python/pafy/pafy-0.5.5.ebuild
index 9b18f78eea05..f9627f434ce8 100644
--- a/dev-python/pafy/pafy-0.5.4.ebuild
+++ b/dev-python/pafy/pafy-0.5.5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -19,5 +20,4 @@ HOMEPAGE="https://pythonhosted.org/pafy/ https://pypi.org/project/pafy/"
 LICENSE="LGPL-3"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
index 9b18f78eea05..f9627f434ce8 100644
--- a/dev-python/pafy/pafy-9999.ebuild
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -19,5 +20,4 @@ HOMEPAGE="https://pythonhosted.org/pafy/ https://pypi.org/project/pafy/"
 LICENSE="LGPL-3"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 1cdf235eca04..14a84d6a89b0 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -4,4 +4,4 @@ DIST paho-mqtt-1.4.0.tar.gz 108278 BLAKE2B 0569f3cb5d262b3b7f6ae68261fe138d839af
 DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
 EBUILD paho-mqtt-1.4.0.ebuild 832 BLAKE2B 1ffc21c1e68794f52bc03e2b965f6423490a851e4fdedd2b9c0c394b0f1813e95c9266a538cd1b0025e436136b0617ba26d38bbbd1950f5f6d1164ac47286727 SHA512 ddf18c0813539b838426242af0f2cb93e62a70f3a2496cdbeaad6e54378271c67b883cebc6a53ad15fe1a67548289a2212d1b1801294120870f6fab1a61670ab
 EBUILD paho-mqtt-1.5.0.ebuild 870 BLAKE2B 3c209549ddb661c638c969a08a5effc3d0722f1ad5f85ee47ae7fff77f84879537224bd82ef957e730733ccd025611e3a5d73a4ace951bea6c8d0e8f85cc60c3 SHA512 bfe74d2d95f66179545928b06095b6c4765782f77e71c1fb352b039cd3deea6efabb28bed996b13e7cb6759d1de5892ab6b83fbc91e148072cb997b567502c09
-MISC metadata.xml 461 BLAKE2B aafc02224eae792f2800211f291493df079437667e706879cff3d8f7e895f16b8b778fe623280434f36ee878db2da6edefb459ad7b59b3fe5ec6e4dc8e3c7b36 SHA512 a9b6ab584e14070bcc2087a7027b1e36bc91706124039938a7bc2eaef5c14247afbe3c4827a22a3899c8e3c527f0d0ca0e394f1465b42e759e2fd26cf965297c
+MISC metadata.xml 568 BLAKE2B 59225deb9ff08a17834330018384d076e069ce14757ee2cf57fcddc6ef847f88f02074552c6faf51584a49dd31adf2344b3dddadbceb7c04f332faebb9a1a5fe SHA512 e73d7aa7c9afa7dcb1ad78ba23e0b54070fbae667abc1127406e41b714432f59bd4c4ff60cc7a6cc17e2dbffbe0f6d78ae4f75eecf60a997e544a4b098cdf314
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index 87bf6367c9c2..0e8a9c3cad49 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index c70c8dcf3649..df01518c9f1d 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,5 @@
 DIST pandas-datareader-0.7.0.tar.gz 341577 BLAKE2B 4169fdb9eb5280be15da23224d25104aaa47f7c328adc6fae6220ac11fc76954f541b8bdb117df977c163229751885e625d3a44923a8c0c2266f0eb3ee57b8af SHA512 2a2d1411fb3724f3e1cebea8a962c1d4f12124d58ba191035583d8d621bdb0dfaf0c0cbaea765ef61f5c23cc221ae2b585b612e97e45795380b70fe672d0b7a5
+DIST pandas-datareader-0.8.1.tar.gz 255516 BLAKE2B 9bd63cd887ce011ff71671d962db7572b1281576f93f2c338d16ac3e4de46f2cba7817d17af010dc73208d550a0b752000321fab90466ac85988c393b95f36fc SHA512 211300746a748f60a141665210b842b4885dfc75165247d016c81715b98c894b06f758b1f16442e3136b18c9f9be422f8bcd1bbf037a247203273c31abba55c4
 EBUILD pandas-datareader-0.7.0.ebuild 1127 BLAKE2B 209f084c0862e979fe4a249d5d15cd0f4020a82e9fbfbc115931be9e5a18850db6ff9a4eae3fae88861ad648dcf926c4d84d42f73636d8318a0329fa69445e22 SHA512 4446397502fac587ff1c1a59d1078d4689ed3d99d5d8403c5527a47d17739b9c3a1caeee94ef08ae4bb9f44fee9974b817942f48e32d74269bd6e6174f4c611c
+EBUILD pandas-datareader-0.8.1.ebuild 946 BLAKE2B 6eab26cc0995383129a5bae124fc5d018f2f25679cfc738b5a56f6b59bd068fe911871bfa0b368047e43c1c3974bf60879b11100cce3291edbefecb8e47d54d9 SHA512 de74742b7d45e044ed8420779a37685b86e65bf7ed8fc180e536996f418ee0b81eb116e25b1ab6e0a0ab2f383f1722145bd2ee90100a05691d1e0e2ac1aef93a
 MISC metadata.xml 753 BLAKE2B 2ecbabdb680770a13686fccdb0c91d7aa11b72db6649dc11395085fffc6712b23ad247355ac0845eff0ff4df306b7ae12151385ffa8871e525decc0f166b825e SHA512 886f97288af0af8c5939874e8d2d24d1614d56419a32c268bee80480f6c1a6921dfc46544bef189616737397feee4cd49cfad895939568127c046c9943c58751
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.8.1.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.8.1.ebuild
new file mode 100644
index 000000000000..9e643c9ac2d3
--- /dev/null
+++ b/dev-python/pandas-datareader/pandas-datareader-0.8.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
+HOMEPAGE="https://github.com/pydata/pandas-datareader"
+SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+# Test suite depends on outbound network connectivity and is unstable
+# https://github.com/pydata/pandas-datareader/issues/586
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 0a68c6fb9867..d7cc44a9c416 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -4,7 +4,7 @@ AUX paramiko-2.7.1-tests.patch 2370 BLAKE2B 9d63e9e96a3bc4a1ecc7762ff0b7663c13ae
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
 DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
 DIST paramiko-2.7.1.tar.gz 330391 BLAKE2B 0f7a2f3b6c15a68002001d69f8402deea5421a8b1f6cf35061a8a36f4b81b7a291d7b0f0b457f32de4c4769659a2e067f0bdb6cc5dcdd0810ebf917e349e85af SHA512 2cebed2420cf9af77cb0d459b64a74adcffcdb15bd58c8fc9243855ae91f43e16706665b64ce2851f6e99e59ca6a47d7299a2aae35a4c9d01ab97b343569c4b2
-EBUILD paramiko-2.4.2.ebuild 1492 BLAKE2B 2c1fce2e9e0af333e86367108f24fb3198222018a0e51432492bb3eede58413bcd81c8a32badf6ca2b75455554ccc9a3726cb1ffbc6a4f73b98c2cdf964e65a5 SHA512 475752888e86d31cef669184b1cf7c018fe1c708f52be8966b6b51e1ec6b9bd7e1328255ae988d7c9bf9482f52438294b1b5ef8abb8d99de7329a90ee5b83009
+EBUILD paramiko-2.4.2.ebuild 1493 BLAKE2B 183fdbc5e27fc3edf73402168e8f732c7df56e0c17cbe9e6969f66b191c1de926f260f7f9c0747a7045e31d91f60a0abf2418ee70007b6c058b3a81e6bc6143d SHA512 f279678f9df21a5ce89b996e21b2c492d021d92670671cb3f2e6a7ae22d6181ef66371776d406f61b51dec8816d2235a5352ab37015e69bfb6dcbd8f64a54f7e
 EBUILD paramiko-2.6.0.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
 EBUILD paramiko-2.7.1.ebuild 1504 BLAKE2B cb516255c6f6ee6a91414222f470646699f40c682e552898b6a40414bee9ca23f7e8405481c43617a925cadda9a27bdc73577944bb8041dfc3c602d916898cfc SHA512 a09c8dea801857ae470d77bb923f84d8901a462a40711b1a02f06d0caa64f6b77118d1a61da2b34edda3ddceff290772328aed1ea464f4dbbcfb9f4a032580c3
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 167f6e088cc1..5353f2a07fcd 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples server test"
 # Depends on pytest-relaxed which is broken
 RESTRICT="!test? ( test )"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index b6e7c48195fe..ae23e9ff9711 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,5 +1,9 @@
 DIST parso-0.5.1.tar.gz 388060 BLAKE2B 429ab40501d38e982cf77e0dbbfa4d8677dd1e2400945436b8eced608a41015b7028f586cf9af6057e441765f0a1db519a642ceadaba14620a92f452ce709871 SHA512 a04ef9bbe156bc28ac9fa64d091d3f1dcc9cf4b15a3c109cd33de1c4d34d0bf741016b88b6c12d456e953253942b7d522e0b793c9a00e9fb06de27ab0667c7fc
 DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
+DIST parso-0.6.0.tar.gz 390815 BLAKE2B 3f1def6bd7d88f09e943c9e75e653dc5ed74652188ad5480065467e393769efdfc19645f4ae49725837cb9b903c2b1589d0715a7173655e9b97899ea9c987aee SHA512 1382b5005ea7e19c3d4f8910b47e9b730e61045fdb16d833a43a7eded8bd568a7528f1822bf193d3c110a5496f53a540ca5028dd10bfd4a59193d58a7e457014
+DIST parso-0.6.1.tar.gz 390866 BLAKE2B 3dbbef687f194f41bc7fdeb7c78930802ee5a97150d2585eb8949ac74ac640e897b8f04b29f2768df920aa5d54ec80f1aac3b84f996ef0ea957ddccf9da77cf0 SHA512 98cc20a3378c89b870df5e5df52f2c2091c1a133ea9701141ed90edbb05c5b8ddf30dcc19069cc19666f34e37f8ca64e37bfd701314adb24b0a10ab197862cf1
 EBUILD parso-0.5.1-r1.ebuild 653 BLAKE2B 3e812b5c5882e6b482c1a3dba3df575f06ded2fa3e8b174691ef5e92074aed573d5c3dcb243d4f9b337c96861cbb8ed0be9356854aaf98afc1caccbbcbddac4e SHA512 8b23fd80b995261ad8332c74c7290ab5a6b4195e70f57a3cc0c04c9d2e3ccbb409a135b01843537c83a4b6845a9b088d8be9a2d77d60565ed75d76946d7d2c42
-EBUILD parso-0.5.2.ebuild 657 BLAKE2B 0541c81ce6454910f9df836bf78a93b14ff0da22f8e3ea25e23c7f497994882f853c0760066152347901f6ecf4de7e496bfb60b7bf08ade80c38a2eecd672c19 SHA512 c464d169614129468b21653826482648038694ddc1499e4eea3cbc99e997437aa7b213636db87c8a71a3ca3bf858d7975a3e289cba13e90af361061ef103766d
+EBUILD parso-0.5.2.ebuild 654 BLAKE2B ce78d5998aac228edf3fa84a778b552ccd8d5fcb394b4db865193b5629de519c911a0e632d373e6c0464568a1805b1183310a21e5d550ebdbdba3c798416ae93 SHA512 adcd9d76a2ebd0ca5e16b9557576a11415576728c90d87fddc72cd6ad4d195edbee27264ae274a8d06864c96a166e722a6b7d48d19296facea7694444b49fb42
+EBUILD parso-0.6.0.ebuild 606 BLAKE2B b636f1cde5d94365e7c93b4686328eb466c609cb4cc68fe6e3ac562551b24432d4061cb508d7134d73a121301e83861b2b8271a12b58becae841bbc447c02771 SHA512 fb5a8ee0590445a842a86dc1e87a017d7396ec07278d8d611354eae23655f0abc7669de6f53034580808834ba185fb1e501fc781b2dd8cf318f89d38d0c9822d
+EBUILD parso-0.6.1.ebuild 606 BLAKE2B b636f1cde5d94365e7c93b4686328eb466c609cb4cc68fe6e3ac562551b24432d4061cb508d7134d73a121301e83861b2b8271a12b58becae841bbc447c02771 SHA512 fb5a8ee0590445a842a86dc1e87a017d7396ec07278d8d611354eae23655f0abc7669de6f53034580808834ba185fb1e501fc781b2dd8cf318f89d38d0c9822d
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.5.2.ebuild b/dev-python/parso/parso-0.5.2.ebuild
index 177f7ce1aa8b..ea0a29896512 100644
--- a/dev-python/parso/parso-0.5.2.ebuild
+++ b/dev-python/parso/parso-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parso/parso-0.6.0.ebuild b/dev-python/parso/parso-0.6.0.ebuild
new file mode 100644
index 000000000000..d33ced31acc5
--- /dev/null
+++ b/dev-python/parso/parso-0.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.6.1.ebuild b/dev-python/parso/parso-0.6.1.ebuild
new file mode 100644
index 000000000000..d33ced31acc5
--- /dev/null
+++ b/dev-python/parso/parso-0.6.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 8bc4bb23b70d..bf1a1be7beaa 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,6 +1,6 @@
 AUX parver-0.2.1-gentoo-versioning.patch 771 BLAKE2B edeeb76368745ce85ca812c399fe919dea9da01b1ed8f9c4b5a151809c0610d59b9213d441fbf891ba15389c9c9caaa610509a213585481a2ecbf09de85c33a9 SHA512 d4d8cea17ec8aa6bc3a2e3855f2d1e85b2954290fe41a894dfdea8617afe87f1dc79e882b14db608d5b58f1df4129509b55f8aa64862d770d81fa07e59c53b34
 DIST parver-0.1.1.tar.gz 23398 BLAKE2B 2e15ac0c5739ac4d5360cd905d87d0ba1e3831fa975b42c73503f1fdc0952d4a73f36a9eb07cf95a12969637cbfaa902ed46c9a66a85110c17b8ff36c39c87f1 SHA512 d79a4981f3ad77180c5a9c5972410714a1be075308c933bde6af499c25aaa2f82034afb27c0b4c4d7ca269d645285a953a91ea6f945fcac663250ed06ae3accb
 DIST parver-0.2.1.tar.gz 25717 BLAKE2B dd55f44b8bb43ca948fa459537385066b811fca4ff68426365b840d704c30c4a258632f1d2ac2a3967acafcbde44151f1d394ffd96a18d03c6a004ce6b29f1b1 SHA512 674e97d5bef6bb02a659ecf5e1a78fa5d597436b656d0251db20fe330a151ae8de52a3f3f0d3732ccb624ad9093116c07837ba0cbe4ae7ae664b4d47ec3333c3
-EBUILD parver-0.1.1.ebuild 748 BLAKE2B a4905d32194a840bd1d541bdf53cf22f0794d38bdd520129cc8f73176cb2093db3550c3f1796f21256ed5a3c2ab215920e48b581cec6099d8d294f16b1b9f29b SHA512 1285ca2fa81db3ea1af0191e48e903341a9e6115af864f6f2d8120dec979162408da18edbf28672d616213ee2d6604dd54903e386ce48af88c607ba935ea3d71
-EBUILD parver-0.2.1.ebuild 845 BLAKE2B 0d245211f485256835d722ceaa96cfa8d2ddcdcf62c9ca820a16b049d97f69e6880d6df920bc1cbc950dd34d3925bb11bf8e2597dead2796587da0f5e69e30da SHA512 b03cf4dfd29f6f5ae9162a62f77208c6239503f0041e763172fb57e6849a51e38dcccd6897d3bc087cb53ac5f0ffc80c42e039c99299c09b8fcf806d7b46d034
+EBUILD parver-0.1.1.ebuild 738 BLAKE2B 29f3c5f533a16d8dea0655f48a5c7b71691442698182d8e8f4e437e34796a5e9459e562b2d59a263ac8b4dbcd85ddc00f849f281cd3ff86919442706ecb3eedf SHA512 fab8df036c0ced465c69b8246692a3293ced76bc97f633cf8f8846f9148f08b7707a154e137ac58bc7e6f7fd6a8879bdfae47fafc97b427409599413af6d7fe6
+EBUILD parver-0.2.1.ebuild 863 BLAKE2B fb1cfccf61aab1d856e68b191501e10564c4e08779aa37c9f5af860e65205eb6252e73e04badd0db4d7c463c336cbb90f90341479f3f81a7e029895af81ce98f SHA512 4580c61c6325d662fa3e2f4f84c7e14f5f493f5b89358c5c96f1706f11360e7051a4b0779aad880db952a8533b033d83c45136010c20f2023869f9385d38528c
 MISC metadata.xml 574 BLAKE2B 510cd38b3ed8ff1bc35c94dc05b898794d2770d0804e2dc0b86139177e98379c6bb0f8aad5a5c46f4586e24efa84c2eaee7d22a072feea99be98a5faedeeb810 SHA512 bd52224f07bee7d3655766dbaccdedb0ee53367c3b6544fc6641ad9593f005c42d79a862914bc87bd673bb4206d19698784f9bff0135c0a56e156bf2fee12cc7
diff --git a/dev-python/parver/parver-0.1.1.ebuild b/dev-python/parver/parver-0.1.1.ebuild
index 02527e47152c..e3bbb6bf9273 100644
--- a/dev-python/parver/parver-0.1.1.ebuild
+++ b/dev-python/parver/parver-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/parver/parver-0.2.1.ebuild b/dev-python/parver/parver-0.2.1.ebuild
index 60a12771ff94..c18e7ee504f7 100644
--- a/dev-python/parver/parver-0.2.1.ebuild
+++ b/dev-python/parver/parver-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Parse and manipulate version numbers"
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.1-gentoo-versioning.patch
 )
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 35b37e78ae95..2e4f9dc35bea 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -4,5 +4,5 @@ DIST Paste-3.0.7.tar.gz 628999 BLAKE2B c91bb228fc2c36da1e7d487d521b9f57df19f4cb7
 DIST Paste-3.2.3.tar.gz 628900 BLAKE2B 3f6bc741a716f33b82fa3bf8e1ab6ba3c17a56ebf3f90ccce0c1a925f982a2a0b460f433e15045321bb4b7c22c6fe9238cf6c7c76b78dc86d414729b67f0791e SHA512 8775a4c6b1863355a2acb3b88258e342db768942ccf28edc8654d7a1a15c5a036f4f8c5c9d917d51e74c9260170234f9c499cefd709b0fbd39ffd4d1b7afcb79
 EBUILD paste-2.0.3-r1.ebuild 1840 BLAKE2B 5a25230773e9401b7479255d4432a23ed45b995a7385f8b73a3b1c385c9efaca26790f8ab3ca7bb9adf196d9587565f292ac6bf776775b0c9c090bb88c4ea6e1 SHA512 29d9cbe8901e534ccbf34474243c19dcae8f4318c81e8dbd8da3716c740e192a93852c623c92b17e5d22ee9e372d3092cb351ec9694bd38c3b83b475bc3fc24b
 EBUILD paste-3.0.7.ebuild 1898 BLAKE2B f88fc66d546d88e0015c69ca13976a6684b2cb3b2e2172487a64516dac781999976cd5df3e5f447fb7f5615b22ca70e7c915dafb26beff69d58d42c39f2c6359 SHA512 6e52175c4ef08cf9a728715efbac37778336d347a32b4e6fa469b7bf59d1be4ed50206f2812d61711ff8dfc6013345288794e8e0d59280c09b9b1647ff6a4bc7
-EBUILD paste-3.2.3.ebuild 1704 BLAKE2B e00f57ff80e98fbcaaefc0d6f256538743c6af036db78a5f01d4c549822c75a302bee8405e300d7bec42b52f7974663376d65d0171b40e96991982f4c0762d24 SHA512 bb33de9929fc78250716d951e007a58e36b81ac92582c4d62b5bd1c6b05a4e20eaf08d1acbbd88c133a9da012b8ab6f28490bad119926a3ff817266cc87b4dde
+EBUILD paste-3.2.3.ebuild 1727 BLAKE2B c45fb07522a51fea845e866a2f18e4dd79d151211e250815f7099a54782eb4155043880891936c12342ef127448679d4f0aa6840e82b57924c7164f4440c447b SHA512 02090862c907f344abb186e806259a807f1d3d2f5b59aaea345e2e217b1f15d3e2b69c4c6e573fbf0bf8d5b43e9fce7ee583b8f6f0bca5386e449cdb9c08a661
 MISC metadata.xml 778 BLAKE2B 74d5474ab918861e65f330eff278a319f8b197c6f95e65c862e55bd19d84534c447e348df82ddc68558dd089f8ac81785c16de38e3fdc70f706d4e5b870243fc SHA512 86b244a3dd365e74dfc12dfc283809840352cbe210b34c34ffda1929db29362d1e02b246920d8461cde70b087020d15cecd3ec5cfe0f168fb69fa45cdb66015a
diff --git a/dev-python/paste/paste-3.2.3.ebuild b/dev-python/paste/paste-3.2.3.ebuild
index d0d437d3a61e..1c8b18ca69e2 100644
--- a/dev-python/paste/paste-3.2.3.ebuild
+++ b/dev-python/paste/paste-3.2.3.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -20,10 +22,11 @@ IUSE="flup openid"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	flup? ( dev-python/flup[$(python_gen_usedep 'python2*')] )
-	openid? ( dev-python/python-openid[$(python_gen_usedep 'python2*')] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	flup? (
+		$(python_gen_cond_dep 'dev-python/flup[${PYTHON_USEDEP}]' -2) )
+	openid? (
+		$(python_gen_cond_dep 'dev-python/python-openid[${PYTHON_USEDEP}]' -2) )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index deb8f2ae596c..11d69afdd48a 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,4 +1,3 @@
 DIST pastedeploy-2.0.1.tar.gz 32215 BLAKE2B a398c54813fa990e3f12ba7c66615e3e84e848ce0dc57177f7f76114a544a11f89569ac85f16afb1ee392a08ad06eb6b4f0cc5aa3f328d154643c541fcafa7bd SHA512 be50c434765d5a913f9456527a72bd88e778e947b1db99ee4ea2f3325366038d941bdab6c826bd61f0c1eb1618395e6bca2081ac99b5ca50aa7120406d5f4ce3
-EBUILD pastedeploy-2.0.1-r1.ebuild 1004 BLAKE2B 4f932dbc6510af32c43dd2779f7e262fbff8af850aef6828fcc91f8f5fe169a27e00e00c5feb2faa4a2b6d9c443a3e6d9fca7dff6669751fe9d31990aeeb4a4c SHA512 23af06109ce4ebef08d00ad5fabd77af4b203296d27d34b26bef9b304211dc775f8161c926be3bd981ea25f56ebd773b4eb333138effa862d7e6418a37ed8d11
-EBUILD pastedeploy-2.0.1.ebuild 1003 BLAKE2B fe0798d2471f2415e1c85136e67aeb20335aebbe4d4dbd8137bb237a26f7a95e57600773cb6286908d113bb15e38093151c616221d697a24a10ea3b1d7cc733a SHA512 008b1b9d597442d869c99f34019f7712376618f7da47b3e04950d096c90456152aff9ff0d1c1c449df3cd4cb15d781bd570529d017058e3c3568f5b6cdbd6f3f
+EBUILD pastedeploy-2.0.1-r1.ebuild 987 BLAKE2B 004c11d830002500b6436fcb19abc2c86e514230ea5c849b781c383e8a2f5939278462e2f8cef699ba95530d77f91d79be7539dde7545b6209d8745e79403e9b SHA512 a1755d09e9f587afe15c6cb55e11a03630607d8a7fe4849754c589640eb5ef73977396c14eb6092b87cf43870e4b4b4bfc77c1293675cf98abfa0d559e8d0e20
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
index d16669ada327..cf1492eec8ed 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -16,11 +18,10 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
deleted file mode 100644
index 4b495dbfbe60..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index c9867fd663b3..cff0d4f2a2bb 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,13 +1,9 @@
 AUX path-py-11.5.2-tests.patch 498 BLAKE2B 45dac8c0907630552463e73257b29aa351e9d2dae7e05f83a40facc756c1b41698d4f380141da759e20b806afdbdc91657fd692a2e1749cddc35cc7e05ed3ad4 SHA512 0f735f27fc98a1ef42d1ac4b105b8d807a645cf836f9d1525d261f1c0fd12b39867d78a6ad0dde14cb83bbafdd21bed20f54fc8eb150cde91c20cf71a6fb8df6
 AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5cd15c06c1520df4b3034c5719233734233f73360baee5366ac8417f677cbba3adaff5e8d01f71b5bdcd5abb5be SHA512 291f8b80012c29cb2ff2d1ad00d14b6b137a9803073df03298415f81ccb2a960f1d376dd49dc527b9a78167e06b4ce300983557b7475ca75abe1d62630cd9959
-DIST path.py-10.3.1.tar.gz 35871 BLAKE2B 94e45372ad39f9c5dfe4167f5d1fd58e1e501272ed2fa5ecd116f0fffc7b924c66cc436a83a296a167c08bb2f57f169b1ace7692c2ac1284fc9070918b409a3c SHA512 e8dc874521aee6cadc5e3d7a66ca6909010f2069b1e6ed0298a3dbd86466c971ca466b442bff90906cb891fa9f13190fd9b3bf4ae62442e9fe73909169c32c02
-DIST path.py-11.0.1.tar.gz 38348 BLAKE2B 80bfc308c72f0e2867ce1811709e3d2ff63888be53814e026ee221c381387a581f8e0f8da05e5c1fade2e0d6b93ba930dc9b1f38117667239174a3acc85d76f0 SHA512 48bc8352af74e70e702e712f35f08a0bf05713b2de5f2eb617f8ef2f9138344cf74fab453aff6cbd38bd88f5c3612c39b3605e0d3899c2ab1c667662558a8651
 DIST path.py-11.5.2.tar.gz 43542 BLAKE2B 6b376eebf5b9197c4a2e23ee25c8261c7a8b9428007a626bc0f7d1be71496f4abf7fc6f11cee628432304e6a684bd690d6895f325981c4dd0092bdf3c4a4a4e3 SHA512 8a76ffd7d369adb4c5cbc25f2a52c5cabe899bf59d248d217fc5a086e45438d9dfe6b65b63aa2c89edd7662a793d213662cd6726d15f5ce49dc6bdaf22425865
 DIST path.py-12.0.2.tar.gz 44859 BLAKE2B c82bfd248e0e6eb21e3416c86f7a3a5fbfc5f5b327fe20da4084c53f22834013fc224bfbcf455690f53002c8f1c3e060aa0f04f3792e749dad62e51702cea348 SHA512 97971fa1e6bcdd4acf057ab4fe6cde2edb9d9d3d06dc049ea3779cae867221ae3e9d905daa1ec706f867473f738bb328b2795d3030244f8bd8ff7e8f0d5a6b2c
 DIST path.py-8.1.2.tar.gz 33437 BLAKE2B 0033b64e9d0f4c719414e5345989308a113c9e23f99fb46722ee7d7de85c7bb4b471f5416d646d943771cdd369ac2d8f23f925660d4212b18acf7b82daaa76c0 SHA512 639b6247d99bd7c88e7505f5f41a5896266f23c0517b470ea5c1ec90ca76e87f1971babee623bbd7bea57bbef5f7677a7163bc51bae78c3c54e978eaf7f122d1
-EBUILD path-py-10.3.1.ebuild 881 BLAKE2B 7d56c4e9f4c64d5945c0091d400fbf74765e04333138c605bdf0c97bf8d41042bb3f3a9aa17678e3a0dad9c765c800cb2efd29aa35d5c4f21a9fc9b5fda7ec6c SHA512 fbeb016faa9164c2c23755b0bc5df25ca7b2fd66fd5d6f0c646ea4c8d966a32616011c8fb290899466ec4a1bbc65704a09ed0cfcfa655d1114ce2db17e5b2239
-EBUILD path-py-11.0.1.ebuild 1121 BLAKE2B 218a2b078a47e217dfff252d47566c4d4a18a0d061a70c9ba4a9791f80d45ba73f6d265045a688e3213df4f31307cb67439c280757d33278e52645977180c311 SHA512 29f66fff1b3c2d05600e5b21c1344262231268097efe78c647d840289a436ce22de651ca5dbc2d0330b0fe2467890bb50013970194684f6eeea755b3c9a05090
 EBUILD path-py-11.5.2.ebuild 1372 BLAKE2B c4438a150fbb485c0e72cd3dcd409c9ba5a8f50723cb5551cdd6bfdfed3e9178d0ef19de66697d40bf920ab5507bfdff1edd587cdd3bae9e5b65fe074a537da5 SHA512 67e72279b86bfcdc67d5559312d98a700614ce23bd75d1b67e83d46e603704529c6d591aa011ea6f2366e8375632779b3d319b8c62c383fb9451555a0d097bd4
 EBUILD path-py-12.0.2.ebuild 1355 BLAKE2B c3b0b00f41fc829dbe761b1a8afd373e8657d6b8c60d24db01ce2670a2d3a57bcca128a2fe314474b3f8cf9f22eaba83074c021d7822cbba09766b0c2b3ee083 SHA512 1ffa7a691c251510ae768aa8d95da3a4cbd4a173982427e45e37d6ca515f069546df503b594dadf4df5dff89f0aa43fae5263c84745b508d0201da16c5ed03c0
-EBUILD path-py-8.1.2.ebuild 963 BLAKE2B 396401fc090eab6489be1d58aa379a9fcebbb230a53ae252e27d9c8bf3f0513a19dfec45197493dea87709ba0ff9bb55072d4899bfcf166b4f1800200fe5cc74 SHA512 d5289abe7dc986859c5e5e1847774362d028465d376b30b86c420e33fbe7aa79cbd61584954403c75ff0e50f214455c5608e1e9597409e21e65798b0261834cc
+EBUILD path-py-8.1.2.ebuild 964 BLAKE2B 8b1919065616b16beeb804aa8758d5c0a2fe53abe8a4893e85deddd385b28a3493570dc3bd7413a5b4db13a5a9508ad19a106d9b21aec7f8b82c8a6605601545 SHA512 8a97c00317c2c0deef176008ebcc7649aa33ec0f27e7111a14a653ab737937d0df0004fcb6b383e47bb57d277f69172da800334b8df93a0d29a9e2c6375bbd1e
 MISC metadata.xml 376 BLAKE2B a0c037397a1f2315bfbe646c139a2c565b028d0d440e4b830550a6a32fcd78415d4e9c3d4cbc0f80e5b3914dc85b1268cf101b55c7eb1eeecee004322d402340 SHA512 6273623109e7f816ecf729a7dd65ae21b0f69049343ad49b6d439312512324aa94f2d5764e2248690718a57a24a50babcf2f29813c4d45f58eef44c9f14cb9bd
diff --git a/dev-python/path-py/path-py-10.3.1.ebuild b/dev-python/path-py/path-py-10.3.1.ebuild
deleted file mode 100644
index 865c0e1ed6f7..000000000000
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed '/setuptools_scm/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die
-}
diff --git a/dev-python/path-py/path-py-11.0.1.ebuild b/dev-python/path-py/path-py-11.0.1.ebuild
deleted file mode 100644
index f3a336bbbaa3..000000000000
--- a/dev-python/path-py/path-py-11.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed '/setuptools_scm/d' -i setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	# disable flake8 tests
-	sed -i 's/ --flake8//' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=. py.test -v || die
-}
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
index b7d70a898eb3..5a44eea4a3e8 100644
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index fbd341765a84..daefb5b972ae 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 517 BLAKE2B 723a2988008de98f2c0fdb0df92396fba2197b8da4ba59eaee849fadac930c99df0f0fa88d1bbc969c54b88c9060f59c298ca2078bec38e9fa9ed06adc72025a SHA512 b1b0959fd0fd214b97e3072e2d54b0e4f6a7c959f68fce8d50c4ff31eaca0fba1adb24bf5c151ebb722536dcc2f8fd150bb71ca377c740b7bc96d4363e195a92
+EBUILD pathlib-1.0.1-r1.ebuild 516 BLAKE2B e78fd7b0988f1af2bed905b90acc5ee3bed8af000b69a415a94de280737dfc8bf003c3b60a9ea9158697aa07f9ac367b3535f9a36c83d43dc49e232b6927d954 SHA512 e14ecfdaabee95950791bd22d0ad9dd958ffda882c4dc25c3c1a6bd7f2b0ea94da5feffb0022d6c90c2f80fb1fdf412d3827ff2a84adc696799a958dbc865840
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 25b111e7ae80..bd534ea59c20 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 2c3e14e50691..10343bc95611 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -2,6 +2,6 @@ DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
 EBUILD pathlib2-2.3.0.ebuild 1034 BLAKE2B 6cd6123c2fc02c9229c86c112782c5bf8bf98de2614b6fe5be1f66281df6c2124ffb15847cd64c913d22f6737f552507fe7b38597c89df6cc205e2d1ac66a680 SHA512 e596ee68ac9f65800f80aeab2d85fb76b15753c3c62957fbc9f3eb9399f80d22bc0c1939fb7003683e178407caa37ade7a9ca4e11838cda3acfb49f16c93daf9
-EBUILD pathlib2-2.3.2.ebuild 910 BLAKE2B 14b0f82f1eb219144f9643986e5d8a5d4975b484c04393cfaf38e3dd74f45fde3248e39687d2785a5d91b20d39a84341c8c111900aa7780addb414d0d8e107fa SHA512 d6838c2d32e6021b9c2f61bf7c871c9cf599281cdc47b402d6343a6d2179dceb5aecdd9847ae8fcb858f1fb1b8140bbc5e09527314d97f5b2564489cb056f656
+EBUILD pathlib2-2.3.2.ebuild 911 BLAKE2B 7e4d385e982007ab9b05c2a13ed8d03bf47f3ce290175b5854d60426df5fb62ecfa85cfd293b59f021685cd848d0250f26eaa75a951d717d589220e9fdf43635 SHA512 052c9f41b65b6e5a0c257395e141dc0eb20a390ed1984fe2cce54431f64c405760390b3cfb9b5e3d97b426900ff771a8ffa1b4405f0f0318d54f15d7aea6c4e5
 EBUILD pathlib2-2.3.5.ebuild 923 BLAKE2B c2853f84616ee6060ef2c13e40df5aaaead95c49eb5631b469768b3bf43fde551f16155f53b36bfbbfbd9e15f353956067a4f176c3f86ebc3ff83fa5b9bc0a2c SHA512 903f48ac36984b05c94365bc1d82236abcab3c962100f8f6fa99d80f4235884056697470baac827f6ab8bf9336ad0171da968bbf4abdd277c4f1b0d7ef5a485a
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index a2a19b6c6537..aa5cc7b8a01f 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 5b9bd27796a6..03e5cfa9ba49 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,5 @@
 DIST pathspec-0.6.0.tar.gz 24159 BLAKE2B ac3f75d7f4b3f6d092d216176823f061fe91f3bead10947b01315267655133a0f99a29288283cbeeff7c2c9305c499b4ade1efcdccc554d756ecaaae2f84896c SHA512 e08baa05a3fe58ec6ecd651577834115cdeef26b75eef274d843c3c6444cf771e86f99a2a2b2980a6d1ece946997f1ebe714f79ddd5c296071c2e18b73955a84
+DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
 EBUILD pathspec-0.6.0.ebuild 592 BLAKE2B cc4885d49570cd86bbe17990bb259789c6a92c82e23749a2e1727b9142424fa8e894acafc5bfe62894cb383cecf5ecaa2fbd698b4db0df9f3fadb7b974baa679 SHA512 ba397d75c69c47c117960ad32b404fca6a61213ffed0f97efa2c9db1b3a66280fc9b054e0d9023b6140446f0e81b8496e71fc1617512f06e410f218989b7bce2
+EBUILD pathspec-0.7.0.ebuild 584 BLAKE2B 6d150954a5514d4a25012e70115729f52bc695f59cffe1e3ddeb41c5a6866cefb9a51ffe376093190bcb8bb83a8a08bb0a5da9b090c9f9eccb11130424ac46c4 SHA512 75ab02c5a6c6d7e258f71867502cb11693a0743707eea38602d5d16ea8405104a191bc9dd3b7d61d5c9578f71459698d056a83ea13d60d8e90c9576b0aff7bd7
 MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/pathspec-0.7.0.ebuild b/dev-python/pathspec/pathspec-0.7.0.ebuild
new file mode 100644
index 000000000000..721c75372081
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/paver/Manifest b/dev-python/paver/Manifest
index fef6c76e5199..d483b306c7b8 100644
--- a/dev-python/paver/Manifest
+++ b/dev-python/paver/Manifest
@@ -1,6 +1,6 @@
 DIST Paver-1.2.4.tar.gz 328794 BLAKE2B f81db3fa8fae72b9719b51d0643ba9495734bc351a6b3d5e86ba6f4afd778cf70157c427cc8e7741828c97197d8961c10f49dcd92b6fb22c810c73a2d26a2668 SHA512 ba737f2da0582d4c3364b654a79d9868bb394fcbf1102feea3604821a65075631fbdb7b767ba8977f3231bcb6cf167abd994fb1dd9fd080046ea8bcfde8cdeb7
 DIST Paver-1.3.4.tar.gz 446425 BLAKE2B 6ed6014e45d0d54f5323fba7a2aa713f860b6d8a7e6ed2d409f17e02b245b516196cf298602dea98022efc640cb2a94fddec060a396d02807fb872240a3bff3e SHA512 f29d6a67ebae8100f3dc7f7cea06acf5606c4c3691be49a86cd85ff69aecff4441c28e41ce5e1b79050d32946f9bb55b213e68ee966ffc0ae1e0b0bea4871aa7
-EBUILD paver-1.2.4.ebuild 997 BLAKE2B 892c5308f0ec2d679980ea6f6e987c11071251fdedb678153db71b30d71e17f934fddf277021ad8edbb2f363cdc37dee77786d98b1fd72504da86bb9c9eaa4b5 SHA512 11745701d4e7979ddf1e2f0a069f607c3be7d8fce57829566c2a3a902fa63040eb7737143c051f9d0fe17bc1808078fc4f739b530c73e61b5399ac822a108942
+EBUILD paver-1.2.4.ebuild 998 BLAKE2B 7154ac718c7fb109d40c4dc5a94ce77f3b3ac1ef62a77bc370192baa23fb5683a7552aa14c9e996b0c2518d10a8750b77c8fc724c24a6017459e27b421b5f207 SHA512 7df67ad88691ef548fa1e41dc238792101024a9d3dd3032778a2498d270c7c6cc5511738d71bd7535a4d9ed325962725f192137dae848f8d2af8ae3df407f51f
 EBUILD paver-1.3.4-r1.ebuild 1053 BLAKE2B 29c0933739b0e4aea89e184caa0dab9408ebcb04b2c2a5a3508168ef554fdc847be2d5c6d41246c88e1f852bd8e8da29e0d59add8fb0f760cb8a25205f062318 SHA512 568503f3cd4757a4bfbe9d9c630a5611ee91b405f0de0c10386c0d38439a15c536d1083edccc0c867ab09204010f635d2797e603c2c7bcf8411f45009ba56217
 EBUILD paver-1.3.4.ebuild 1015 BLAKE2B 422dbebdbb19c5f2100b1e3fbe5f4a8d4c2e883f4b26bc0834cf42d563130e753e7bfe16f2282abc6b51b3dd1b209d85b95a7c982d1a1dbbc77d49d2dc0a99a1 SHA512 6d98bc9185aa7c90d99e4e4061aadd52a93fd31102d5bd11b70743522096b43f0bf1833db414fb76605cecc3e66ce4e8384ace162d380a79b24dc204e2946008
 MISC metadata.xml 371 BLAKE2B 9328a4c42ca5a8c8320b5b7fd4bf5050f1549d1f139bb1ecdd7e0f74964b808c0d1b6df9449af7d8f80d914bf7a211a105b886faae5d543a4e6730cdf0447f76 SHA512 94df99ebc516697a06642bd882bd306e35b4dd46b4c0031b3ddae47e44b379d77a90c0b04bf1a3aaf16e4bc35f915cad622bbf8f61f39123b68a2bd51b1b2e31
diff --git a/dev-python/paver/paver-1.2.4.ebuild b/dev-python/paver/paver-1.2.4.ebuild
index 4d88e447f2a5..65a9b33607f2 100644
--- a/dev-python/paver/paver-1.2.4.ebuild
+++ b/dev-python/paver/paver-1.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index c9f3218e94d7..905a78082786 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,8 +4,8 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
-EBUILD pbr-0.8.2-r1.ebuild 2124 BLAKE2B 0044653518d5480a17633e828270288b22d4a7481f2563c0aaa685769d62bec62f7cdc3df56ce763994e1bb4faca0b299a3d38a501c6171f2e4fc6d44a033a93 SHA512 852a06c85f5ef486cdd646ca691048fe3f64e3393fa8c8317d6626cb3073362d4f89eff4882e37eb6b178c89af6b4c0c48709cef61ef10ab52b6e481042ed406
-EBUILD pbr-1.10.0-r1.ebuild 2615 BLAKE2B e8eec60b55b4eaea498d102a15b685c2cbb6962e717e66310418e4a39e60c1d9db202c0b3ce5a06878f984d8d3d2440550895160269c50d38ad9b5a750f6c033 SHA512 61f1bdf29387e728a60e884a34f77d50fcacc1809b244a0660bd678a92ba000f9df3bb34d19cc3478c071d286dea8c651e05be48efe2ae9bb3fe8d02058798d8
+EBUILD pbr-0.8.2-r1.ebuild 2125 BLAKE2B c272bc48a88b1d6e7cd038aad1d7e81bb647e873043a0004bb15af91904faf179016b354a78122475fbb36177f77584d93f521464cb9ac58fb97856e0886c08a SHA512 aba6cb6f1eac13eebf33b5aeefeaf5212d19d521f33ce45dba913df712c7f05d296987365dd1fe1ff7b3bc2151c804366649d0aebafec3baf4493068d5c4237b
+EBUILD pbr-1.10.0-r1.ebuild 2616 BLAKE2B 0b52f9f968975ced37dc9f5a0a46cb88ad0eb1b4f9b71d9f3c898a84548142c407afae20fed837a97cbb1887a31939026919bbbec8f51f20b24e70648fdae24a SHA512 2a5658abd70d0bea6ac314afe0c1611441da5c7d110635bf92b5feb6ceb31a9629293a1030cbdb03e8fd3117dc1f9634c5643d5d100e4e619919f4b2f00ad8b6
 EBUILD pbr-3.1.1.ebuild 2781 BLAKE2B 52e9a9fc7f2188891bc972a9e0c2cff9b6e7fa7f3e0b66ce408be62b8adda2eef2d4e132b870632e761b25d16313b9939ffac542ee75897af8257bc8f0bdf423 SHA512 e3b1ac3e8a9388c62d9a04d4c165375f71bd3d048da0f1761dae4c154290deb14a6231427ee6c38b97749fce526643626f8ac66617ea3d2e3ba4a83ca4cbc032
 EBUILD pbr-4.1.1.ebuild 2604 BLAKE2B 18016e6be510bf45f904a8f9f063e38cc69cf654c9ffc48c4d99bffaa53724b99cd6fcb247ef34caf13f3c94d0af85733f5ff9dd6ab064c2a26e4a2fa48a4631 SHA512 a620e00173bee7069a5cf2e6a21cd34ca507a83044e1a178b13ccdbb0d78aa6ef7d9dbacd3189174ca4061308da790ceca940100a8f94bc31b33092bd329065f
 EBUILD pbr-4.2.0-r1.ebuild 2746 BLAKE2B daf15ee5f683d5631576a46d92373a744398e3faac7392da015e63b87c7c4f6a965e94d07f5efefbb19abf5d71918ef4de1c7b6b0351a10548de91a6c9113fca SHA512 33f4a96e7226c979032d46e887060e5a03a42b1d74b87af9849160020283f0bd487d938911b57908e7ee6e5ca2868c1602eca61317fa457a97e7e2ee67f74dbb
diff --git a/dev-python/pbr/pbr-0.8.2-r1.ebuild b/dev-python/pbr/pbr-0.8.2-r1.ebuild
index 30612108f509..b74ff1513d54 100644
--- a/dev-python/pbr/pbr-0.8.2-r1.ebuild
+++ b/dev-python/pbr/pbr-0.8.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pbr/pbr-1.10.0-r1.ebuild b/dev-python/pbr/pbr-1.10.0-r1.ebuild
index 623d028bf798..933d6f90643a 100644
--- a/dev-python/pbr/pbr-1.10.0-r1.ebuild
+++ b/dev-python/pbr/pbr-1.10.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index 1766b2f2a223..6b56d702b49d 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,5 +1,5 @@
 DIST pdfrw-0.2.tar.gz 69177 BLAKE2B 2a2d679efd217a8de4faebb4b46d3682c7395cc7d7c70e55107994c7d8de5862bea63765e038f8110efec5fd984ad01de922227a8ac9afa2dacb4d7fa7d2903f SHA512 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f
 DIST pdfrw-0.4.tar.gz 95402 BLAKE2B 00f01f8d4cca9c5306d08094639d4cb10c53aca1c81b6c65f5639c8862a067e562c164523cc58abddb06b39dabcc50c2fbcdcf04a291309cac709cbfd0cf4673 SHA512 6c0b629e837f9bd479a288bcd040952b98920da345113bf90167becbdf2f90a9d6c082c5e7988c68118bd62a2a5a0d22f98523407996531bb5d3031e847e10b0
-EBUILD pdfrw-0.2.ebuild 388 BLAKE2B 4c9bdeabcd65689b9e356317dc1fd7b66e5954423eb0bcb22b6c2241f5f90e4b9f8c1f8e7322e3c80dbed4383dd5e9a43137e9e63b03ccd9e9c4b42ba3adc02e SHA512 a6df87ff9295791812bf042a34c70e17d76bdd58c28df3f7c64181ee16d139cdbfde64bda7652863659d0826fe09a32aa66d1c5340e1ac4100d39a89a225cbaa
+EBUILD pdfrw-0.2.ebuild 389 BLAKE2B 1fb85bf3cf0641cd780ae506081766090f80c31585683b611c83a85feff85e698c99deaeb55c13c68ed11a9d5faa6ecf6a93c2efd102e7fdf18d27e7bf46c4be SHA512 c38bf115529f4c7706cd9ebe8a8cce6216d4d64810085d9bcc84fd22ca6ac3a1f59e99ceccc95e9700900561e23e812fcc524df80099297574cb2c370534bd1e
 EBUILD pdfrw-0.4.ebuild 468 BLAKE2B fcb1924aa23564ba18ad31b76fa87193418bfbce76c45e8ebfb93d6ad1fadd35d8116d46a3d08b70502a255a7312be878f346f4f4d2c70b134f145ce0d8376ab SHA512 0db59dd56c05a47f8982cb3c51d6c162627afab6ac62667109ccbdc42bf276713791a7446e8a3ef5ddf96fcca5df051b855dc4435e77272a4d393a5c48187dec
 MISC metadata.xml 361 BLAKE2B f5d799fb9f95986aa7d1a6668bd05a4d0c0a76069258247dc537b27249cd52d374a819f646e87a6073b7aa7b739c874d0097bb4cb1df4d14381f5bd830085621 SHA512 d48a58a2fa2bf29f2739565e270bced92d417c1c9d0cba507bdd217d1ce61be0f6658e41e8100c814838bf40b79973d39ad8a0f26b04f060451929f2cb6d646e
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
index 1e01def2d505..0b1a178df766 100644
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -12,5 +12,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 703786753292..55480be625d4 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,3 +1,3 @@
 DIST pecan-1.3.3.tar.gz 120595 BLAKE2B d1169b6af4fe822259a6bad75068475324cd9c7811a8e62ae6f9c2b9bbfe69b7688a03de9c4a1a4b27666f22c34fdac95ebddbb50feba6ccda60fd2a7f190d38 SHA512 ffa171d4847e549f959dd5ed71f32b3d689ef7e2548302adfadd007f5217c4e1a16088612c27005ac6ae38bb5a99aa532e84be71ae4abf6b06dfdb26ff5cac89
-EBUILD pecan-1.3.3-r2.ebuild 752 BLAKE2B 6f3e927b519c604aa51faacfe6b998f408f43b3185eb07303471b3fe22d0d37101217fc74781e38ce6bb808810c53f9b219e5aac976e1666684868b6d2ef3925 SHA512 65a1dfdc43870d201eddef31bcee5f3d4142007ff38d50b25b7f0ce4018e1f71568cb484dd8fdf85d529911128c62bc123805c8fef9407ce9eaef387cbb1368d
+EBUILD pecan-1.3.3-r2.ebuild 742 BLAKE2B 35b7c4b814c47357f2422ca34220c9d8d3accdf27cc856bf2d71c71f8a48941384ff708087ab221e17db693a90f7e7108fc2b2dc14243628cca6f1c864a0541c SHA512 728eb3288b73c45f231b4aa6ef52c8e09337c40d0b0954d44a5d461557eeafdf6098bf363ff4413e55eccdc9fa3114092ac78d6813ec3ea06f4512c4318d34a6
 MISC metadata.xml 322 BLAKE2B 4be3ea8f134925d142020ac8fcfb0adbba264d7576f30c012a70c5ac175ef79cf9293d6035c9c0eeb52c01ab1a6288a42c926dcd40ee48951ba10122e640017c SHA512 506ed5b74b1e2383261f2ce34595e4fce40864db017ac9a8b2497de0802949a5d2163956a860d037898cb0885a4990531f200767781615056dac07a4af3a4e7d
diff --git a/dev-python/pecan/pecan-1.3.3-r2.ebuild b/dev-python/pecan/pecan-1.3.3-r2.ebuild
index 08967a809bef..f05a3339ded7 100644
--- a/dev-python/pecan/pecan-1.3.3-r2.ebuild
+++ b/dev-python/pecan/pecan-1.3.3-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 806c1c92cf00..afa3fe4b4200 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
-EBUILD pelican-minify-0.9.ebuild 611 BLAKE2B ca21e6ffacd56c6bd33ee91b8e90ea246c5b30c230ff6c1c7ac1508a006c159448c2607dabe4e148453e6e249715851ee4e231ead18aab072f5d306212442b99 SHA512 58d561d01ceb0e4640017d7956681e51efd94f35e5d1771e57ff6d4e4e08b71212a15c02e766d35f37ab37647cd656e8e83df24cdedfc7fd4b2beb7d2bbbf562
+EBUILD pelican-minify-0.9.ebuild 621 BLAKE2B 6076e8c7eeb122135d4d2bd6bc3b951cfb1629511da4f2b6efa7bf8d6140e35151f121b933932be40ff1d3c6f57f1f592458117cae6ac1973b8ad06398450296 SHA512 5c324a17289dd9d4f9fbff151c5a912d3b9848fb28982e2a3490af7857d8253046cc7276ecfdfe31f255b1e52cb10413cffd04b158d1d04b150eb993d23bd692
 MISC metadata.xml 452 BLAKE2B bbe68af4fc0f50adc241fcd2a7c39fd15a2092ce59d1ce84a72e70d3174d44c95fd00342ca6e85b2d7c014a7543dff3bdbc56e11fa70d3f091a60b3e26f797d8 SHA512 838e7d6032dde459c275fc2d6cce3a3c4a86f4766573d2950031f7cacd52d66550961bb834010a56ed9b3a45d0182da3b35e06e71c2e55cdb66fef361035e242
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
index 31a17191bf53..4c078b9c0bf6 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An HTML minification plugin for Pelican, the static site generator."
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index a8d9301b85fa..0a3d84da98ee 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,9 +1,7 @@
-DIST pep8-1.5.6.tar.gz 66944 BLAKE2B 5875895eb21c771d21cb1c415dc9f85737ae18ab10cb9ab64c758cc0fb834387b6815751cdebefeef9ea2d9a17f7c67d54d4f435a64a005213f3406d11e0e1a8 SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1
 DIST pep8-1.5.7.tar.gz 67302 BLAKE2B 714ecb7f21c457aca1a2465319c3f202d13b5cfe067418eb2e3e6f21b25dffbab891a05f5b145264e484c180b67e1fc8c4ad1cf47f1413ebeaff2bb858f9858e SHA512 ae5cc6cc47d71e90059fec0c89f5e8e7b71b08d185c95b0c8cf0aa9acaee4841d0cfc617fb1ca6d7af7f4721480a1992b6178dc845d80dfe87fe3792d515a3eb
 DIST pep8-1.7.0.tar.gz 79704 BLAKE2B f2e3585bdb3732f9be7f77b1cbf065c0938c1847a5caeb493e3cd62e6a5e19713779a087ffdc9c627481fb10e13d3ed53b3bc368182c2442f24ad57d1d2e96d3 SHA512 0077dac97846fe3a5fc654cd3ce8578845cf3b93ee097a3ae6ff2db4ae0797ad5766c69f036d6a5add786eb929a9beb6d657ab693227b8df2ba46ec0f9284b0a
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.5.6.ebuild 899 BLAKE2B cb438527e11aff46c659d8eb1e3454a7671e9c1c732326380b0202eff0aa1f157723bb03af4822ed7376b677c9691f06d1f67ffdc3faef56713c1f032488b6af SHA512 afa6d450590c6f4e509b117efb10e3b0a935b5d384bf6797fd91b66ad5b1d1b126034495ada49da950d76522f1ebc5d3869c9280dd49794bd6742dc577753e70
-EBUILD pep8-1.5.7.ebuild 909 BLAKE2B 4b9a077f9a36b8801f711ec38a27510aa2ef9808e508e188b9b729ed12fe176d2091314b5ca9d882638d31b55928ee422ca59a70691379899d12a6b532d8a160 SHA512 da171c2bb14afb7b42f889a5ebcc4211af958f3d7ac7044619d4f17280f3c0b447ca4a653510f9f1e685a64b7daf36c812c98398c46ed17f0663e37bacedb302
+EBUILD pep8-1.5.7.ebuild 910 BLAKE2B 8a808fded4e7a6b3dfa8f3e3d8a156cc51145830acd2004d2c1b6384ad7b6a2aee50a3997c4cd65be49ced08b0ccde605613914000d2a53aba23f0255d94ddb8 SHA512 a3d79be7aaa6851e1ee10e56de7afd7e9e905e30f8e67ce01438221ff9a741ff0eaa131a1172ae1df56d9b243f49a319037b605033ced4bcb3c723209d97da80
 EBUILD pep8-1.7.0.ebuild 1086 BLAKE2B 7fe87108412495ab24ea699f4014727b96fd673fb54f129885f1ad5020c285aa581a67841c2c1732e6973dcd93ccc51afdeae1335685bf334986a201d1e0e73c SHA512 5e79ffc839a4f0a091d76e00dc01d7c9248a3b1d9a31558d2a4806c5f8b837d6d04c7052dff0ca36c6c3306c5a16b52a1d159d074ab70c71576d5decc112d996
 EBUILD pep8-1.7.1.ebuild 1090 BLAKE2B a037ab9cc4391c98c901bf7fdc03deb756a780f37d5cc2f7c3e1009400861e5ab80f0e87c32f8dc85f2751ccf11c3a3f1e9de8d8aa4f58a71235cb999a96cd25 SHA512 70420ba74f77dba3b740a62de4a23ba687a1e7b49cd999585f6c38692df6d96ea9a50179e08b78a67f3f38a10b52f1c59a4674057692175c5ac6d13c31f843d5
 MISC metadata.xml 373 BLAKE2B c13332bbd6ab86ea6a6c9d6cd0dadde195528493cc7984e31416b833906e692cbadd18f4185b6cdfce0e2847750ce05a12f70d29d4fa98d3932654b73aeaa9ca SHA512 0c3ea303192c4b56bd910168dbac81284231291053b5fbca4a5a0700cb40ae8646f1b201fddc76dfeab52979c4c5944a67a2b0c62cfdf5c020c23e09e034056c
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
deleted file mode 100644
index a0d85be25a07..000000000000
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index 3e28f5a824f3..f9590a261725 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index fcf7fa960f49..14c75c4465b4 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,5 @@
 DIST pexpect-4.2.1.tar.gz 143980 BLAKE2B b5cb9c7847eabdf8778bddc6b208520edb9b3611d7a981fae6e371fa6deafebe142ba8361e3a1d21187cd692576c91d732f3def75e19989296f50b2a9fb4d4c6 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261
 DIST pexpect-4.6.0.tar.gz 148966 BLAKE2B 0ed1a3c31133bf618e4c75ea099efaa9bda9e2b7f92f46c54ad553ecc56487e5415b750334376a95599ada53e17e91efe7d4b65ad80bb4f6a1cf9d655a3c9685 SHA512 9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd
-EBUILD pexpect-4.2.1.ebuild 1167 BLAKE2B 019443fe1699a063f62607b982518b4c89e92eafbcc9b68e221c76580143e5ec336255d4f2f49074a34d552d1d980bef16aad725d0d1f4301cea1a016ea824d5 SHA512 4ce7be1f1ea47c291a20989d58938f03dd6bd37681d17b09e47049ab07a121f1fe5678663ecc5719c648cc96a5806808b0b2a97921a9cb8873d473609664d2d3
+EBUILD pexpect-4.2.1.ebuild 1168 BLAKE2B aabd56793bc970d19f516013622ce188963d2c9205b1ef868d2068d9b7140f17dbc02ba30b46be8cad294bc867e906be6008eecb69bf2ec6fc8dd5114c401530 SHA512 bc051a4a08ada283471d4f87513c9ff3afacafd806331d8ea07c35df5fae9538bd875a030a9833a95f71aa1884917edd59abb73439a7c98943f8526d230eb8e3
 EBUILD pexpect-4.6.0.ebuild 1045 BLAKE2B f56ef2209e5a7bc5e03315aafc8fa061156eaae1124d558aa3b5b530cdb474fafe68f76d38bb87e6c97e564b771657dfbd525a4f733c420a4cf475141fe483c6 SHA512 08572970caa6e4b3e9777a1eaab78ea5d7cafe22ef85c8645784337bd71082a381fde19286e96e8f156eefae2226220d2c807d4c968e02f8d798302e4256dfad
 MISC metadata.xml 377 BLAKE2B 72c4b35c12a770df9344987af8c7a392c3aed05296a4876902987ef946239f8318ee833cc81a7f004719e954670a83e84a3813bcdaac48912efad885515de1ea SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index f0f81fa7e562..3195bf950aa2 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -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 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 5ac098f5d4c4..218a10e8438a 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
-EBUILD pickleshare-0.7.3.ebuild 664 BLAKE2B 7a3a4979799d83a8ef177217d0fe359fe41c7a0da30b6ba8f46d75181ef8307d3a5cf676a78d93d5ed5d79e53f1cccd9db903a495b07519208a11b54e7e46f41 SHA512 cc4fb64b6207a52a83e014ae40bba4739cf6f64e50006845af014344236d72fea463f51e0dbea030ea1cc0f09dcce47de11880493e865552c63b78f1c62329c1
-EBUILD pickleshare-0.7.4-r1.ebuild 685 BLAKE2B ae3734da0d0e47da1fb595e9df1c85d2fb8b8435a0ae72cd0c56d3f0bb255ca4a69311575219d7336be42d837258222601bf2b6bdc687b74e281e8dd45380d7d SHA512 40fefd6637f28499ffdf4e546f751576f453f97e24f6fc1abd8eb83d26e4e4073e8bb5cecf8aa23576205d1c2d9c915f1aeb9bb22c747dc26150fa46bd805592
+EBUILD pickleshare-0.7.3.ebuild 654 BLAKE2B e12311d3a7d0bc3e468cd664ea01472b9025e5ebb59c2e7701e91c9288e8247cfcf414551c34790b288025a9c2427ad48fedc1da70f6b50ece79711aec8d49e0 SHA512 568eb4ade5f81f1ec780bb1d65825b6a1ed7ad1892519fb263cb8ebfa5cecef9d5fd8f9cfb6a40c14f9e4a709f1b841a149836c341f37507ff6f61a7f5c927fe
+EBUILD pickleshare-0.7.4-r1.ebuild 675 BLAKE2B a28ce8d428c987d6008ef327878144b36798b04eb3f8c0deccef8ba48044e8e239998b4d0753ef7d55996e177f3c1a54058b26b5e02d5ccd84cfbb95e4d3b051 SHA512 9098d59b30d6b7baf8612a49770e2393d2f87d2f6e1d32fae0d33bf165eca789593648337cecb7a3f1851dccf44e16483adccff312ebac1a9deb24904d8f1199
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.3.ebuild b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
index 19081c353265..ee3276138932 100644
--- a/dev-python/pickleshare/pickleshare-0.7.3.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 66d57491af6c..66cae6305a3d 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 74789e532d5b..9df077f9bb3b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,14 +1,7 @@
-AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
-AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56c1b1dc6bc65227aeb55c9074b2318462ff1447597b75a269107ccf223363054b310ede3771448e813589b71a220eed SHA512 a53a5ed25c18f1c5a8db01dde5d2c51dd34387d66c4cdbdb624454d0a2a19f4e09a771490114744de0299231d95ed02360223db5c227cdc540752a1c60bccc92
-AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
-DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
-EBUILD pillow-3.4.2-r1.ebuild 2501 BLAKE2B da1dce4b7de4981de61256b05f713733c7d8ab1ab15b70f532f0d51c12e355689f2a2aec7bc794a1b31e5ffa7639559b7216649207f0d86ac54bde9e3ab4356e SHA512 c45d1e96b4b2fedca0bc207688884a1d8ae302feb8429c4498025181f514c2d67539450859f96e744788e4ce426e95fa20126ecfcd83825aae24c03bdc3e19b7
-EBUILD pillow-5.4.1.ebuild 2790 BLAKE2B 1a563797081fbc9fd5dcefc7698716638e9d9fba9931bbed0b21fb2498612c6e16954ec6eb13a5927fdd02c5a9a404d521680af2538fd80845a79cfe5472db59 SHA512 1d6bb22a67c297f8d9826a77bbeafe1fbe112228591639526d0035e2bf85d9e2efda69f9a28ed707f43ff71738f1e945a5c9ceccabd4719580bde92e502dff98
 EBUILD pillow-6.2.1.ebuild 2648 BLAKE2B 3a93f8baae33245b32c5d90800a699f6f725d797d1134642517c0ca137aa90834dc19724c5dd187e51d309add143b73e4044c974de351a858dc929e785da510e SHA512 776123e3352e5023e7adb9008c229e625330c772a62ad3f9ffacc6300d88f58b97b963b9c5af40ff62c4a179b985409d42f182a9df4c6e29a4f731b737ddb7c0
-EBUILD pillow-6.2.2.ebuild 2656 BLAKE2B 1a57b5e31cd1c73e201e4b09a24286c00be3196c448e13a7c1a560e7087e077057606b5938c5bb5139a4cc5d3ef4b620ae86561b606f7d8bf951ee3ed786beb7 SHA512 89871307447ac46b0c1a92aae11eb4a3a0e16d498429183a1431d7b15f15b2b369faec94644306f37d0d378df9e0aeee4556c145c3d3ad401b4d689fe28bdc23
+EBUILD pillow-6.2.2.ebuild 2650 BLAKE2B fe771e02b32bf3ef0ee0aa7e48f3d53ecf7e285440316f525b0299ab9c2cc6882c4d1f13b07db6646807d481716a850b050a6a4d4e298b4f8cbb7b7685f391d5 SHA512 55f55d95a21bec33dee065ccd75d3e45cb0222c345d9234660568f2db59c3904a49e03d9e6fe1d03767fd6d57828462469b660d969501e56919f74b621359752
 EBUILD pillow-7.0.0.ebuild 2646 BLAKE2B e1b5a4fd0c980780bd16212bb19965c67a3a4d024003d93ccd0385340d13fd46f7ccdeb89ed77770ce9103dd0cba2a2eb82fbfc2b0573450faeba3b58eb02a12 SHA512 22592c3483bab0ddd13546c47f085f0ab5007a8cf7de7754663be31454049dfc949d32d14dde7380e96ed0fa062a9ddb614f494243c7808a597cddfa717d7547
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
deleted file mode 100644
index a8aa0ecc0d0f..000000000000
--- a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5257e748..410ce788 100644
---- a/setup.py
-+++ b/setup.py
-@@ -746,7 +746,6 @@ setup(name=NAME,
-       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-       include_package_data=True,
-       packages=find_packages(),
--      scripts=glob.glob("Scripts/*.py"),
-       test_suite='nose.collector',
-       keywords=["Imaging", ],
-       license='Standard PIL License',
diff --git a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
deleted file mode 100644
index ec227b3f80a7..000000000000
--- a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2019-01-06 12:12:16.000000000 +0000
-+++ b/setup.py	2019-01-08 23:04:45.574698210 +0000
-@@ -197,12 +197,13 @@
- 
- def _pkg_config(name):
-     try:
-+        command = os.environ.get('PKG_CONFIG', 'pkg-config')
-         command_libs = [
--            'pkg-config',
-+            command,
-             '--libs-only-L', name,
-         ]
-         command_cflags = [
--            'pkg-config',
-+            command,
-             '--cflags-only-I', name,
-         ]
-         if not DEBUG:
-@@ -298,7 +299,7 @@
-         _add_directory(include_dirs, "src/libImaging")
- 
-         pkg_config = None
--        if _cmd_exists('pkg-config'):
-+        if _cmd_exists(os.environ.get('PKG_CONFIG', 'pkg-config')):
-             pkg_config = _pkg_config
- 
-         #
diff --git a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
deleted file mode 100644
index d3e95eef5164..000000000000
--- a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2019-01-08 23:06:33.082873069 +0000
-+++ b/setup.py	2019-01-08 23:06:47.707165225 +0000
-@@ -356,7 +356,7 @@
-                 for d in os.environ[k].split(os.path.pathsep):
-                     _add_directory(library_dirs, d)
- 
--        prefix = sysconfig.get_config_var("prefix")
-+        prefix = None
-         if prefix:
-             _add_directory(library_dirs, os.path.join(prefix, "lib"))
-             _add_directory(include_dirs, os.path.join(prefix, "include"))
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
deleted file mode 100644
index 78939fb69482..000000000000
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-better-theme[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}]
-	)
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-# See _render and _clean in Tests/test_imagefont.py
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/pillow-3.4.2-no-scripts.patch"
-)
-
-python_prepare_all() {
-	# Disable all the stuff we don't want.
-	local f
-	for f in jpeg lcms tiff tk webp zlib; do
-		if ! use ${f}; then
-			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
-		fi
-	done
-	if ! use truetype; then
-		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
-	fi
-	if ! use jpeg2k; then
-		sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
-	fi
-
-	sed \
-		-e "/required/s:=.*:= set():g" \
-		-e "/if f in/s:'jpeg', 'libz'::g" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/{Imaging.h,ImPlatform.h}
-
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
deleted file mode 100644
index 6d18e5a0d47e..000000000000
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch
-)
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-
-	# setup.py sucks at adding the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but this setup.py does stupid things.
-	export \
-		INCLUDE=${ESYSROOT}/usr/include \
-		LIB=${ESYSROOT}/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx pytest -vv -p no:relaxed
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
index 1e93fc0e069c..fd6807ca95a2 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 7d6a8f69ae4d..5e1c9c1d1dee 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,17 +4,22 @@ AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8
 AUX pip-19.3.1-disable-system-install.patch 809 BLAKE2B e3a6027922291efe4d1603cb730a9b6aaf653692bc176fd9eea5b804f3d10c419317e9caa97673c02533d4072baf99439af4f76bd38dd5c2ddb98a234ea32c91 SHA512 cf5418444c1a39716b0e528f0630ef931cdd0a4890d16801a575a5072600eb15195d0c0c67e711290e5ed6c7fc40da3f2fd3e5993c638f152240e0ee6f895ac0
 AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b
 AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e6f02c0e623f33e2bbae6b5b16acebc34c9205c53d8221ec98e99167e26eb789d3fbf075406bbdba6dc74c120288fea2d0bcd98beeec SHA512 eb2fb10828aca4a1179f8763c63d861f547e2d92da32c7fd697863e26583eba4f1b0d76a820a82afe3803a6ea22c61b01d3fd98291ec5cff4700855294b19286
+AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104
 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
 DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6
 DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
+DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
 DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
 DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
+DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
+DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
 EBUILD pip-19.1.ebuild 3584 BLAKE2B 546155c7fa234911831c843c8162e47abd037446b5968c4de59a6565b972318e973a646e16e9383b2be4f6a9d963d67e9e26725e9fc52a1a1d2845a159324d59 SHA512 018b88185e223c3578cdd6bac808807f23de514069b7a13fe3d285b284d1c345ca8c909832d5975efed63c8ceacc908852ec136973793cbdcd8e1f1fc45c445d
 EBUILD pip-19.3.1-r1.ebuild 3953 BLAKE2B f3c56b3691e0b595a543934a391a19c27b20b4c14c57066f76535bcdfdd34d0f45435d44f74b844ac85a86389e2f4c99dc99a6f369558c788327e34496f4ea17 SHA512 c4a2d0d4cdfdc8dc917333fe7ed2e0e1e490cfa00f365d9bc6e1fa8719400f271ddc77c25aa8191f1a3fe3592de10697855ebabc2ff287b5cc7b52d9de6885a5
-EBUILD pip-19.3.1-r2.ebuild 3918 BLAKE2B 5f152cb94df93812508d2136f13e7dda36b9a98f0cf6ffee4ead014b701b28d45629f6ecbf502e79b078801fb2af1f50a0c19a785d5229d06aeee18522041428 SHA512 ea7ad03d938cc024c6cb30d65b4d39edeadb591d9feb364a6f951b13d943de9c6fb9b1087b445d61873ebd344d04a7972b28f199efe134495d81b83ce5caa37c
-EBUILD pip-9.0.1-r2.ebuild 2454 BLAKE2B f1d5f60e453f92dba7d70ee49e51f870fe32041efda283c4617304a7b85d0b8aebe84b0a30a018400204f6eda2aaac8a0e0ea82c72f8413034ac356789655cac SHA512 7dacd90b1e9fabb6d34821453b1596e26d776a7020a969fa98cad1a7580036dea244ab111ea8687439fdb28d3bcaf9d58c6086021517e1514dbc253835669b46
+EBUILD pip-19.3.1-r2.ebuild 3916 BLAKE2B 0b5663135d0c61e1fba71bff7de5e6b9e74a989f674d1cc1dc418a20631bd0d72680e9360470257b1205100a6ccf7c8f876e236327f591ba1614dc237fbe530f SHA512 f30cb585dad403eea8cee9d17f4b602ab34bf582762ec086fdfd0f93f7c0314421df62336112f42d42528be8072e2cb798cd5e5d1c8c8a6b03fc160ba69d1a5b
+EBUILD pip-20.0.2.ebuild 3952 BLAKE2B 4f98b1113c7c8804b1ce06334e13b129b0077c6aeb257f6dc9cc1fb0b7f9d4a47aa182d3fde3b5e68308517e42d79ad2fb5aa7c72d6d075b1fc18d92a23d50cd SHA512 d9688d6f7c16f31b72712b645c1e5f2c2b1e9797687dada5bfd7b250d954fefc2a7e716aca5ba32785111426cdcdebd53decd82939c93185f252a29ee8662880
+EBUILD pip-9.0.1-r2.ebuild 2455 BLAKE2B b891741da8946986a3140e1023ec956358d70b1fbabc70964ae2edf596ed96d0fa80b62732da6193ba6a9e45c81ce239058dc4054cff59b3c749d309cda3f85a SHA512 727ebc793313293384c9fcc32e403fd5dbab8ac72528fe0bb96b2011ecf9e8b659f6b4fa0b5165b97d68ef33627b0c0233ce88b955fd962b794d10c613659a45
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/files/pip-20.0.2-disable-system-install.patch b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
new file mode 100644
index 000000000000..c6b5354bc68f
--- /dev/null
+++ b/dev-python/pip/files/pip-20.0.2-disable-system-install.patch
@@ -0,0 +1,29 @@
+From 57d610bbcc721c2e58fd2e9f3197bb3e3acbd935 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 1 Feb 2020 09:14:46 +0100
+Subject: [PATCH] install: Raise an error to avoid breaking python-exec
+
+Running pip without --target, --root, or --user will result in packages
+being installed systemwide. This has a tendency to break python-exec if
+setuptools gets installed or upgraded.
+---
+ src/pip/_internal/commands/install.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
+index 02a187c8..025b824b 100644
+--- a/src/pip/_internal/commands/install.py
++++ b/src/pip/_internal/commands/install.py
+@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
+         if options.upgrade:
+             upgrade_strategy = options.upgrade_strategy
+ 
++        if not options.use_user_site and not options.target_dir and not options.root_path and not os.getenv('GENTOO_PIP_TESTING'):
++            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
++
+         cmdoptions.check_dist_restriction(options, check_target=True)
+ 
+         install_options = options.install_options or []
+-- 
+2.25.0
+
diff --git a/dev-python/pip/pip-19.3.1-r2.ebuild b/dev-python/pip/pip-19.3.1-r2.ebuild
index 1be38195935a..8e2cf18dff9c 100644
--- a/dev-python/pip/pip-19.3.1-r2.ebuild
+++ b/dev-python/pip/pip-19.3.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
new file mode 100644
index 000000000000..fe842dac9547
--- /dev/null
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+	)
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+
+		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local -a exclude_tests
+
+	# these will be built in to an expression passed to pytest to exclude
+	exclude_tests=(
+		git
+		svn
+		bazaar
+		mercurial
+		version_check
+		uninstall_non_local_distutils
+		pep518_uses_build_env
+		install_package_with_root
+		install_editable_with_prefix
+		install_user_wheel
+		install_from_current_directory_into_usersite
+		uninstall_editable_from_usersite
+		uninstall_from_usersite_with_dist_in_global_site
+		build_env_isolation
+	)
+
+	distutils_install_for_testing
+
+	# generate the expression to exclude failing tests
+	local exclude_expr
+	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
+	exclude_expr="not (${exclude_expr#or })" || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+
+	pytest -vv \
+		-k "${exclude_expr}" \
+		-m "not network" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-9.0.1-r2.ebuild b/dev-python/pip/pip-9.0.1-r2.ebuild
index 4443d68b7d97..8b98697311dd 100644
--- a/dev-python/pip/pip-9.0.1-r2.ebuild
+++ b/dev-python/pip/pip-9.0.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-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"
 SLOT="0"
 
 IUSE="-vanilla"
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 18c7f226da3f..4f58f0bb4a54 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -3,5 +3,5 @@ DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
 EBUILD pkginfo-1.2.1.ebuild 1390 BLAKE2B 51c58d39105d699358a23b48a0d6f7cd54b5ef8ad04a8e4c3997ed29aa95849fde781e271ca27dbf48d0fcfd342af5a6e80fd2c9759d504b68b8353a451856af SHA512 add429cbfc58fa8c76e240aba93b75216e922542d5def681afe09eaf71e308a8cebd58be4d84eac0d625c2186db2b1ae8ab4a1033a52c67d1e32f211b3056c12
 EBUILD pkginfo-1.4.2.ebuild 1343 BLAKE2B e3cd6deed1c90e0f958bb80f2a3c7f92b6c8fae552bd69cd6d8d9e874f9f3c0890f68a889c81a0fd558a2327135fc1ddfccc031e948554a121c639435ddf5a65 SHA512 493cea3662910927f3d24b33e3214d9a46ba99986a34ad5c656cc3b708c6ab8a2a08021f4cd3d3af70c41d4e71df15f1ac2d3aefeb7264d59424eac1736bdfde
-EBUILD pkginfo-1.5.0.1.ebuild 756 BLAKE2B 735c523b52991ce8e848460c92e1acdb271c59449be1d750d1235c5dc54fed56adafc0d57972045241a4b2d573734b89ceac0abfca82f842bc15d4a48ce2cc30 SHA512 fbf6407e470c60e8b8e509c6d329251414231c580ef7142dabed130efe822541f793c6f6b141b1b0697420db8d381523d220072588f424f82e69f69d80c214d6
+EBUILD pkginfo-1.5.0.1.ebuild 754 BLAKE2B 8e49ef9fd66b2389313031c5fbe67d8de14f167455bdd9bee174bdbec4bccb2fea333362ccf91ad66d17c13dd76509b21104f848f8b0290618fe7df2e8a5ea9a SHA512 5180b149353ddd279b7887d82d972049c4f5e8a1c54bf18228511d17b024108a9042356b42002fc7c754dbde89741f93f7accfff0e27c66ee7bc50a9c1fd2f7a
 MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index 7865c0c3efeb..185725f25774 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 109c4e0b7601..aed95da0b2f4 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -9,7 +9,7 @@ DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff75
 EBUILD pluggy-0.11.0.ebuild 848 BLAKE2B 80958b043b2d88b8809316134b1f36cc3f7398127e835c74dc35e7663f9b6321aa32aa9229afe7e6ae94f1b58d8c3cea23d3b3b611542e325f5ccbfdfa5a722e SHA512 37da9447f756ad570f6d564aa4ffef38836e0cf350ce5559eb809a137129c5fa95b774b98618b5e7520f9cfda027f2455a5cf71af57592ca32cb837d430833f8
 EBUILD pluggy-0.12.0.ebuild 783 BLAKE2B 301fb765ffb292678892339680740150f60e7f91f94513be75c230065f7ae315dadbfb87db89356979e53c9099e951cfda2508ecb6877495d23d4ac5a67f93dd SHA512 958411a70cd0f5f7a0d0832fa5cf03e6615d0446f34727f757af4934cac58a7e1e46322988467712738044cb9ddb56683c86c4a43f14f1c09e646325148750e8
 EBUILD pluggy-0.13.0.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
-EBUILD pluggy-0.13.1.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
-EBUILD pluggy-0.5.2.ebuild 746 BLAKE2B 535ac3c99af0f05174ee709e42e7b9d7cc11b40b0ef42dd0b38f9157b25523d2c7783b372547bc5b8fef3aa2eccc78f26f1a791798b0235f251786a6c560fb71 SHA512 9c35e48e1dc27314417177a7bfa428d3c4b35fd4cefac533c8f197d3979c253280eb7f698f26f65203f788becfbd62b12473e09669c4f5fb98c4b10a87c08924
-EBUILD pluggy-0.7.1.ebuild 914 BLAKE2B ac2cbbd21e5b2aad5f9345327188d2e1fb23800847b65936572c631f83e1ceb590008af6f7b46f52a774b88f88da10589ed935a7317616f232e021d21e5325d7 SHA512 f603affbb5ab5176222ab1c7daf243430191358654c58ddd7080a29da8e8296d263d7ac94a33d8a80bbadeb8c62439eb037c86687093162b759bcbfdf2f05660
+EBUILD pluggy-0.13.1.ebuild 686 BLAKE2B da805d0d68fcd46ec835f3c88a8df99a28595babccd4e25e217bde2582559011153ee5abc45a9a4cfa5e25933f04eb4908c30573bd803a2c2a814a2415afcaa7 SHA512 9ea9b9d8d3c4b6502b5fe7bb1acad3ef3bbf880c8c3efa746e3515b4e7805c2684a9dde6fda47d28dc556ed020aed797ef0bd7480bb28af44a28d5880c4e2a91
+EBUILD pluggy-0.5.2.ebuild 747 BLAKE2B a43222708244672057b0f23181efbe8e6c346bca2fef9c3743fc62958fc988cfec44d5d6ecfc62aa77c88c42a8f3b5191e555ac672833c1c9d6fbedffe4353cd SHA512 3fd3be31eeb2603766c4c4f023350271ac89cc663ab4308decdc326f7376069fd2227d31ae2e6d0f530e64b4c29f05dc13dbd6b90e7d37e7b05c88d9b3801cf6
+EBUILD pluggy-0.7.1.ebuild 915 BLAKE2B 665e09be07910cd939fd0ceaed043c78a29a0458eb0b180d2ba283544b912241ab8d6e0b308cfb7bf225285926aa83bb3045a289a1e4fa799b19c1f6a98760be SHA512 4e5414f177bcbe529d0e122f8d57ea08c860f356d91e99cd8a787826163ceb97bf36b21e6e9fd045b5cac6182bb545119be56b426a989ebe571e8a98526f13a0
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index a34865771512..ff8971cb77e3 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 sparc x86"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index d8e9e94b6d58..3b9ee4d7a37f 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 7e9901100220..57e26800956d 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index d4d8ac06d3a6..7324b338c25c 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,6 +1,8 @@
 AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994294d0116380d61d05fa0ff509f2df07e869fc12fb817d8c0ae3c97c9c71cc65b3e028eff708ac82565b09 SHA512 cd054cd97f055c571b627bdb54b4644dca4653f06efd9022a74cbd632486f1fe3cec65969168895aba85bed4bb0e060bbaf11009d31d21d9537dca5b4f29a539
 DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
 DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
+DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
 EBUILD plumbum-1.6.4.ebuild 491 BLAKE2B adad559078aceb34d72a23426fce44fb93126c211abbdff3d6016a5cf7210b8820290d100309ab74718d63fc59ba71570f847edc851160fcfa4d86e8ed4e73a3 SHA512 63d8eb1a3803e78bb9289fc617a9b9a3cc5bee8d599227404261e6849816b32a6bdfef3a6a0bed1fddc4de3e93b5ef43ba2574b01405554fb666cba96429c276
 EBUILD plumbum-1.6.7.ebuild 460 BLAKE2B 73ea42329dd29b727a8029df84f06f7c62283f267bb9b79065c7cf049c7756a4dfdf71255bc5d3fe69c677c3540bcd75f531dab9af14bc3bcdc7c94a332a213c SHA512 be94a1adde03124dc575fcbbc2ac2468d58a8ba05c05c7e7f858db7995fb20fc9e197b24c37d61b5b42fc7155cbd781576c9a25dd619b09eb67e6337d81353f9
-MISC metadata.xml 667 BLAKE2B 831314c0a117c620e7d17f7023d0bed99deba80cf0d84852bd972ca788aa8e4ed6d959938fe5c7592db95b13d600a86b7928aa46a58d65cf1b9e48a2209b5c61 SHA512 c44ac643857f1e096d33e7ac3ae9a5a7e135861b7f6e26a3b889d9cc4fd5d302ac9657520c73cdc618b95ee31f168cb2e5704c1bf1b7710b859e57a2abafa812
+EBUILD plumbum-1.6.8.ebuild 533 BLAKE2B e9dd14cfef1018a2be7a3d1571f61032d3b92e02802c768fe13b6a04792d6c02dd2a8422e7a1e58a8ee3620cc9104f3ac0027512e44acfcf937d877c7ae1abde SHA512 411247e3f83b1a0858ffdb0f6fde72568fd6f712a0cbedd614cc1f010ba251441ed271c6d5f11ea0ba5568199875cd8c99d65604fd891754a917815397505f2f
+MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
index a442e52d0d35..c2d77974cf88 100644
--- a/dev-python/plumbum/metadata.xml
+++ b/dev-python/plumbum/metadata.xml
@@ -16,5 +16,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">plumbum</remote-id>
+    <remote-id type="github">tomerfiliba/plumbum</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/plumbum/plumbum-1.6.8.ebuild b/dev-python/plumbum/plumbum-1.6.8.ebuild
new file mode 100644
index 000000000000..b4e2f4a61f2d
--- /dev/null
+++ b/dev-python/plumbum/plumbum-1.6.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A library for shell script-like programs in python"
+HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index e562ca46ad81..9b4dd91f0e7c 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -6,6 +6,6 @@ DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
 EBUILD ply-3.10.ebuild 1107 BLAKE2B d3e29643cdd3cd9586cc7597976db6edca6144020784787ce6be850c41ecc5e48e6d647cc2e0532cfaa09cc933992a29735ac693e8bbf94d8492509addd3ce82 SHA512 f87cd7c711b598f1582207ea437ec211fe8f416cbef0fae86a9f4e59151231af352cbc7191af54337fe216f4f63f3b846f558fd8b1c881898f140bdaf847a706
 EBUILD ply-3.11.ebuild 1145 BLAKE2B f5bcceb5f39ef5e4ce002b65cd25a466512636f363f5d5d652b741e411ac9fbed6d548cf08623899bd25672ecc6d91da651787f194715ea136631f2f2146fe6b SHA512 bde2259628c85d5c36fd30a9548e3e0b1152b58439a1a7fc68d104ae4a74892f4fbac772bdc2d9b4452ee5117f3a04f923d8d5e445a66220a866c2fece5c512d
-EBUILD ply-3.6-r1.ebuild 1120 BLAKE2B f2d713488d8ef56bdf14f9b9024e915f548165ded2a85166fb827169701fb9adafb3551165f56016088dfae58a8188be7d1d1ca307e978d6e950f677ec93351b SHA512 388120427188978d09f176250fdbf8e3268ea56b22c197d3d439f97a197fb8456a72b97112792f4527784242c70d140624b393551e23f5ff0002aacc3c3aa918
-EBUILD ply-3.9.ebuild 1085 BLAKE2B 631fe4ba3b208114a2ffc5f1b76bb95f77d3abbb867ca9fb96e13ffd10388a9920cc551750f92d1b8ff6c41d6e0e15910f96ad3840072a90d88438827317cc33 SHA512 8514e1fcb0b8eef9f1ea22c646a6bebc4856f08b7a1c691bb2da7a2ef569775c13b4c81ef945e89017850a1e7b00e12fc86ddf1a5e3f9af5055f707ddbb1dcc6
+EBUILD ply-3.6-r1.ebuild 1121 BLAKE2B 89d5105f0ad3d68f164892eb7ddf652520ddd56fed7293690d4f67b407d45eae11ddabb252874a73de30928e5738ef57a1f2f5ec72dbcfc5c2a42c6987664eab SHA512 8d7e2d96f707c04419f4a1b2c0aeef424590b7fd81f683aa9ac28c8bfc8ceff63bfddd3b033315505b486c9fe4fbfe66c2f33e0e779bebf63def4d79699227a7
+EBUILD ply-3.9.ebuild 1086 BLAKE2B fc6480a41b4157b27c64f8406893a96e457b544557d2194cd341be37416268ebc3b49d7c3d9779ee524beca39f04378cdcc3a0a2a15bec44a664b5a709e45f84 SHA512 6586556e880df7376b30b4275b615e224906414d2cee2883716165c2faf94e9b6395488f59b46a2619091d9b43d4fd488b65c9c484e157234d6d283e9dd03ef3
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index b83b2b6dac71..96b5cc8bd4a0 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
index f5cd4d1b7bf7..7fe61b77d3b4 100644
--- a/dev-python/ply/ply-3.9.ebuild
+++ b/dev-python/ply/ply-3.9.ebuild
@@ -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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index eedeb4ef76d1..76e7c5c08860 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,8 +1,8 @@
 AUX pmw-1.3.3-install-no-docs.patch 480 BLAKE2B ad4403d5bf71ae2fc2788c5a8efef3c7bb763deadee84b91db994f1c2522043302be7ef5c06fe7327a86ca12eb68c4143d7bd004154cf06ddd3b999632fd15f6 SHA512 7ac3e8914ff603ac30d081bb373dcea57466738f63b540d44ff4d768ccf8f6c253a3e0a5446119886401be4b85b2660be55a1bdffec8a607e0e78acfdf8b50f7
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
 DIST Pmw.1.3.3.tar.gz 451232 BLAKE2B 2ea74cf010b094539b1e052850b358e05a561aee1990de7184244b77a4133c1259ff54fa6e47c5368dac4bf81bf23e9217742ef1327ab7e20b8dca27ebf5f333 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668
-EBUILD pmw-1.3.3-r2.ebuild 1227 BLAKE2B b95220e48ef2ad28960a750d36f7429a0cd02d67345262c9a95d68b629167f57e0db542e0701868770ca817a7b8c27c76e6e74ba4dfed17d2ccde84b1079ce43 SHA512 1c5fa6dcecf737a07309652a046cafbfcdf9333a8dea32626fe8a08fcb1867bdc0746a1bdb79814418203ddd0ab8c38a57fbda0e2c9c83429dd1d571953927ba
+EBUILD pmw-1.3.3-r2.ebuild 1228 BLAKE2B a6a56f73c376303f8fffbfe3dac8b03b205c2341d08fd7d793893cdbd81d7c31b7e9008b666807c3ed8ece35f56c79c48a3f6d6fa846e95844db3820026f67f5 SHA512 dff851c8011e0b78a148a35f5d29b5ced35be3411d09f434e619ddb54aabcfcc197a8c41f0c3ef9970d31c2ea287707ccabbb84cefc5520ca0d3cf24a70016b5
 EBUILD pmw-1.3.3-r3.ebuild 1214 BLAKE2B 58373ef472193728b01d035d76b4a319b712ef169d683cf27bf873a345853fc22031166e264b469cf3293afa81e6a77a4ec55f639b09f02bc8c3a169ec8090b7 SHA512 502b61d69b1a228e25128881505d052fbae4a959dbcbd324cdca3bbf1b094afbced946927ce0c5ed005c8d413c0f26d8d2e32bb5213db71c61e977aea7a459fe
 EBUILD pmw-2.0.1-r1.ebuild 1209 BLAKE2B ea77ededa8fd3e3258fd68f2b08dd48ae9faa643ca4838d7391faefc603fd0fcd48169785ab75fdf5732d59143c8b8898712d2f37dd85cada866e138d12458df SHA512 976368d75e89f86224ce419669ef4a10a9632ca8f7bd8023359f97bbfcd0cb0c43f3b4f98aa088f1725efe3b97f51fa40909207a35c1f2be82500466908904c3
-EBUILD pmw-2.0.1.ebuild 1198 BLAKE2B 58fcd866218095fdf63b0240bcdccbe6bda5914f4fd16bee5f64216a04eb1bcc7153a01f8a8c7f181afac9730bd01ae1dd37e65fc6f94c8d837538b932a9b3d4 SHA512 03276c7f5361633dd2623bf823a855743a324de42e2ed286ad141638c9148a6426e0280b9af32d8bfc11d7091af580f1be45828aa1b25673efab01829f881e95
+EBUILD pmw-2.0.1.ebuild 1199 BLAKE2B 2cf18f9cccf499a5269242550837de866ce72d96db5edff94e50c0bada65aca2d550610d89a511afb4732adc5738cea8820ffe992522ef2d2b5328473f6c22d1 SHA512 cb9f6518e57dcc393d00eec2ee8d433d7a23820e286779056d4af9a68b93f9164e6d3f46fd072cdced26d2619f9c7a456a7ce16aaac63b90f005c00f253ecab4
 MISC metadata.xml 366 BLAKE2B c2d56d3c744468056b41ca45aaff5263692a9055807ae406644d9c482489f004271d932d56e078a2d66bdca3f17332e0ac03c7f93d7d41890db0eaa90c004002 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7
diff --git a/dev-python/pmw/pmw-1.3.3-r2.ebuild b/dev-python/pmw/pmw-1.3.3-r2.ebuild
index 7532cdb63cfe..b01c0435f421 100644
--- a/dev-python/pmw/pmw-1.3.3-r2.ebuild
+++ b/dev-python/pmw/pmw-1.3.3-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild
index 43b30cc9de4b..10564debca1d 100644
--- a/dev-python/pmw/pmw-2.0.1.ebuild
+++ b/dev-python/pmw/pmw-2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 6af36ed0267b..45b580ccf9f2 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,7 +1,7 @@
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
 DIST pocketlint-0.20.tar.gz 23443 BLAKE2B f3f50c8f54b35e6d1bcf544ed6f55f2e3e461289929a6da5cf3028283fd97781d7b41d6ea458146ae7b563441aa52b757b4a59a0ab44b9016652503b344f1e48 SHA512 02b05f4831b00ece03856938306f0410f2849212d9aa1b686fdf58e6a8e415ce689cdc990125b7baa3e16eeb0e166b49afe6ba574d553f56c7f9981ed01a15dd
-EBUILD pocketlint-0.17.ebuild 476 BLAKE2B 65feee0f4ffc26179b58cb1c91b7e86998fff3b8c9a0d76d30bee98d2a5c61406ff4ca6183429e4414134197a4ac7ac07c1cfc7a1f86a8b5b1671418f5ca3fb0 SHA512 d0f391085c8df3f2247baaead86ca335b572bf9c850716acc02a9e6936087506dc22d1f2e9b4ec0d5a421b079e7f6ec3743213297e0cc60c4d51f1729eabe0f5
+EBUILD pocketlint-0.17.ebuild 477 BLAKE2B 1faf05a4bd115dd8319fe658dd854c07542497d11dddb1032edf28f8793122d5a530777aaf911fb016b5eaf3e5aeae8a964a4bdfe81a3c342a210e184d4db658 SHA512 68c86925fd1c028a27376830fd199ee642721964aef5bd14b22c28786edda6b8205da71136a69c1c1f31d42fafe2fe39777d0a1b3a1fb4be841aa4bb531cdaf8
 EBUILD pocketlint-0.19.ebuild 485 BLAKE2B 74a789f3909fc1ee35b05296545d4b12ff5b1801ca2346906815f1dde41ca7e385f433754b25affbb1bca5e853bea675cb95dbf69b3b1e5cbff2ed0904c109e0 SHA512 326d61fa24fc73f7b2841d0bbbed1c4e7b2b0b00a119d573f6aad9d0de3ca3b98b7f71e75b8c9eafb361813d8f884279f47ba252b18289303eab3b06d9be00e3
 EBUILD pocketlint-0.20.ebuild 487 BLAKE2B 2a3c26ec0035f8f77f7d57d6e0fcbcd685a5bb89049eff03cf083ff8fb8d6ddb35d85c559c8ef221a64147b3b028f4d703c04cdaf56264706034c097b7761774 SHA512 9369f0fd7da203f60f58c08f558f9a0c6d03c5ef3aaa22fc980e79d54c2f89b7717ab69293d4b1160295487a2c671e4476f3288c81d4a9909148c0ac50369b49
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index 45cb7f1c7835..f67f89fc539a 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index cb7f92871d09..2ba5ecf20550 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,4 +1,4 @@
 AUX polib-1.0.7-BE-test.patch 545 BLAKE2B 800372796d19d98f47dff73ed593dcbe8a60d55b654258ea5063b702fc3761906754096bc2f4703621378a56ef9589ff5a4c1d7aa6bcef368e293bad9e8b869f SHA512 0b62dadaa7983657901463770a5e7abc41361094c7dba41618881d7328378b989c10b3458c667f15134ad92d0bfebd785f475e1ba040ea11da70352bd8a2cc2c
 DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
-EBUILD polib-1.1.0-r1.ebuild 833 BLAKE2B e7f63e3ac180fe53a28ebefa5d5b7d019fab8bacce85c2a687f4f712dc0b79505afd6947b8250f07ffb4571f63623b9d680e2d1f3c861617c419ec76bd8f01ff SHA512 0e43a3f92bc957f3357ea032d0ca1717ceee749c458ac0f5cff54de8301a1667b5915e27fcb756cff72e2dad7b58b8022ea57c53367ec8600f202f9aca0cdd3e
+EBUILD polib-1.1.0-r1.ebuild 834 BLAKE2B 38a68c3fea3ed8e136c8570e312d8b7467294e376ad011a534216a361c104ed663b13fb5adde2df58aa4b46384c7568990f8d99928b57f92b0fddcaaee061792 SHA512 dd3c8c61f284958a810a9fdabd3155e7fbf3623e03d7bc502390d1286dfb212e23ac04acf4b6f215ddbbb6186bf3851745de1a8880d5b15790ab9d579ddd0bd9
 MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
diff --git a/dev-python/polib/polib-1.1.0-r1.ebuild b/dev-python/polib/polib-1.1.0-r1.ebuild
index 1ea0502c5226..2aa8397eeae3 100644
--- a/dev-python/polib/polib-1.1.0-r1.ebuild
+++ b/dev-python/polib/polib-1.1.0-r1.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 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx )"
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 257a0dde5acd..0829979ac9ad 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -2,6 +2,6 @@ DIST pretend-1.0.8.gh.tar.gz 5509 BLAKE2B 574c83f05c9b45876891df97a23a25cefb0f27
 DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0d313a3b87d69b8a61655cb8a1a2f8823f06779e0730fb3505cb269ca907dd28a79fdd283ebd6913bd9c0ab3 SHA512 25011216947289d340fb979ebc9e2c7f000571f006cf5ce15f10ff0e013164e4329a3a66933d202acf8ced498929cf9e5a2a3666aafa00f78348400615c5cec8
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
 EBUILD pretend-1.0.8-r1.ebuild 764 BLAKE2B ce3f3acaf2894a96d65919ff63f70c13b543200cc5ecfb78c828285a8e0aaa3ea783565dc6167cbfee71ccbdb682c64c49803ce44ee0aff4c6ccc48028a629ab SHA512 50fead85493b708c0baa933fef081e9a05757e08601e0ec38402a18a1722f28485e28b467d797e184fcca2423f05d0a6dfe4b4ae0d9da6c1ad7b82dcfcdc8f2e
-EBUILD pretend-1.0.8.ebuild 606 BLAKE2B 4fb20035f7048fd26de94527d3cf9171c71355b6380c5d2d1bc184fdd3510c95a918e12c1f8aaab961aedf728f4421be11780ef4f80fb2072d9ca8d6e8d6275b SHA512 bc9ec87fee6aa8a9a244268053ad02808c7bc4702caa40998d6a083a718db830fc280c23a1a58ffae863188f64b7318f4f06ae5d44978c732bfc202e66b78478
+EBUILD pretend-1.0.8.ebuild 607 BLAKE2B b989eb36bbda5c7e71adfbface614e374c3654d73ee1f121ea2909375562cbc45e1387d4767f1958432e0a8bc40bc128bb3ad233f294ac1bdcd9cbce7f4bc8b5 SHA512 534e9858c5cb103d75af355e84cabd30e74627681558c50a2f83039ca7d0dd279727c37325c78e439940d5a40128bdce4bd42a0b8e6c7d3fece7b8e1b1be2c3e
 EBUILD pretend-1.0.9.ebuild 698 BLAKE2B 6c638b412eae08e3747e859e21feaa23654d1439061221ca55ae1acec6c671f59769c98e6d3f2c40685ed45cc08f7e2a208403e368ec45574f83fb187b2953cc SHA512 5035e04c8fd862d787156fb0bb1ef4e3bf0125ac1d4dddf38428199e00b951aff36d8adadf75ff943a5eb5c9b315a8efcf50aec25750720974aeb08f220c7812
 MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
diff --git a/dev-python/pretend/pretend-1.0.8.ebuild b/dev-python/pretend/pretend-1.0.8.ebuild
index 6b08ba6e1624..6a2fa2abc442 100644
--- a/dev-python/pretend/pretend-1.0.8.ebuild
+++ b/dev-python/pretend/pretend-1.0.8.ebuild
@@ -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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 66783b99eb91..c87de209c9f6 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 741 BLAKE2B 7667872608a5c0f71570a5c520fe4a18c197ef4dbed4a886518a8ae3c592c122543859bda1c64b637463135b0a9a1c3896d848459c46f8063b5479334909fecb SHA512 c363fec93ef365bbf7399ad899aec26d2e5c20adedbf131192c496b76121e3d46055d038c2a23b2121b6d9577f0a6084c0f59d495c2b966c6e7f7f76705a23ac
+EBUILD priority-1.3.0.ebuild 742 BLAKE2B 9421d4e867795c6e5d7fca29b98c98fa95c094560cf6e222eb8d72c35f6f77f44b8d1abd95ef4128b2a7314caf15245e5bea20838a5a3c7b78d4b4db161df7ce SHA512 a86514d8e311c5a639f575c155b5fbc8d4f84fce4090c40651f069927a4ca6771a3b9ac27ef853504f27811fcac60081672e4ff43771663ed5d31f5640498629
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index ff29f8aad5e7..156c7fc76af6 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 25421e0c4018..00f3db5387e9 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-1.2.0.tar.gz 5478 BLAKE2B e210945253e0a5437b68b47f3621b82642379f8ead297cb63b76fb010f8276a5e3d007435c4f837c7ff0ce83ba38cf57dd8963eaa480219e34fcbce9f8cc22b6 SHA512 b5cbe96dbeb6421b26f5a50cfe91bcac2f5d527830dad678df5e0ed1b2019483eab6102ba548483dd6695c881f29380ead2a8b6851c40119815363549ecf5bb6
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
-EBUILD process-tests-1.2.0.ebuild 623 BLAKE2B 773602c917c43620f5c0d2a3339491db3cc127413affbdcfef5b5bd264dde9cc1bae48998fa42f49e2a478453280eda6199b5ddd7078b5ef5f7869757f844d07 SHA512 c5277edc8feaf07d23bf25c20160d72676bca00e2a3baf8d630756568750f2a112ac0823bb75f3eacc71526b0c9bd09ca3bd7feb195279307c61f7c652e63aea
+EBUILD process-tests-1.2.0.ebuild 624 BLAKE2B 22433d437df106a08626d468167e6240deb14357a05d9e8d60994996b944ca59badcdabad6cce14615f18aa5dbaa3eb55094284483136bbcecdbbac76cbed0c5 SHA512 11f7ec9ed9e2bf4cbe4604f7f8a3f41a5e41f034a5a06281853fa2a6ef0e55336449423b4b39b23ea266501b78092016c2b13e76e76020c612d5b90d49d83e93
 EBUILD process-tests-2.0.2.ebuild 701 BLAKE2B 5b42a1c7c103c704b68642dbb86051786101e70f6d832e9f39e8cd6f8c47f679ccd6bfa3e9f57cf9010a7eb4c480af7b3abb26e10b102fa9fac51943d8e175e2 SHA512 b8397b5053f91e4abdec2606e8fa915a2db34d7097f87261e9a39303c18f27b703de6ba8d32c6b52685aaf0c9423bfdb0bd052fea30bb1d4014bd7e138862614
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
index 111c8f18e4e1..d67f9e3cfcb5 100644
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index dceb158ce6e5..fdd72870f0d9 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,5 +1,5 @@
 DIST progress-1.2.tar.gz 4951 BLAKE2B dcbb6df423949292c865142b40a654f5ac78472a1d5abfca4716d7449a3140cf8c71cadc6691609bfb81a941c5db27719dcf2eba9f743507c7023f710782eb1c SHA512 bd09e63a1cc1b24260b66e6f963deaeb6da87b08c376a4e2da179badc23eeb3e9ca213872d1da8caa5e2475cc1b7bb2022389bb8d7f1c9e1ca8f755406648116
 DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
-EBUILD progress-1.2.ebuild 676 BLAKE2B 19b099a1af5758b1c7554f9499c3b6b1cada6b8504701f8b8a7d9197a579291fc48079b7b89cb0414024fca9e4c03d274ce7247f07418808a08674bcc9cd05c7 SHA512 dd3ab75a6ea023aed86ae97d9bbcd126149148e464b6d0bed5d2c5c2ca87f0da56c1b74002c49e922ed7589c9d8adcf3a0df56f3900fc8d563afacd3bd1b3834
+EBUILD progress-1.2.ebuild 677 BLAKE2B c6053fa7e7e6e78c47de8c17a030dbc29237c1e035b8a542937031f58b24fd7e009a71fb2a750545761c8c289d3d267d98e114549805dd6a5739fe4250971d80 SHA512 c3a6aa866afb437ec61d5dd4276e50012b3e00c22019ae7360c63ef7a5fd5b93b2c91f8832f7fd1851c82df2dfd7729ed5f7300de4ca6f9695d9b9bed08183de
 EBUILD progress-1.3.ebuild 660 BLAKE2B f9002c627ccd7a23ed72b22cb0e41f424f5a5f6bd2335356f842ac90a0241d23177a4fef62698b8c9573141422be7d44e6bd97d59539ce24c0975a1cef588b11 SHA512 433e2750ae9ad774e9684d1a6b413c56d10326faa94a5506a3d1b80682f8ed157811644b1b4ab4585c0adca32beed7e4acc3d9504c689de1c01c1204aea32b7f
 MISC metadata.xml 367 BLAKE2B 211ac3b5e167e316dfc7b36076e1dcaa32eefb4933f1cd4690119fe0de679a9fed0660e55d31ba12f7ec174b80d2b41513c9d604e2bfc832402794a74907ee96 SHA512 cb620893fc0f46e9de21d8adebe9cd8b4946152d770fc88a1417204dfbc2bf9ec24bcd43d0132977e1ffe47da72297d04d0bda8ceafefabf36021a7f796c65ae
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index b4c1caa174db..15260cd42483 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-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=""
 
 RDEPEND=""
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index be0d617fca16..9e553eaa3320 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -5,7 +5,7 @@ DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
 EBUILD protobuf-python-3.10.1.ebuild 1560 BLAKE2B fbc81c5c6bd23a65996b45aa8161a2de0ae52f5f64654659785cd14c0fb6fabbd233a2c05f6e20a0be5a20cb993b9aa20c168c2867d845c8c68fc2530b5f8f3b SHA512 a83f54043dc51d1595ab8418c99eb2f0d348f06c8315067a4eae7933313e30188efdbbb9dc7e90574899599d0274a2ff443833343b49c4515e8d7b53fdfd05a2
 EBUILD protobuf-python-3.11.2.ebuild 1566 BLAKE2B b9ba89d3d9444ec65e908664151dc6552d007805c3c37b7a93e885dfe5daacc9cf4da6545b1f1dc120583301d93fb00031070d7b97a4621bec298d93b772112b SHA512 5d5ea41a5750d90da5689b1114165891e674b42a443716889ef63ece61630cf04d80aa34ac52683df6129eb1a1792387fe6fa6360232e20e9a73d18a855fa270
-EBUILD protobuf-python-3.8.0.ebuild 1555 BLAKE2B 22582f4e2dcb1c0e5c1ca137ed63afdbd7729d57c2bd697be5f22a7dde643de5b89e780c54ee5be528e8199d5761afdcd60596e106c7aea06dbea7f9ab1208b1 SHA512 352cbb84283758d33ac202e667b786bdb16b2ed819479c5bb907a3a9eef5dfc659cae8e79fcbbb54ec723a7127b675958021f299010a13d7e04736c0d0c1f42c
+EBUILD protobuf-python-3.8.0.ebuild 1556 BLAKE2B d216a500df884755d01f22f373c2d177b5ff0eb9a2b39e565e6b2fb75b85f6bf40a936345ab052ceb0f31b50e413ac8fde597aa0ffd92504c84ba4c2b0d7cc1c SHA512 81b5109c350a3747da32bdab8fea032c8774db39900bebfea1354af5c1c2d565fcdf87c1458784bde11bec9a6d62f58a7c1cb0fc0ca4c36f992f96d4937afe38
 EBUILD protobuf-python-3.9.1.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
 EBUILD protobuf-python-3.9.2.ebuild 1562 BLAKE2B 7fe2712055449c2f858fafdbd6722e6cdd1e0334611eb5753d7de64f0b2f1b56d2823c6f05a559950aa7cf45bae3fd04adaa5c5f9c3973922f7e2b21330e65ac SHA512 5a571762ea8314efeacfed1b240be45982d813613220e879b7e5d48f69ae850c94706a4210d736821fd0550fbc4f29f37d63cce0ed16669f9772079328d9ef8e
 EBUILD protobuf-python-9999.ebuild 1449 BLAKE2B c8b0e26305ad406209daa373b09cdefa9755ce3f72e2fba51d24114566519fa7ecad38f1d321b542fef6541e4ebaa74b4eaace6376f72be963b183e4cc28be58 SHA512 080b3321bd3ecbdc7a468d33f04bf24e556cc712e6d7dd2faf1912b1366c2d8fd62f2014dd394706f8c7b7eba654ae1e7baca111b3cd74b1412363d64ad2296b
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
index 83dcab48f6cf..f310be373876 100644
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 4d48ab799f64..0a89ca09d58f 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -6,7 +6,7 @@ DIST psutil-5.6.0.tar.gz 426596 BLAKE2B 803cb09262575a7193ecc9cf9bfbbf721e10ef4a
 DIST psutil-5.6.5.tar.gz 447489 BLAKE2B 9301d1580bded927b4b117facf82a3c6be9b43cb648f0f52b841dc2c59cbcc58b5a5c3e0ea7cee30a546e1ea1c00fc0e03b3b49fa69209bbfd3c873e18510859 SHA512 037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b
 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503
 EBUILD psutil-5.4.8.ebuild 911 BLAKE2B 552531d6c0b70dcb013cb8a4f089fa788cc90c0ba62a82f11b48dbb7e9f7f6d9ede63c8f51c8e89be55c1242569fa60c2e8b6246914d996fd3d9d96d412949c4 SHA512 54a6fde56fd09337094025e5272615e03c521d66c041a9cf0d11850c0b7c36734e02cf5082f0e6567955593badccd73dc87bc655df98376dff8d0f3a39640bad
-EBUILD psutil-5.5.0.ebuild 901 BLAKE2B 1ec48e6ebc4b74c7ac9e092ea52661b9b58296c84034e3bc89a078173d9c2417be33525bd63a44779bfa6c8ee73dcfe36d541c6c26dc4fcba2316e008aa96800 SHA512 de38ddb4e806df057feefef7d022547de41db4f4963252cf581cd6c38c5d374b450f0e5d1378d1d9d4c541942c0f44246aaa1a1dbb89141f226d4d1d15f3701d
+EBUILD psutil-5.5.0.ebuild 902 BLAKE2B 73d74d37194d56024151676e46d7ab2de98bc4b28cd9ff2d1763290df33f71eb526d2ab5bbb402fd755794386ef6995224f1ec58a686f6c07af36714ae1f97bf SHA512 5df37887f03dff322ceb6eacd0d1737bb1b31a203c1664a7ed38e7a01cf31c2f1bdcd0eb707626cca4ec523b53d429b9608dcf23a0861a2e1513c2362250a291
 EBUILD psutil-5.6.0.ebuild 904 BLAKE2B 5d85f27ecb4d758cf8ea4de82d0605ec1f8cf047835259c6069230f936b9a212b082be539cce6f8c5ae70c83a391ffb42f11ea8e7b4d6e7ce9f1f34fc38f327d SHA512 27991183c768aaacc25993d727b3905a74df0638b69c1d0f5a23e38c7008fab9bfc8e67e49067bd4775773ae79587824c4ba38505cbd13d984e08d3e185c72ec
 EBUILD psutil-5.6.5.ebuild 1219 BLAKE2B b9a1cf7ddcf48299f0b9a97754b29d3b6ca3ca32b34f15c2bec7da5c189cb744d11cc7b06d7a6e7f89500627a40b754eccf68016d383d9d4e36cb64507cc6b39 SHA512 95145244df8b0a050ac9e74068c5a82dce594169a7a8157a973faf7b99cb17711c7d4ddad70525c756c72e35fd7c675f68156e7b8de9569f3a4e27fc67f2f652
 EBUILD psutil-5.6.7.ebuild 1300 BLAKE2B 4840866eea59dbbad5fb5a395e93de1f5463ad339e89d2119928b6b890121a291a7b7d64a22f60c9ee3b66fe180c938de1c7c21115375a0ee29336d4f3546508 SHA512 307518cc34244bcd2caf3bb74b4179cdaef1e388feafc1ad581f858a53c93c586215ee79bae4e4d12c88af4a515882ab0f6cca85c92651a1cb931a472b05750c
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
index fcde94b5ccfa..98afea2f8060 100644
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ b/dev-python/psutil/psutil-5.5.0.ebuild
@@ -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 ppc ppc64 s390 sparc x86 ~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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index dc0b297d9c5d..dc43815dadbe 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -4,8 +4,10 @@ DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
 DIST psycopg2-2.7.7.tar.gz 427474 BLAKE2B bc721b721693bc5f560a4829e84715d15e8c14523ada00109c7d7ba916c91928082fff286bd3c2ff5987c0436443128d1408ac9de073ad538b1e356fc73aaf8f SHA512 032344957c00bf659ca5e46f54f827a6d79809e370d661cd349e2ce935873359bcc4f440b74c6f14658bf1cd9598b6d884abae507fd33db9e07b01fc87967fb0
 DIST psycopg2-2.8.3.tar.gz 377333 BLAKE2B a4f22fb4dfc5492147bee198c587c5c5e43e197e5abb60cc7d5d7a006d91ffd22e35fbfeba35b8d36322f3802073fc105cb8270d436a3ad4d52b1c3c41ba39b1 SHA512 74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928
-EBUILD psycopg-2.7.4.ebuild 1541 BLAKE2B e14373df863af19681a2e657b38d3a797175d7b2dabf4ed15d3c7c67f100991e39f9826f2eaedef06bbe13bb6e4e697c45bc3ad6ff34c3f43bcaee54778d377e SHA512 72fd880c7900b6ea5dc86528302c5247ed70b748277ab2c1011e29bf242b8bd45f79ac759145fc7ef8c09b8c46ff83db1f419ae8bfbf5d9e2b54c228e762c5f2
+DIST psycopg2-2.8.4.tar.gz 377883 BLAKE2B 6d25a96d6fb45cc450b20fb570741538c2870e0ab205b9aab1018d4ef716bfba129235a422f2a0dfd182162bff948db8a2e4d23cd57dc01971f2e6f734ebf90e SHA512 d4590c6e4e310d280b6b341cb23427b56b04c1ef08e877f0d99a79c6b00b959307bb18defaf1d9cea58482fb974a78760c5f26a3ece8c1f34ae1840570a71a28
+EBUILD psycopg-2.7.4.ebuild 1542 BLAKE2B 206728c91160ebd99c484929bca930a27ac9d679a2e844df64ece975453104131fef4fcb00864a932bf53570531509806dd2fc58430bb150aef76929fa1ee32e SHA512 642065445ee9bd7f2cdbc23e221e922595ad356a071da2c09d3fb37044f90773e890a6e774945b3e4424584b15cc828487b54e5a0bf242b398533db6a0478c3f
 EBUILD psycopg-2.7.5.ebuild 1554 BLAKE2B b482fc43480ba87569d1b28d0db4ca47be79466de3f0156eb35fac78bb4807c9316e62389d1f7a744faf01e23368d3e55ea7cc8f20d1bf78832b89903354ab8c SHA512 bf10ede2d5004715f3a028ef7f6fc108f4c3b9368ed1690e60bcddf00627014f3483d7d241b01a10ea3a6317748bef8ec40e7909ed584fa730713f1aa6699faf
-EBUILD psycopg-2.7.7.ebuild 1545 BLAKE2B 0bb3f08adee8735ad27c2fb02f7e4f67ebdb562371b756820acd0d1f0eb1fe1f27b1a2658122d99355d4eaf51bbc0e3278f519a7d5893988e2f900b54c4add4b SHA512 41bd841de48561b5f4bead978a5bbf06f61c26cf65acbef4d3616b3cf45a362d4c201f7669f2cc232bad57f41826a450cf2c41b00e9f6007cc7792327367905c
+EBUILD psycopg-2.7.7.ebuild 1546 BLAKE2B bd5488aa67cec8449dbc3d6626db57c4c0b07c0e9e6f69568b8cb7833f71bedf85259e8a70d0aebfb15a1316aa07d52d333df0733cfe9135b9ca0c8d1bb4e5d9 SHA512 ee8968f4a03c2c26ad167c7c4541b0d6a7621565ab30c52dca93fc332c81270991c6555dbd3b5be11b7dce21a337b914b607f823486222fee7d6a5047a65d885
 EBUILD psycopg-2.8.3.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
+EBUILD psycopg-2.8.4.ebuild 1428 BLAKE2B ea3a99eddb5622d11279617be9bf1a9963779bbea7a3bcc24eaa7c1b9dfc018bf2a8ed730ed0dfad10b3c33eba3d54f13f74ac98103015415405a5f120700091 SHA512 51d62aeacf11d5e84c8cc0b5e3169f24a614942213bac17953eeba5315fdbfa9355fb1c0dc7a4c5073fa78c1ee6c858e7d3c476563a097e635ca1b515b7ccf07
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 0e1353104865..3e7fbe852468 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.7.7.ebuild b/dev-python/psycopg/psycopg-2.7.7.ebuild
index f7ed9d0b3a9d..0c8eca0bb150 100644
--- a/dev-python/psycopg/psycopg-2.7.7.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/psycopg/psycopg-2.8.4.ebuild b/dev-python/psycopg/psycopg-2.8.4.ebuild
new file mode 100644
index 000000000000..4f7153baf26c
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.8.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/pygments-2.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6
+	)"
+
+RESTRICT="test"
+
+# Avoid using mxdatetime: https://bugs.gentoo.org/452028
+PATCHES=(
+	"${FILESDIR}"/psycopg-2.8.3-avoid-mxdatetime.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	! python_is_python3 && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc/src -j1 html text
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r doc/src/_build/html
+		dodoc doc/src/_build/text/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 1d8b312d767b..592cfc87152a 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,5 +1,5 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 BLAKE2B 70dc7b33fecbbce753dad3363b99b0f6e3433a8e0c9c6bd97c6c9537b071266e5a24fd80e64b5dff804706449a40b810fa5e058e159862b112b89755a3577c1d SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad
 DIST ptyprocess-0.5.2.tar.gz 69297 BLAKE2B 5b473d0549d18d17f27ba6ff89543b66b2a6781a73c849ab1e2225b73bc3485ae36ecbf50a660bfc0abcad472062502a484de55a9ea206dcf63724c2dd765ce9 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553
-EBUILD ptyprocess-0.5.1.ebuild 616 BLAKE2B b1fdb7fc7301951961ebb08d036950b37f4b564c3cbd9aa3104931745cc9795bc06861b6677c22dfba2b315005eb6f31f64a87c856cd11c0f2e24961e182ede1 SHA512 8947217c65b269e71959c44bcc9a99fcb2463d0b65ccf3fb98c57660a0a15f51ae09143ddf0160a27b7bdaece5ca0e579f0f71d022757d54306c46b2a79c9fd6
+EBUILD ptyprocess-0.5.1.ebuild 617 BLAKE2B af527de2db4d5c580164f0c299bf80b2ebcf7842d7ff82704ff47b70b44932df5ffca87a49b2096f1e0465c4f1f5756c318139091e171e95fa76e7aa67d9514b SHA512 9e7e3f4eb735557f89cdb40bc0bcf5b34986f1d8d011cc88bb3fc90e5cd7ead79d9d61f2d29ce79cbc1833c1c5f9de941d50fc10aba9c86a2a37ec3182105c51
 EBUILD ptyprocess-0.5.2.ebuild 539 BLAKE2B 59248b2f51e086b52309f33c28f90918f0f22dd1a9db98aba1a295318a0353c845463b206d62a3e814aa0127a65a113f37a1f54dd2ca87b64cd80448ce4aaff4 SHA512 104c607e566d4b8e030b3621349d380559a3a6018996ce4345bf9db079a031fdf4358a866b5c70d9d7d661afe6e8535386226d99cf03248a3c56725cd4b0f994
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index 1e51d8165496..5150c75f7041 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pxml/Manifest b/dev-python/pxml/Manifest
index 9cd9cf79e4d7..0926ca958647 100644
--- a/dev-python/pxml/Manifest
+++ b/dev-python/pxml/Manifest
@@ -1,3 +1,3 @@
 DIST pxml-0.2.12.tar.gz 21194 BLAKE2B 1fe5e1ee2a038396efc7e4d2933fc0d1fb261c5a1f3528584f4d609869c1b5d88f3b5236f162bec72ce3fa034630395669813e5021f74c3fd36c16807c6d5dcc SHA512 95c66036d161c1245edfc7924abde9f63e764bfc39037ff2b5d281840e7b306c08091c9845ad4d5738ebe2769f27d90e1b6b226379ee6fd263db323ff629d42b
-EBUILD pxml-0.2.12.ebuild 762 BLAKE2B 551019c8f0013ac4615e90f56a3114ca68f8787d65000f96f5eabb3ea0df2ae12483ac44dd11c0a3bff6298293480e9712a269b18a919d917b23ecd1cb77797e SHA512 5a5cbc7ddb0496ae467827be5e5d848d5d9ed9c4c608e695992bf026793e4909ef470f59dc16b8408efca846f260f7351c584414607cd6222a82079c98c0bc01
+EBUILD pxml-0.2.12.ebuild 756 BLAKE2B a4aed96fd762df9c53b6802448c3fe31bdcd37261eacb070859a58276ccfb3f5012f0a10eb548ba25d3088bfa89377a56df13d5c5a9d4c082ad9b53fa7c29747 SHA512 491531e1bc42b8f0d59386e8e6ec6177442a2d52b4b7089e42dae6fef7ecb37bb482c8f4cdde95431c7a2e6760c4077f01ea229183f547ec12c342b492bf9c42
 MISC metadata.xml 363 BLAKE2B a98b0d8b713b641ed26c4dd10207b0b9c76c6068e30d3e212cd76eb6d51e74edc032803f937f63fe10e676b61028fb95600fe322addffb7d9fe7936c988ad929 SHA512 f36107242f9361d2ea84f045ad22595c39bb94ba6641a2ffe4348bb7574a3656a57760f75211e9ee3e76b56fe0e3e9c44e941a8192a00476c7bfcfba150fe5e6
diff --git a/dev-python/pxml/pxml-0.2.12.ebuild b/dev-python/pxml/pxml-0.2.12.ebuild
index fa7bba27d4ca..fd9dd82999a4 100644
--- a/dev-python/pxml/pxml-0.2.12.ebuild
+++ b/dev-python/pxml/pxml-0.2.12.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
-DESCRIPTION="A python library and command-line tool to "prettify" and colorize XML"
+DESCRIPTION="A python library and command-line tool to 'prettify' and colorize XML"
 HOMEPAGE="https://pypi.org/project/pxml/ https://github.com/metagriffin/pxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 08808f2c6eab..fd1b45793151 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,7 +1,7 @@
 DIST amqp-2.3.2.tar.gz 105854 BLAKE2B 8bacae52f03118e2d0fb93a6494628f18f7139d655f1c4b3e7cda9fd81eba5d92f56038bc01dd4a28a89168be0fd51013db0060e945e7f7c63e1423892feaee6 SHA512 c9c99a238cf64ab5590eaea5756e9f68d58769b4d74af3405321d5c129171f34e6a5d20f2125ef2828e843b637fbd115d1ee9391726fe6ff09d233f0e6bdd511
 DIST amqp-2.4.2.tar.gz 116265 BLAKE2B 1615563ad4ea86ebd970641ed409d3f90aba86c4f4eb4af3fbd528cdbe68642a83e05bbed8b8bcc5f503c227003f078c2cbd444f56218af5d02961f1008319ec SHA512 dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
 DIST amqp-2.5.0.tar.gz 117022 BLAKE2B d05df3699a73ee3cc9540599b7947b4ad9fc1d74194cfbea81787d85c0f83262d109c153669d746ccfb67a1ecb21755da4615043ebfa67c84c8f108ef61ecd3c SHA512 c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b
-EBUILD py-amqp-2.3.2.ebuild 1202 BLAKE2B aa2c0dd3e47d7b1b5e28b4318ec13e6224877bf20a8881e1582219c5f1bcae073701fbd0c4cba39cf2c726d100aaf7b18db27c3b03de37cb64fe95d523dc4fed SHA512 5ac6b7959a803a673933f7c7ef264d7876fd1df07d5ba1bc47cd3bd38d450917a12c5390fc994db9d60e513529ddcf910c42baa244302cb92da13382e4e7dc18
-EBUILD py-amqp-2.4.2.ebuild 1205 BLAKE2B 869da83b1f354478db2f6c3cb5d66d7c3210ee0a86072b7ed02f48bded269d996cc1f338f48bfb5eca42554215ba6415fcab81be40e7c802d5e2c9006bfab2de SHA512 255384379b9392c434f2f4e7d38b33aaec51a93c804ac5ba1780f4b16488ad29a464b1e0db97d97eaae8e7c673755dca96da9a5a9c96d731840d691d4d05422d
-EBUILD py-amqp-2.5.0.ebuild 1483 BLAKE2B b11c95da90d4bb495cc722e4a4cc6f8a9808b0de045b9acdeef0d5719079446f998a33cdeb30e24a03c6a6827d1309e5f4f33952eda04418c056d073b00fdbfe SHA512 9bd5439edffa29ee3ca6eede18fb6c158b86feffe211c1acf5151c99801f55901fcfb83bfe2e6dc03ce9593df16701fe603c176e840c22ad1fd73ca8b003daf2
+EBUILD py-amqp-2.3.2.ebuild 1192 BLAKE2B e5460de9b915d754ef813e2a1302cef32dddf481bf7f75b16b8fdbc5e62c532df991d3b37d5df73d63b425892329d70c300cf923cae849ef589c1c29a4ab37de SHA512 6a3e147ddb14ce7e86f5ade481cf7194389b7ef88ca8e2ebbf3c881b5369d07bc352bc46e34d193ab244f69767044f617635c6b4dd10e037f9280983ad8dd7a2
+EBUILD py-amqp-2.4.2.ebuild 1195 BLAKE2B 47874e2d3281c045c1eb9a5dc3e10a3d0f0c1e458f6e8cf8ceb2ef61e052fb6f5e092edd363465702eb4197d642b38639ce490d8fcc7034861534c894e92f703 SHA512 7bc1737c57d1f9d0157618901c2467a94cd0c9061774d06b50a69a59a0d606101ee2af6859c4d162834581e8a4f6ad14db45a406902b81fdf1087665e2cca3ac
+EBUILD py-amqp-2.5.0.ebuild 1473 BLAKE2B 72e985ed942780de340e8e89367411a7df62ffbd1ea7e058304a24814b4f854f2f4f6302642ba84cf688310be29c3c43a48a613e3a1d510ed577dba87a270128 SHA512 3d639b81f1f0d59a1e43853f4878e495e6269e5a826e69c00963bb4aca0f80c2e2dde559de0d83c1d9fe6b13cde0b0b7ff061cf67bf46cfc49a0132bc86d19f4
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.3.2.ebuild b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
index 5510755d23b4..fad3bec7b45a 100644
--- a/dev-python/py-amqp/py-amqp-2.3.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-2.4.2.ebuild b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
index 262ae2aabddd..4ef779d7f61f 100644
--- a/dev-python/py-amqp/py-amqp-2.4.2.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-amqp/py-amqp-2.5.0.ebuild b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
index d2527024cddd..22fd77713035 100644
--- a/dev-python/py-amqp/py-amqp-2.5.0.ebuild
+++ b/dev-python/py-amqp/py-amqp-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 15cbbd1c537c..f46d3166039d 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,7 +1,3 @@
-DIST py-cpuinfo-3.2.0.tar.gz 76019 BLAKE2B 2a0969911b385e51ead94a92b89a21bf6ebd6a49ce5229329265ec0611fabe1180cf4ac617c1786ab25605fbf11463e85d74a02195cf01ebc40a5f8d1350f83a SHA512 737d5a73d6991ce5cb99125951a75492f48177030986270bbe7dcc0efb4e3200c9957bfbe51bd5a7555bfa8e62db68c3a5227e47e5e6bb2115ff2c10c0bfb688
-DIST py-cpuinfo-3.3.0.tar.gz 76052 BLAKE2B ffa9d53ccca034b8b4707cc60c8c38b66bd76101e4c6c8d8bf5de743904270a4b9236c0f03192336c2fb32fefb665c5a6d5587639a408ff0bb9183b33f9c3ce7 SHA512 b31ebfb0f066303813d699a7aa5bd5b8d4e0b3b6e8422dfb4aa53c5b64d2234c5275fc293b3eb3ee72752691e023dc94fc013ccf6a0251d307c4b10619135524
 DIST py-cpuinfo-5.0.0.tar.gz 82118 BLAKE2B 94df998e053de04cf7b470799eb7595b5a398bf7d2da6417e3f5f6313a3e1152adfa5ef6a67461cd10d521be88d0a9ccf9495715a23cefb557f673f10dec7468 SHA512 d3a22ffdc4d1668a58330016e3297e57c07f6380e544497b1ad9dfcf0410b000f69418bf1cb9a434a2ffdbc8f17be89a25d33c65817913a823c6e181df6b760e
-EBUILD py-cpuinfo-3.2.0.ebuild 587 BLAKE2B 4cd1d8e23e66d3d0eb4befb20db051493d8df98bee74fad5a0f96fb3e7edd033f73aed6754c08c03bba3719372ffae163bc839a43f3b8e1e78da78e8a60abed1 SHA512 8d75c87ebe0947aa7dc3cff27f0a2b2f9fbd6ed219c86620074db31a0867174ce8f06a23eb9d952b1cdd232d4505c88c4c5df6fc66d36f9e7caa71768e7f0332
-EBUILD py-cpuinfo-3.3.0.ebuild 587 BLAKE2B 4cd1d8e23e66d3d0eb4befb20db051493d8df98bee74fad5a0f96fb3e7edd033f73aed6754c08c03bba3719372ffae163bc839a43f3b8e1e78da78e8a60abed1 SHA512 8d75c87ebe0947aa7dc3cff27f0a2b2f9fbd6ed219c86620074db31a0867174ce8f06a23eb9d952b1cdd232d4505c88c4c5df6fc66d36f9e7caa71768e7f0332
-EBUILD py-cpuinfo-5.0.0.ebuild 591 BLAKE2B ef4fbf93fdd7d737b45da6a91d1da066c6195ccbd08bdd79b364198e6a51990c911904c96b2312750bc7c1241b8565b006bf605c5e8bb8ba9007cb210b43aa08 SHA512 0d9ad91a5ea624c65e9babfcbe0e1518eb3af00a9c58507b26340e6b0f4fb12c29fb5950ee679dbb052d5bf047988648938f49f2d8134ce34468f70eac579ee9
+EBUILD py-cpuinfo-5.0.0-r1.ebuild 530 BLAKE2B e754b8e37910a0518280b6a5023a46c2da6de338e28e0a3164a86516a25a4f5b5d444e5c08b668dd60430b77d87915d1df2100d2672ca9444cc73299376ae712 SHA512 d159b906e76a897f208569eaf7374b83a25caee689e389ce90ce21bd5e2e7bff6f553e4d74aab7baddc2f4800b2d49843851a9f906d6fece7cbbc037ad5ed162
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
deleted file mode 100644
index 0ba28f62f731..000000000000
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ChangeLog )
-
-python_test() {
-	"${PYTHON}" test_suite.py -v || die
-}
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
deleted file mode 100644
index 0ba28f62f731..000000000000
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.org/project/py-cpuinfo/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ChangeLog )
-
-python_test() {
-	"${PYTHON}" test_suite.py -v || die
-}
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0-r1.ebuild
index 2d19c682a38f..5c322340dc0b 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-5.0.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-5.0.0-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -16,12 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+distutils_enable_tests setup.py
 
 DOCS=( ChangeLog )
-
-python_test() {
-	"${PYTHON}" test_suite.py -v || die
-}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 908e75905a06..301990119586 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -7,10 +7,10 @@ DIST py-1.5.2.tar.gz 189542 BLAKE2B f0c5995121492ebca7bab9e73b7db61edf014be8e7d7
 DIST py-1.5.3.tar.gz 202335 BLAKE2B 6a7ef206bddd641cb5e2fe04966ae93db96a7ff757fcde604f8fd2d36c4a03ce5955c2f445a866dd5cd83026ab2a9fa17feeb0da0df3d40d9746c19d865f6325 SHA512 243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96
 DIST py-1.5.4.tar.gz 201448 BLAKE2B 3d9f71ba53c8004d4745be984e0a3b81c98f38fdcd7703c39286c53bb167a803aa92b3b0897e407f6ee98d2b870838a27b507ad8e6cceab7b22c8e7229bb6581 SHA512 45424b133be3e78ccab48e74daa6ca6a76fca283bd3a51d50c91e911c509a2c45de4fcc7c8c15f33620d61ee16dfc3969fdd78d8839e96f52897e97b1ad624c4
 DIST py-1.8.0.tar.gz 205096 BLAKE2B e08554fc3e0bae2e2d4515f075991707af29aa5c39e1387e8f8a7dab25e78c7340d389c79936ddea27b1fb0438ebdee8b5e218bbb48c62089d7fb656b1b6dbe8 SHA512 37b9a66229b834a034d9ba6769a46addf098380b494c1eb863607a52d00b7ec5b9157dd7ac6ffc52535a05006648c775c78716d7f85cf44966065b225be6e95b
-EBUILD py-1.4.30.ebuild 1265 BLAKE2B 42ed558f682dd2ab342bae0c7ff9f82766171f7933a99c448bf443a58adee09302ee6ad98f6f4f16f2b27bee7180503f675b902c5dad1bda26905950cbc55fbd SHA512 12065a83ac36d9b53796820471eec86b96fa5f56003d22c8bdb52a96e6458d11cf676ee90576257e3d505c21d16722c89d75079f28c910f7058d0962830e9551
-EBUILD py-1.4.34.ebuild 1333 BLAKE2B 832c5021ec114a700df5b4489318c0846efe18b1d5f1e30233583a06446380d372b4d657fc696323f93c8e5ae7f763c1d59f2d18acc72af83525fc8d0f22e3d7 SHA512 1a1304657bc7ba461cdfdd4af6710e281539ba0723ce0a4a239797c651d93671267548f3cd1cb0e14491396daac1fb1168a173614b1bf54ef677b571c781300a
+EBUILD py-1.4.30.ebuild 1266 BLAKE2B 19f3553f50fa41278885a03b9fb2c98a450d527b44a4544dfa3786dd1422bd0d33702fbd0b65f51194bc3734921317cf9391e477e9304640d943fcc812b9bba5 SHA512 5aef15bf79e286a447d76a8ac27a0148977c57267cc7646ba63293e831fc02718f72245b6707280c92d48bce7e594b90e85289ec0b33d3822cdea7713ac17f5b
+EBUILD py-1.4.34.ebuild 1334 BLAKE2B 18e31132a0202d4f1c608d71b0d93cb80ee871af9534004e6999d575f8a720bd47f2099a84cdee53581d21a2e28bc8e25defabc65b804b414093b4da47fd3f8c SHA512 8f0012c4cc85b39e78be6cba19cb96b443109b1c5deaa4e932bee70cbbf2806c86629cdd0bc14ed1ef27b56da0c39d1bce55c51e9bc7de52650daee151138cc5
 EBUILD py-1.5.2.ebuild 1338 BLAKE2B d18bcf1b1d13e6f33a1b163ed24a4425602fb7526e5beef9cb7902f859c03762ede3e513d772919352c1c73643820b0cf95e73383b5f995349824d2cca999425 SHA512 ea1d714f6314cc85a11006b4b7ddba839a8e864e73675a3db563ef10b19a889b4c16da4bc4e2af59769b38cff59fcd51a4e6773b9f1a79aecb8e7c8b30c51f82
 EBUILD py-1.5.3.ebuild 1349 BLAKE2B cba0ee130aaad63bb423afaba55ef16d0779af37c5598e535e4af0f8b34a62161aff3dec5e002c5a56161d8301349e5cdaba369bfa23a10361d516cdf9468b91 SHA512 c4d07ae4750af7b90a298b1ee6f73e6be998137734443e40eb3bd24373b704803eda2c5c226a3db53cf7ac76c1b8f50e9345b48e45395cd41cc9b3130d623a0e
-EBUILD py-1.5.4.ebuild 1439 BLAKE2B e2fc602247e121bc37b48216c82b6a33c8881c5b3e234302b9f3f39ef15de6f53b98ec9ee5787c84594eeea37e3f0298d240f3592121ef4762dfab5acdb5ec11 SHA512 91bfcf403b69d81335ad692d83d9170cb6dd3175b31f50012c7a44d2a77f5548e59d76506cb1a4f1d16f72fbfa09c78580d18546e60dd3291584b87d173bc819
+EBUILD py-1.5.4.ebuild 1440 BLAKE2B 35ec29533074bb6c211e9e82d9aa715edb4a53cc02a1c1b91778f5cc20f6ce15240eff69ff4cc8703e3895586302c4dddda19bf37ae11c4cccbe0d17543ab4c0 SHA512 9b79697a0ccc671df56620086c7bc4c8d7ae6bac2f677876b5d33dd023a3a2cfa9a3fe9684647e8f58ec0bd1c0b64c9d3fd5f9d344147c9e1fc4f3a98945b842
 EBUILD py-1.8.0.ebuild 1445 BLAKE2B 2abee08a91d79611c7710f5e98931a53e5ebcf7756f923e97c9fea1dc02ee899211c4e94188013221c29ff8b943c9396e5b48f3b69e4475088de5e0b6fe29c79 SHA512 13b385ee5c4e991bb93d0f6ccb14a43a63f9a2b577e914b590269a5b60b943526dfece65bbe2fb4a474ec034fe483aec618361748ac250707b956aeeb7acbd77
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
index a61aeb055026..93015db00c57 100644
--- a/dev-python/py/py-1.4.30.ebuild
+++ b/dev-python/py/py-1.4.30.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index 9bc69c32d493..b7f9f55c5d19 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index d9062ca7ec76..cefe4de4abcf 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 04913639ecd9..16f21ac8fd33 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1125 BLAKE2B 2f121afe29e3c96caae5b3fedbc6b35002421c1a56660d5ccb4f8645deaabbff16a642396fb7b5960e70c3dd3049e93ed9aebd75ffa5d5ddaecb69e303eb3eba SHA512 9c9cef36a1f7cb8f25500fb735c9d1743f8098f943f14a35444666443ef01b97605f30329f5a6ad17c0d9e17227b592b5b2a64ccf960b83eaeb13ee9919e26c9
+EBUILD pyGPG-0.2.ebuild 1126 BLAKE2B 667fab5086883c2d7a3cffccb761af9a13ba6dedfb026a6456e5df6c8ee533915306da88a9681f2d1ca5c22bc2b005655f517412519a97ec13a5352f6f1c805d SHA512 f374f2a3197803eb5245984b780eb4818ce2ae95d9250670626e6fb1eaef943309c069d99343b59202796369e73e6f0e21bb37526399cdbae66a3e646ab85c51
 EBUILD pyGPG-9999.ebuild 1135 BLAKE2B 72ee90f9757fe60e75b382b31427f942ffd2a09ec3cadb90d8f9426ebccc73f9460d4d2dc7a7ba67e99e8795669f7bce90d2c6f3b14103e9c30b6b2e8ee03b5a SHA512 725451e20609d475587561f29e882c68f511ad871e22deec4ba6ae7a8adc048af50b88a26080619b29f4023d4e649a8fb351c7cadabec991d7366c33f0764b36
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index c39c92e87d4a..eeff26977f72 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 2c21e93cef35..4fd4568dc341 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -3,5 +3,5 @@ AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d8238
 DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
 DIST pyalsa-1.1.6.tar.bz2 39797 BLAKE2B 3a23dde67ec807d09b2e9ef0f893b8ec2f5902b0fa88f0f02f8127b7a5a8bdf3fa09397dd01ae1cafbce6b9c733a0eca65fda3cd6fd18e533dd4fbace284caa3 SHA512 6c6aee1ad32c2208ab3f91defee5651cca8bb414479ff80e8a1bd6791ec1df2218a61dd8e7c01f95bd5d51807776034ff96cca2b935e9e4e23d13b6c3c40a0dd
 EBUILD pyalsa-1.0.29.ebuild 749 BLAKE2B ca6af7cf05b488740701967a7bc510a0a62a91d5d60f0ffcab25513d3d4f0b172158c6681799b055dc78733aece802a3cc43f94029b6e183acacb88a28a176db SHA512 ad54758a711119db741e188d7ab3dc61204e5d21b3fc63ea80c637f4594854f692aedc224f7d197c2a3b159bf4f4a7dad0f5b7ccf0ea9d1539a87aa4ad7279d9
-EBUILD pyalsa-1.1.6.ebuild 633 BLAKE2B 4ef4cdfaaa3cf97ea503cdbb78b425123011c893d68472f8b1651675e96244cc8beb952295f034de56ad33aa4ae75d8ba81e4fb368b86a279fd0dbcced7f1d46 SHA512 724f0e3f58e98bcbdad96cf3dde376032c62016d35df22652c07dc42a48823de0bc4cd03b75c950c460fb8f87e60afa9a51fa1c82899b84c7a45920f5b8a3539
+EBUILD pyalsa-1.1.6.ebuild 634 BLAKE2B 57f3436b25514b0753563e765e0c6262d5f8eddc8f299759d32285fc7aece6f8a0026adc679d86eeb281820938ce184e320527875f0b9f6d927bdc552804e5b3 SHA512 80a227dedf48148861d7bd7caaa95f2fea86c0cf3fabd26a33c2d01ab53c2c07326839556ea0ff58f2f6d7bc458048dc2aaa9189258e6b351c02989f8f70624e
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index 3284a23d8f81..ef98fe105f7c 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index d96361d23a8c..9fc530818dea 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -5,9 +5,9 @@ DIST pyasn1-modules-0.1.4.tar.gz 65552 BLAKE2B 5eb087cc4d930f39a651e3b8765ee8c41
 DIST pyasn1-modules-0.1.5.tar.gz 65690 BLAKE2B 74f3de59a8388527e885e04e4eee56c3d4587e697c980e1f9c23604101f367956bff12dd72a34cd4135b49c968f22b69ed70bbac9989259c1dcbc5bf711a96d1 SHA512 0d7f631fdbcb4c89ccf65b91c106483f536daadd099f5b3fb9b144bbcfcb0619bf818fa18715b8f61baf10699421a1af80f003781a5ebac28ebb4f4e7f677c1a
 DIST pyasn1-modules-0.2.1.tar.gz 65808 BLAKE2B 7c1490926078682dd4392bd6c6dd73f944f55e8b5623fde07a3bbc1f62dcfdd1ea8b5217232cd7e2709997424fd61e276cd5786ba618cebd11cbf8ddb695dc53 SHA512 2d8b6bee59434fee41747625236c1d7eb5081a1cef66aa0a0e9e75869c3641a418d21544edafe65f1808ad0dacd9cf1047dd036ff5ce668bb3bf1f6e662e4a5e
 EBUILD pyasn1-modules-0.0.10.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
-EBUILD pyasn1-modules-0.0.5-r1.ebuild 872 BLAKE2B 444051110b95f6dc662317d287aaa2501ab495bca42e7947e849b84a23f4c6a09e96aa58251b8a631c06d67adb71ae069d07a6b7a67b29a3f19b715e8eb9598d SHA512 7cac67249d784687ba9e4ac9d7f2db3b38d07e1ee6486761880ec8906982611ea1dcd9a44db8cbe0f426eea85c8b8228065d45d22e9f0408b1e95bd1e5db3e31
-EBUILD pyasn1-modules-0.0.8.ebuild 868 BLAKE2B 481c2a6f0889ef93785ea734c105cd798b2bb392d2ab266a515e6b133e83916c2f0fa894f1d679b83cefdb894b5d5e2fe12dc637b0a7faca7f6be0394cc8e7ec SHA512 e0c706505fe3f6098755c70b7792bcfdf76db7d351469037b1ce6232e51f2836a9bf4cc24d11ff1a32226e67a281408cf673f8e832f79bdfe1144503a6a1bfa7
+EBUILD pyasn1-modules-0.0.5-r1.ebuild 873 BLAKE2B a44218a34c86a14142620b251cdb96151bfd0b640a9172f659e7922889736a6df96386a07db0d049e8b50d4d17bcbe904053d9d56e0df81ac44df08b6ce8c1df SHA512 65840114765200597a062f673b05b6b2ad4fc226d1c8c92696035201f9d16ca26ec2bced7df053fd529d3b3c458381da97e82dba44e081d12a1f41d013d06b94
+EBUILD pyasn1-modules-0.0.8.ebuild 869 BLAKE2B 06b07a36601bb09d68b5d477d675b3f14ad9f80eb764a6aab8f4a54e18be24ee8b56fb33969dcd92ddf7f64fc07664c02a945a2a1f979ad0d15cf6c9e073f007 SHA512 b9f6b4b507817ac1a5f8c5532c86a5df6a49f49835736e56b8083779ef17df8dfa42268580696b7b5fb3ddb4a755975a4d6dedad0d9c3f54f2b78e506e54a3fb
 EBUILD pyasn1-modules-0.1.4.ebuild 878 BLAKE2B 54aeeba6a9ec4a7bdc32bf0bc6d7215e6e589057eaa5af5f42ad66ca33303809de69dbfbe71dc7ea5e40259bef115b29294e0aebfacd452657bb5adac6cb16a5 SHA512 80b3e0f37a7938ff2d09212957cd633df781ca1365d253cc584e73268248b9d9a2ca2dab404a56efdd8d43cd60fda37b94c300ff541b04af49db238e7998878c
 EBUILD pyasn1-modules-0.1.5.ebuild 813 BLAKE2B 48374dbb5c3a80a1549f9eb748f8f657954c7b47f35370cdf0455635f17cfc58d1eea260f801f86e54e4e6168b7a8d4c9e44c53ebb9006bcd5afbc2260084e27 SHA512 d04674fa1988b49f83b9b07238dc31aaca5c298ef5101e03ab744028c753b57f61c8d77d0de4baaddea7794e93e0af059d8da044c4143c97311f26a76fbe1d56
-EBUILD pyasn1-modules-0.2.1.ebuild 821 BLAKE2B e3d1a2cfcc335b5e8e5ec30aa1b9733f5e1b267f34d3fe75a83ba384c1eba31b3ec79877da6381daa70984cca7637432c2767965a73da4e99d512cf70335ff83 SHA512 231f490caed1166eca8dbb095513d0c0d8de13a6f78e480769dac70d438ee68b8ba6ac6e432035dcaa89d90e504fd5ea9cdd42958ac6815adf7114595e937394
+EBUILD pyasn1-modules-0.2.1.ebuild 822 BLAKE2B a4d8a2cbe94c9444f39488db37a3acfd434fe6bec1ca15742a350d4a6d2f61120978664a024e40e38686cebd4db9fddbb69e6ae9b4dea702733d16543ba6001a SHA512 dfc6c73ddafaec7fda860bbc36dc306a5788cc84d539891773c9499c73fa208e5df23f461285b7955be53b6721ff53209bdcb4db24e41238b8bdc39fa46746b8
 MISC metadata.xml 380 BLAKE2B 0f3336d6484687fbe0a61cc0c88110e51ae40a8905bb0d5d5b166ed6f8c49964f9abedeb7539cea85118a3d2ab548444680bb89ea57d5e44ff52298e95f557e3 SHA512 0122261838e5789fc995c1e07fd2f8d59fb470d2f525126adb971d7e991e7b7cd76c3fe37ce21949d6ec3fb79af8ccc2d5ce02aab4afda842809916a5c609f15
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
index 5779cccd4c6f..fc8de354e4c7 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
@@ -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 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]"
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 cb0814a6f918..9f7b90df329c 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
index c76154bbfc4a..b8a744737f13 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.1.ebuild
@@ -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 ~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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index a285e2518fae..0245626444af 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -2,8 +2,8 @@ DIST pyasn1-0.2.3.tar.gz 100099 BLAKE2B 32e6fa765fc5c217f66ca5618acc132c96fd8adc
 DIST pyasn1-0.3.7.tar.gz 117643 BLAKE2B 66e4987a63139c7af06d6bcdb125ef6f0f46ea5885bbbefae6c76252bd96296abf71a59f6ddc6f196ef78077a62649963c4d9419546f631d93e723dca30bf9b2 SHA512 85735ecb5b83979e51c9f663e2e0dcfbc317ba7e22474d78998f97c40a3487fd06ade9a259d1a4a8de5f4e70e5521a060af127799b92931ceb26abd384ec5807
 DIST pyasn1-0.4.2.tar.gz 118404 BLAKE2B b96135b10eb9b79ac02b21d35df19ee1078a51586eb37832004a1891db0cce305fe3fb65c34f4b05fd1c854f1d708aa59b3e85908df39d54ebb051a2f021ca60 SHA512 30e7cdfd2f7b182081f951bd94169a300a577f95fbfcb4ddb6dc288617b2776265018d246ae0adb649650ee94aab9122a428313d7a61559f97ed7f02b9670709
 DIST pyasn1-0.4.3.tar.gz 118494 BLAKE2B 39c223e09d3996674e7e89306fadec9e47eb39284abafb7ca2b0f988ec420a3986247f6daf69a14bde0a671726c1e615976042228de6869606a3da2c7c65d7fd SHA512 a699b1ef58129860f8448e8c08a7017adfd7ead7844a45197b1026e12760424d20f89a421b3fe8caeab3922448d00a77f717c0a03841c36c6b1d1740b0d9707b
-EBUILD pyasn1-0.2.3.ebuild 1109 BLAKE2B 5856a3cc7b6da2f54911136de2e626aacbbd38831da5e9cd34cae09cb1ca9279ea48a965d3aa03fa94627d2020d7b735e0a96cc479cd59d18470ebe61eed080f SHA512 0fcbe2c1a8ce171bc6dbb1130c15e5cc9fea15213cbc6f050a17378f012f5cfdcc8026c94e6e13def16fde1e809ae9161510ee73a3703f4d5a5d32a11d538774
+EBUILD pyasn1-0.2.3.ebuild 1110 BLAKE2B dc113906083a102307aa66298daabdab0b1f6d399af7956efad654bfd2001ae454d282e57bac8914d70a57052c2c04a49845725e24d5e37c65533183a20f4f98 SHA512 f65bf1340009214615abf437177fae9cb8fc080057d5d179bb06a9feedd4d97c5ecc3352b39585c61c561ecc0a44a3b4046d467146ef3523102bcf77d71b17f3
 EBUILD pyasn1-0.3.7.ebuild 1123 BLAKE2B 2a9a328f950c46048be70ee26ef6be42791aa0bd088c69bbe65da9db30f1e0061c19bd9357f946e7c1e73de13f53b2a22bda5cd334361e08466d4304ab0648f3 SHA512 74715a44393cd13915094f15b1c63a7e192ad44462b22838dd106a44760f57acc580c1ea19b49c867f716710574a67039b5f8d634595f12fc2899929cd96c243
-EBUILD pyasn1-0.4.2.ebuild 887 BLAKE2B 23abc568a1a32dcb2855bb549bdc2ebdaf0f32adb3ae43628b316d34cafce1b56b7c13fcc533cab52d8485f416566b457dee0b360e7969f0260319b4125ca98f SHA512 fbd85fa726e004f143ef48f1508e440daf65b619ce4631a797d25ad83b7844fba8ec4e6eb7dc26bb68b380808b7ce93179f8b3574a473aea3c72488c30a9e122
+EBUILD pyasn1-0.4.2.ebuild 888 BLAKE2B d7c0d73125f60ee898d72dc7b7753c68be080673fc64112e794f6b8852d7065c179c82139d8040e43852005006da3e6f5c9b2e5e27ef9b001a5097c046db9c50 SHA512 9d3e1a7e5e59495e067fe27217144a7bb44321846405a0d623607ba42797f7224c6fefbceeb57fbadd03b3924b17e9ad583b24e6c469f824f813a2c4bf0f81e8
 EBUILD pyasn1-0.4.3.ebuild 849 BLAKE2B 7730fa7de0971bab381356e43a87f711eec9abbe76d0a7396a8d92eaa702e9b1b48662512bc95e623d4a8a7368c9a9c6b83a91f790aec14e39637a72e6ed41ab SHA512 ee05350279d72affd819f89e18a1d8683cd059ce353add71bea376b57d57fac7f6e5a6aabf6ce0e035118a55799fbf1a87937436ac3663de2ee8c4133f456274
 MISC metadata.xml 428 BLAKE2B d98ed2c4f984efff51e45c7b57c7decacbde65d59311776fa432b1e771f1bfb97abc6b588b75fd4faca7a3a0bd93aac3504532ef0b4569f8cf9099fa1f69b548 SHA512 b2d4bf181128f2724c450387fd51d971f85fc25ca293b8ebe4029e0559f660a5f5d207db40d683b8d80a6233986a885069ae4e7d82507901151a71f19c6a75ee
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
index dd5380fe7488..ce3a4a098d18 100644
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pyasn1/pyasn1-0.4.2.ebuild b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
index 00a16beabd76..1a69fdf750f8 100644
--- a/dev-python/pyasn1/pyasn1-0.4.2.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index ce5abfd5de5e..760923db3caa 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,3 @@
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
-EBUILD pyblake2-1.1.2.ebuild 835 BLAKE2B c43d773d26cf2a1003f77a9e593b0e66319eb458a799271293f0e9d9a2c06802f81d75b889192259d0118ed83dff20f2927825d4b7a7877d0580dddb401b9310 SHA512 3d51d06cfc5bd0cb60f6ce39790d64f8beb309be7a71923f0a0979bbc673f41beff0fee39ced391b8b7432b1040f79600a336206a48b913088f5a26f4e9df3ed
+EBUILD pyblake2-1.1.2.ebuild 836 BLAKE2B 9ab85e6e34df4af57493b2c20165b3c229f3305ebc96e565e89fcb07763353f80ae84b2cfe235a17c8010ce53baa2234c2821d4f8159bc4581db820498be2e73 SHA512 00a080c310fb0942d1500c0eb2a91eef43a968cba99050f70b3068221389d3645202d3e5986de47f7eb374cf86a3176d5f2f184fd192deddec3852e4884b90ec
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 5484f325f2bb..474dfa029e03 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index d05c81ec6cb2..3de331efc811 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -2,4 +2,4 @@ DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69
 DIST PyBluez-0.22.zip 109060 BLAKE2B 0bbe0d23b3baf0e76567f2dee8f38ca1460767179df15b52c545e84cd131d23a5ae3752dd7867aae6307fd98f0b2c5a5f55b23c550805e163675526696f559fb SHA512 c166a976d311eba73516aaf86ab42b100a39ebccd3d70f93ccb89f59c12127a857698dcfe4b25f8f689eee12187b5f35ccc8235e36cf012e73df155ba5adfae6
 EBUILD pybluez-0.18-r1.ebuild 574 BLAKE2B 69e35680ca72d37e5162e6130cfc20b94208f77727081ce193de29d6e2478587487e3cc26da3949dff7c3e3fad7b09897fcfc421d7666cc2e0062b5cced20391 SHA512 cfcc9d653c9dda462e742228625dad0526cf2691482b29d03b1b68d8e1397a4575a8840f72c6cfabd2452411d77e02dd9d53576697067e5e7ce56437cf3362fe
 EBUILD pybluez-0.22.ebuild 649 BLAKE2B 59d828aa8280f812fab6c3f448d32030cf35b687a3d36866bb96b30bf25bafbd7b91e63e2da7fbfc80e6572f81c73d1cff79199e7b47ee866e21c733b64ab87a SHA512 311bbcc07e1cf28650a1d0765fb1bef594059dfde58c65df2164d05b73b1d2d9a3c1f30a2bcf88dc8931cfd0a10bd13b7e488e90d932962dbd0d1e1765a8900f
-MISC metadata.xml 614 BLAKE2B 407faf55334b7e516c3d3a43000c2d886e6b02a23908878bf3b40b7ad62bbbfa8d9353f1751ab4b35cfdb5d1af2e695811dbaca58ba1e88722f9acce1cd57b9b SHA512 0a4c61d454bfe82c6491d87c2e807b52b0a223a695359ba6921852b43bc5afd37de44821fe6c65c06c5973d128ef158bb02ad13a1963d1909ae4bddfe64324af
+MISC metadata.xml 539 BLAKE2B 4e87b2e8a4ae9be5916825471188649fe825c2dc614970a6c9af95098ff4abb97c0c59c3eece1b47e7bbc14d78f172369fa5498b3bb7ca9bac6218bc54ea0a7d SHA512 9560c0dd1afb3fbb49c6d17c0b730ebbee42df60014975d5b46fd07dfb7f40126df9798133f329b829cb235f3f97034a3befa5807499c721073072ddca25ec18
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
index 0334f65093e0..7ab1c610c038 100644
--- a/dev-python/pybluez/metadata.xml
+++ b/dev-python/pybluez/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>PyBluez is an effort to create Python wrappers around bluez to allow Python
 developers to use system bluetooth resources. It works on machines running the
 GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 423c523fe413..9c67a4be0b51 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,10 +1,3 @@
-AUX pycairo-1.17.0-pkgconfigdir.patch 2465 BLAKE2B ea288bb36d4096586d2384b3d25b95fc02747e0780c773bde768832893fbe7c87476ab57fa342d6ec15ff06c6cf123cad1b1e6461c79aa3e1c86369f5b96fc13 SHA512 716e55df7416f8bb6cf73e3576fac5a9967667019b05ae9dd13e4c9edacf9c07d1e29b6e67ac8bb158171d8d2d82d02a61f3d8fb77c3c1a28e288de1f352d163
-DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
-DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
-DIST pycairo-1.18.1.tar.gz 200610 BLAKE2B 47e707f3481d816e9fcd72d169d7ab9210f746396a45a6c9cdac946b4dca9529515ebe1a288d985eed659ff23488bec2cf3e0fb8d11c160349530871ed05881f SHA512 fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
-EBUILD pycairo-1.16.3-r1.ebuild 1088 BLAKE2B 5a49cd65ed9498006d35d95da1b0b11fa103ae6d6dce76b6a98432688e71c949cb716329ca0b518a39966232be62f79ae75cf5067b97ef61c4b42300071c0b85 SHA512 09a27fdb5023c0c9c22412db6f5ba4c1a67c6e283e477858e29083957b32b167970ed9273b82fa91a7d82b5a722cf316aa287dfe88f3d241fdf608fd022fb176
-EBUILD pycairo-1.17.0-r1.ebuild 1282 BLAKE2B 43bc3ce2a4a2f778de08a5402e652631646e924702f667ec934a6c1d9865b34a6ce64c3765da5fd24a5d6d80d834be9639dfbf8b846d2df1e0503368c88cff21 SHA512 9258c2f1c6230f572ca801f0231e1787a03fd3009b25ba877c19c410bf141d6a65062b707d1f11b67b11d50ae3a1914c234b68a71d80f1de8c135b311ed9c308
-EBUILD pycairo-1.18.1.ebuild 1274 BLAKE2B 242e5ab2d3d0a0fd73ccdca6555062c062af8ebde0e5595ac85a7300a78066e85035702b37cffe139ce5c93193e4b164d7c5365f9df616dc0cc9ffb0002e86f5 SHA512 5f8693df36a504cd006efd1442d3a0c8dd940f5164a52b4441f4e08ebef5e5a1de0dee604423ec62fe44ea0a1a9bf2d9de70fcd007ebb9c6494cde347ffb7c82
 EBUILD pycairo-1.18.2.ebuild 1417 BLAKE2B 3b1687a28ad16c06eea5b88f409231aca22bbf1335dc4de5b2dd382e4bd088b9cacbc3f036f310f1280ece8e0098727190d44f9bc23b47a3c0d90c0fcbd2273e SHA512 0f0f60e5797d3c61eccf86c43299f3057a929843f7ad84a565ceb350ad6a1870bc82378e70a3cb97d5abacfb3ec5e4ae13f681338715b24fb955d7b6e4ed2c5b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
deleted file mode 100644
index d4d75a172d63..000000000000
--- a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 430c6ffb65cd839be5ba6266a89f645afa8f9442 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 14 Oct 2018 12:30:56 +0200
-Subject: [PATCH] setup.py: Support specifying custom --pkgconfigdir
-
-Support overriding --pkgconfigdir for whenever the autodetection
-gives incorrect result (e.g. PyPy).  Fixes #119.
----
- setup.py | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 36641d9..75c8888 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,6 +14,7 @@ except ImportError:
- from distutils.core import Extension, Command, Distribution
- from distutils.ccompiler import new_compiler
- from distutils.sysconfig import customize_compiler
-+from distutils.util import change_root
- from distutils import log
- from distutils import sysconfig
- 
-@@ -265,11 +266,15 @@ class test_cmd(Command):
- 
- class install_pkgconfig(Command):
-     description = "install .pc file"
--    user_options = []
-+    user_options = [
-+        ('pkgconfigdir=', None, 'pkg-config file install directory'),
-+    ]
- 
-     def initialize_options(self):
-+        self.root = None
-         self.install_base = None
-         self.install_data = None
-+        self.pkgconfigdir = None
-         self.compiler_type = None
-         self.outfiles = []
- 
-@@ -280,6 +285,11 @@ class install_pkgconfig(Command):
-             ('install_data', 'install_data'),
-         )
- 
-+        self.set_undefined_options(
-+            'install',
-+            ('root', 'root'),
-+        )
-+
-         self.set_undefined_options(
-             'build_ext',
-             ('compiler_type', 'compiler_type'),
-@@ -315,8 +325,13 @@ class install_pkgconfig(Command):
-                 "Skipping install_pkgconfig, not supported with MSVC")
-             return
- 
--        python_lib = sysconfig.get_python_lib(True, True, self.install_data)
--        pkgconfig_dir = os.path.join(os.path.dirname(python_lib), 'pkgconfig')
-+        if self.pkgconfigdir is None:
-+            python_lib = sysconfig.get_python_lib(True, True,
-+                                                  self.install_data)
-+            pkgconfig_dir = os.path.join(os.path.dirname(python_lib),
-+                                         'pkgconfig')
-+        else:
-+            pkgconfig_dir = change_root(self.root, self.pkgconfigdir)
-         self.mkpath(pkgconfig_dir)
- 
-         pcname = "py3cairo.pc" if sys.version_info[0] == 3 else "pycairo.pc"
--- 
-2.19.1
-
diff --git a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
deleted file mode 100644
index 2393563f129f..000000000000
--- a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
deleted file mode 100644
index de5dc8be4ae4..000000000000
--- a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pycairo-1.17.0-pkgconfigdir.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.18.1.ebuild b/dev-python/pycairo/pycairo-1.18.1.ebuild
deleted file mode 100644
index ea83bd345307..000000000000
--- a/dev-python/pycairo/pycairo-1.18.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs -b html _build/html || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/. )
-
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 0144e8e097f0..c0f861326a97 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,7 +1,7 @@
 DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a4d0275a77e6365201ccffae955a8f505a1cd5e739145e1fc5551c3b956ff9a51bb57cede819f2886ee36637f7f9e SHA512 276bc21b4e6898e379be88f3582135a21314460ad20d4b6c3e12825ac1a72082b2c08bb62099e704c3222f879a1098d0b305132fac1095aaa60ca239b9763a2d
 DIST pycodestyle-2.4.0.tar.gz 96665 BLAKE2B 9c847aa9c9ffa1f401595d1c2c3f81f971f69628fb34d4e572ccb99203f8e9abe8101302d61c4ae7d330c03e7d0dd5e252d658065b7ed6660dea186880030529 SHA512 cb35238291fed30f1a4363e65b754165772d01e6006e19ce31769691aed17411cd893899fcd22dfca0455401bee899097fff6f3d63825c7656f186e37b7da3a0
 DIST pycodestyle-2.5.0.tar.gz 98802 BLAKE2B ec86642f0f37abc4da8886df6395694b54cbe4e1d0030615b2136f0bc265825df254f019483e9094feaad685e43008cefdf0e50b533df434a40de0de11aa5fa1 SHA512 84e751a7d00048393b02ca743de5d71d1641e948ee1b4daebbdf2d07e0cd8f087ca4e81f826061114b40ef41920bbcd680c9f479e7cc1a159a70188425717208
-EBUILD pycodestyle-2.3.1.ebuild 1105 BLAKE2B 90c38e2808fedf9594d5b914de453fa24d9bbe7e27b6a0e0fbe4cce261f665a5ffedc36640182c4ec09b716e3c1b0c52b371a7f14bf2ee98d6ef6cd1ae828340 SHA512 4052b765a776d987763a7032a48ccff9aa26d979c5b02f22b53e626fb66893d69dc4813c8506dbe97db80ba02f2802d42a3bcb4506a460e01dfe9a26d11a8b36
+EBUILD pycodestyle-2.3.1.ebuild 1106 BLAKE2B fe5cab92e9574da2b7007e780f871f6b2836664a411e725dd63ff1c1b443753576c009ddf7437b1d0b336cb1a98e505a3c6930151ea5878938f047cc17c7f4c6 SHA512 8d9b63c5e2e345d4d95a67de84ab809da25ae8d4c174bd449673dc6274e9ebad3d4786401e25e06d9699313f69472eccc1c266b3121a0b946ec4bf806fec8d94
 EBUILD pycodestyle-2.4.0.ebuild 1115 BLAKE2B f804ddda31c340567206d5970445048923c30abfd13009f309e9790314745e6a64c9576f1207be03d2b9f1e2fa9e2456650e1ead5b6004cc58638a50fd49d0bd SHA512 e0ea088f6844cd41b74c596f45fbad249cf8928c5af1e82d44a826c03f354c64fbce300d72769541667997745f894a34d0b15eb00af24dee1276f8d2506abfd9
 EBUILD pycodestyle-2.5.0.ebuild 1096 BLAKE2B 688870c576b27db41c90bc6c11b95ad48182350b67192c7b7e502b44bdd692e41a2f29b73096245c10b3e43abc71882c05c42a1d7a5c87c06454a27d1654a4e9 SHA512 df8fbfdf4c0291ad4672908b5abd469a940456949b2cda34e76e8c21fdcf37b1c96c061d0b4958638376e6c6e780bab4917edf64122759074b2fd39b934da061
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 12c2e94d60ed..d96e2d151da5 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 81363ba8a024..536fc93146ed 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -2,7 +2,7 @@ AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be02
 DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
 DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
 DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
-EBUILD pycparser-2.14.ebuild 936 BLAKE2B b64eabf2c0e4b102cadd8cf15eb73b44b3fdc63edda563f6b902576601e7520ed4d2b8682f9bbfdd39545ef5223b70dfd1e21ba50042c40e621641586f73321a SHA512 49abe6a8b737877598edec7a8d778d5f4e8a7d87c19b67f53f97d21107547346f136d8eaee775e87ae8482d8061ca3c9a976e2660aea9a0d9a5b5b850ad806c7
+EBUILD pycparser-2.14.ebuild 937 BLAKE2B 2d74e1598e8e924abe49990bd6b739c6e51d5457b5bcf633a4bd47f30ba4c08cee2667a0edce5bbe111f06c2588c6d5771b57f765b6634d6a38cb477818d7729 SHA512 ab61306a759c731b1ad2ea4b60eed1ed320859d2ff3d3e8c3e4d8195e30e764a4c2e22b50b552a9b6cd1b159a5cf5008109d8af45c588ce222bf749d62eca9cf
 EBUILD pycparser-2.18-r1.ebuild 1546 BLAKE2B 7866aaa73b1338de2905b0d6cd112e5cea41ed70d28487095679f4b420920924ab290151a0e644c11742d96ac25b3d0bee3e33456ba15b58a5d90f7823cfca24 SHA512 a20aaa69e14031578116492155e3e46bf574b45f4b74ba799e4f55eaac6ac4e6e76056fa9a90d9b33947734e93ae4f3313e9fce17ee9a606b263846ac848c3f3
 EBUILD pycparser-2.19-r1.ebuild 1635 BLAKE2B f2c50c07039079b37a11b8476263211b29484316437d4cdf382d521b7aa1b74e168d1a8ae5094f49ce272f7aafb596296bdf1028cd9575d0b02773203942e2f3 SHA512 d095fd84b65fb6cae0ef1e06df8da1a23c01a43b7dac3d331a52e3302b9f8d2371c6398c9e5e88a784a5d769f102c95e499fc8f37144855d50992bd2da16542e
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index 699b5fdfc71a..7c122a71fd48 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index c54c3c065a43..a91f8e8fa22b 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 2080 BLAKE2B 14bcf7f8413d487dcbab802901c63e089d74b66e0a7b60202839381365fe2a9c940ebd0e1e0f5d5647e27e703534646fc66a9796ecbc566e7507f7ea7b3143da SHA512 c75e03f572eef26cb2567d9a596d1576bbf4f3cc782694e6196c888ba9250530923ecf76804cfab06aa9e37ba852ec6704245a6e071f6be355c63a05f94921a8
+EBUILD pycrypto-2.6.1-r2.ebuild 2081 BLAKE2B cfe0cdbf5f9ae918d5a7cef372d38803509c2352d9efea8126c52c9bf431fd2ade7fe1d5cc61e8fe3755f09dca02c1b37ff150bf6eb15e57304ec91c1408a16b SHA512 5dc660180043239e3045cd5d82868b716cd4e8b1f5472ae5d04af05d98d20aeb48dcc44390bca80846d0a37ab8adb442db486135b2f2062cfc41fad4bc580954
 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 a8ce013b01c8..1a996b5bff05 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -15,7 +15,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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index ffccf683cd2f..a753ab2e4c08 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -8,7 +8,7 @@ DIST pycryptodome-3.8.2.tar.gz 12441359 BLAKE2B 857b77ce23bafe8a296d6fc240291449
 DIST pycryptodome-3.9.4.tar.gz 11575825 BLAKE2B c153fe71179d633a5722480c4c42cc133100f524a8ba9d3cd9380b7e172564c276b70b97ef36437fa3a149c418903802f410c9d1807d5d72345dffb0aa568223 SHA512 d99e4e431d77856ce3ae33526984cadf2fa6aa82b1f692a2ad0ae893f6a1e9538e6d71d281578e6bd733a816664d1683364c64441196cbc6ee1278f9d6eac62c
 EBUILD pycryptodome-3.4.6.ebuild 801 BLAKE2B 18061cb2cebae82ccd6c695e424d891a46a833abd856473f63e0242531a04a11de20593c44ecd1d13e3021ab315087bb114eaf8db79bf414fdbc9a7eeae7e39e SHA512 28e15901398dcbbf61e669b22c46ef21e544fbb4f46984603d9c1a447f113de6f97440f7b2ee26bd43eabbc266ec5bbe6337793fffd42dcf77cfe01008cc82bd
 EBUILD pycryptodome-3.4.7.ebuild 851 BLAKE2B 05e1584574c422538e6c2832643c93ac8854a2267f9f317147c66dbce677d916fb04a74808136bc64ac332ed562736c6182b23e9c07eb2c663fdba468498ad98 SHA512 84276c577e41325b6ff729a48a2fc8761858c7e34e4816810751904468618aab09727d5ed347862b025739fd97557b8a35e66b111e925d7145dca33e4400595b
-EBUILD pycryptodome-3.6.6.ebuild 886 BLAKE2B 309f71f49b85bebaa2cb6f96e3e09a0e7ddf3525c5a4324692d691e24fa062f2f4a8f21c4c6878d7f7e3a2e5e238a5f2c5fb8e5e00be4d74494d157fcc38556e SHA512 0b338d83d78f5d60a8db2e0b400e103faa3742887db06f6c70b63de40e87a4514d7cdb8dddd09c54ea997671da8ddc49f8e31757bb56ccae9c1379fdd2218edd
+EBUILD pycryptodome-3.6.6.ebuild 887 BLAKE2B a4fafd6dc29ff362d17f2b8de387c33ec5ab3e8ebc327576392a1479843a0707ec3eccfde5cd36d9b2a58dda644c11e8cc546688345101538563989a997ce43f SHA512 f033bc0df6da56b8271fc642854945865d777bad1c40c5e50684d40d556a2b17180e930837286145e6d6388ac79a007639a827f9614175637920124bff82a1ec
 EBUILD pycryptodome-3.7.3.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
 EBUILD pycryptodome-3.8.2.ebuild 896 BLAKE2B 006cbd8af847db6f283315b8c1a7c89837ab5db28dcbd0ee388916204d1a92ae2e32ed5c067f8b6748be98188e4c634527b4831e4d9becc82a3a3d1e9b4959d7 SHA512 57fc674100fe0c569c326125fc5cc53a3119d13d95e9cfbe110590b68a0c0c46b907745e24ae5b7d97e8d9be914c5d742262e11e1597869b543743d6584866b5
 EBUILD pycryptodome-3.9.4.ebuild 1484 BLAKE2B e0923a3a310baa4b5ea404ddd9aaa62bafe5f408f5d96adf491d113ab2a4c427650d0c3cc8e7f2b13c26bd75c176752e83e25f7e0bb77b2d0e5aa2c8d1e1f17c SHA512 4e6fef644d0cba7c57998de5e3e780d460bc0f269aa726e24d3864d5f5d90961ae0267856d1d9fdc621da0529054b6bf1a7a153db1ea047f888c90d9b832c5a6
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index ddee8b4404dc..9c71ef6c6c22 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-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 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index ced51bdf64c3..2af65262e722 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,4 +1,4 @@
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
-EBUILD pycups-1.9.73-r1.ebuild 1409 BLAKE2B 648bb223e5d16dba790275b992bbe37d89785cf18db998f06dd3aff607ca1abb0943136df0e15502ab04105d3fdf3354f56cfa41c0707b996cb76eb1d0a01015 SHA512 17cdd261c35306de1fc93d8b62abc818b346c13c593257c7c9e85e33f7a5a71dc5b974c2c17062f4bbbac5b68c004c27e99900586cb89b650751f7673fb7e451
+EBUILD pycups-1.9.73-r1.ebuild 1410 BLAKE2B fbda30b81cedc43000e4170795cd6ebe7a42184e5c5cf377ed487fbfc84d393af9d567bcd52cf2e20e6fe525d0c31d6e954c2c015d54a3c1c784b20837fb1a60 SHA512 e6f973c53d2171c72e27c85acc7b5cda71e21c591974cf388c432f324116236cc32c547ca8d5bad132bfa5b58644fca1bc37d147ad810aba00354e7d4a4181d0
 EBUILD pycups-1.9.73-r2.ebuild 1414 BLAKE2B 68060b212b39f8cbec8fad18b6094f800e0464b9922c99ef1ef5dde54a26b15cf2bba513b5f5ce1241c1e0d4ed50f1beb0776be550dff96c0c7af2b858051cdc SHA512 d75f20cd92ff2df5c5d0d8472d58d6fb5512708000810757c2784ae2f390b8b8c751c155012256dcc95c6f828311c2ff7e32ffd49db148147ee6176a0f96eeab
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index a4f5ad9e53f2..739e5b77d606 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index d5492c5557cd..474844c71291 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -3,5 +3,5 @@ DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f272
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
 EBUILD pycurl-7.43.0.2.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
 EBUILD pycurl-7.43.0.3.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
-EBUILD pycurl-7.43.0.ebuild 2626 BLAKE2B 25bfe246cbad2bcb9301f0e7713f644055ae6e9aa79c3473d473268cde2602d770453cb4f0f6175ce549f711692352a71c108b88ff9b0344b866f6739d5c7458 SHA512 d27e84799d20f781743f43413a398ef40df1d21ce25c512c47b0d7cf39ca39840663ecb1803060adfb1ba6c3d217dfd6a6d53e0f7e2b637294ada8cdee38f489
+EBUILD pycurl-7.43.0.ebuild 2627 BLAKE2B bf8f5f94b4d74abcfe7b244f7f64f42174147900b945cec049c8310db6e41b1371eba57a38491cbcdebca1c362d65e8856a05142936ea4c6269af5e4cd36df1f SHA512 855b5de29db29093e690a91244eb7f3765db796134ccadffb4f52e26443372356c7b1a49fb629105046f258f55ae8a5e0cb68beefa364ef30c5cbbf3f35beca0
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 66d7525dd702..709ce8c1f28c 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index c49246364f92..6fd8460ee980 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,4 @@
 AUX pycxx-6.2.3-installation.patch 1248 BLAKE2B 8f91ad3bec34739bf3e23efda7b671d8be12a2fb6c9920b89f7ed582c81e9230475281efbd69361a9d1d862804144a4bc779caa01bf303c35d7d7e8b0ca60df7 SHA512 34eaf885611dddb4b7a650d9b2d162fbe559b5f0fcf19f514e1d9cf65e15944c43a9e0c988da815c00a92652495ef9a94a98634d11d9291d28b1f41289fb9d81
 DIST pycxx-6.2.6.tar.gz 141547 BLAKE2B e067d2a3f7ce58200c3b97f971692f64545f224929308c6e9a668a15eb775580060e860cf8ba1f894ae61320aa3454622f15fcc6fbdc601251c9b9ce576b611d SHA512 9a6c30acb99c112497c02fb0826dc0197bbf4b813d25eab3f7d6537dfd83db8150c94f617f79810bbcca64496b8d6e67b1a41446523d66031c54c21e0425ea0c
-EBUILD pycxx-6.2.6.ebuild 963 BLAKE2B bf2f0175e1d798e85090632dc2311a415acfa494a455be3c3e7e7c68fd11a99a29991fc844ca933ef17736ee2a10e6f799ccac536058ed1f24e33938e10f82c6 SHA512 4f431ca30136a8d3561c01942b652a61c07fb8e5a5e8d79d78635ff03f10883c44de57da4c03237a110840282b94eba222fc65d48bc7b1efaaf623d810600ff9
+EBUILD pycxx-6.2.6.ebuild 957 BLAKE2B d37897c9a7f39ec9597a12b8d285e5458c45c6ec6d5fd1a74db225423c0ff6086de6aaad63bae83fdf2f9358987bb34bd17ca312c378dddfb07e6d15a6be8fa0 SHA512 c0d6d5fa794efb61afedb21a0234bc776ff89888d169cd331fdca1d9409fb7625e612d88c191f89ab4a89d4d5f1b66137fbb2415d89aac16b3084828faeacb82
 MISC metadata.xml 623 BLAKE2B f58248b0fd25b697209c0dd07cefd240cc2bee7eb7ae8b76d3d2e7fa26ce9036e9478b8f07781821fbd2c666ebb4edc09c618d20cceb045acc5e21aac41b0658 SHA512 fbe60226b2e1a989e27652d9449105c6a188bf39ed07e0511901050752d1cd51d74a18fae9f794a341a3f6d772957757275b973a87cd49bf4745a87a509beb50
diff --git a/dev-python/pycxx/pycxx-6.2.6.ebuild b/dev-python/pycxx/pycxx-6.2.6.ebuild
index f52cebdcd499..c90dbab688d3 100644
--- a/dev-python/pycxx/pycxx-6.2.6.ebuild
+++ b/dev-python/pycxx/pycxx-6.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index cc5bd3ee260e..b5bf4e578b59 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3.ebuild 950 BLAKE2B bd4cab2ccaffab4fa752a475606d6abb3c913c0a41b58518e88cb7bb733fb056a0a537e06834ee8e77bd6634874d40eb1ba092b3f627221dd0619bdf228eaf8c SHA512 8c82f46e37623fa83b3e6b40fb8cf9cde02d30a300b9e97a494472ba89651270f90911ce4809c5bf0cc914dfbf23f312ee84e8e5d52f87ed1402ed7f19b9bb06
+EBUILD pydecomp-0.3.ebuild 951 BLAKE2B 603619e173612342a39b5bec53208e0b28524d69b545954a5edd0add6d538131a18ede36dc4e591f199c0e01afab4c02f464a96b91cfd63fe0abf965a32248c1 SHA512 de709e1a53ae10095d63c3ee1530f25751fcdb5772fbb9e3509cddf05ddcb2dcdb79deff47749e2527adf3879071269dc752a8e457db5755cf333a7ce3728c12
 EBUILD pydecomp-9999.ebuild 1224 BLAKE2B cd334838d8bec6255bd53631039aabfaac20411da3e7a41bbb3759251224bd4d76f08332ecc00084e6e7641c54e5e0096ed05b1f09d883ef31dd2c35923d2bfc SHA512 bdf973ba90d702b015447fd5d91e87a7461b17e114cd82186142ed17ca4342332f907cbf026c5b0f2053210ef5131819f9b7c7d7b123d4cb55614f6d39fcd528
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index dee7614b55cc..7cb69234af7c 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 6569f8c1227f..0b1751886460 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -3,7 +3,7 @@ AUX pydot-1.0.28-pyparsing2fix.patch 836 BLAKE2B f6b629e47032087241e239d3a751571
 DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef60edd9d0515ebfc9c685aba09dc42f89849c1eb609e469a4036062d3f0b83b364d89557f73414143c2c78d59 SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055
 DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.0.28-r2.ebuild 715 BLAKE2B bb5e42c14060af3919cd62963de8b1ee13581b37f2163c15b99869440a4be2af2f5e27251b0a159b064c7039a6970f470e7b926c3b6438ccd7d55f5933365823 SHA512 374267a45cc3ac12b170620ee639481f8171783b36c7cd24a470b51fbe36c82e38c6af8c2609d6779aafd0b0bfc09da25e221a43fbb5f61210f3549f22094ecf
-EBUILD pydot-1.2.3.ebuild 917 BLAKE2B 946d5b0b27eecef742545a99a53f8e0405c520ff83299c3e7a350d7af559210db288e79783798c6ac3560e5d3b6428380e6b81d92a10a1bc099699a0ec0b29f3 SHA512 648a80890d1b2bc50302937ad2dae65ad56e1d3b71ce048e2d8322a389ebdd2c0750c08be0e595da8fdb88f23c1f34304445440e16d8149ffa8cdb950bdec61a
-EBUILD pydot-1.4.1.ebuild 929 BLAKE2B bbed83abd491faeee1e03360a22bfae3d5cc2afcd561949822af64b7c9a4ce5e1e075635623a6ff7f7e3e109a855bc66eb5ea4e74f58036096701a4949eea88e SHA512 07878f4de05d7e0cf7410e3f17f4842df06cab73641e8479d34847fa9094446f58c4eaf3fec11a86ed5897e7053593152bb8a272f8cffb9a2be4911ec5c140e6
+EBUILD pydot-1.0.28-r2.ebuild 716 BLAKE2B e654066c1f59f20dc3a4b0a66892be351b34f6edea70263b354fcc63868327aa59458ea0cd58f63bdfae8822794bf68155e58dbac6829ac6eb4c03c8588be632 SHA512 e4093a13f9984a429aa4d6fd8963fac7077af1c124ca144a729b25ad2f7e2f16d1781a3535158f93f7e02b8ee6dd4ffc1d1a8d706408ebde9df3cc777e76e53c
+EBUILD pydot-1.2.3.ebuild 918 BLAKE2B b37148fd8260d27cdf24e59f9de48385cfdf9728a8c179bd2e02b26ba602462c0e2d093d5999e7bb41ac988e2f18653dd2125bd56c6929f597df9a82698d7230 SHA512 ca6ad4dd25e4b1289dfc04fd97b91430494aa7bd5eab12cc85efca1c6aec75402098c333d475414b470d9503ca4d53c239d26ee10f06901a81e61dc126e54639
+EBUILD pydot-1.4.1.ebuild 930 BLAKE2B c9c762a746cfe4d7382e283304731b03dab7f55811911a5e9ee766cbb9b522b8028564787c800168cb7c5dd5b1799449f4cf6ec650c4602f6adb3402ccd83f49 SHA512 afa93d2c6368999a2f8657fd3c73c28543818f519ef6ca69eaeaf8a332840da7d45f77acde7dd95ab9a40b126c4475ab296de1a029802615b7f2f1991e3ea7a9
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
index afe48e3cc683..5c92facbb112 100644
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ b/dev-python/pydot/pydot-1.0.28-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
index 567b94376cf4..1fd6811bffa6 100644
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index 30c027800711..d87d9d0fdf74 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index ed1655393873..f811d2198c64 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,6 +1,6 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
 EBUILD pyelftools-0.24-r1.ebuild 887 BLAKE2B 737cf15c794e829e057f0a4a8b4761d79c4e871e5c16e7c3c90412c6880764e7af874d8085700c795c85f3ce4d03cedfdae816878bc4a4eb7466a3397bfab120 SHA512 2aa3ece5d5c454a899acf6a0bb136028d77e6ee762a0e53885bbd8e88d4c2404c74b9dcc90efccc97abc6c0ddda7228973dcb26dbc7d37f4bd7157b1b723e8f9
-EBUILD pyelftools-0.24.ebuild 870 BLAKE2B b52fa33aa53c4a9434a2b2ee31657b80b28c2179dd420033d800bcd5c37f1aa007b3ab6c116c1441cd37e4bf7e8a7c84789e5c5fa887c8a9dc1b98beb4331b88 SHA512 e605ac84aa0cace233758370632f7a6bf0ae39e6a897989e45d76400f735a9dc451efd3d9f18b0d1254265483620241f608968e7583579ae6d7ed19d97a179fa
+EBUILD pyelftools-0.24.ebuild 871 BLAKE2B 309206bfca7c1adc71580bd6ce99a1055d7aa7d1ac0105fa93381d4940b79d8ac8c3231aecbedb364fcb3d2c127fda7a59d8d097f3b67d24bfdbeb17e4005091 SHA512 56b5df5eb263ecb5227a32c798d5fc8c81b60be7c51cd0219071caba028047e800c413aacc6e50a776af02c662368dab5106af739ba46297d20cb232bf6b3485
 EBUILD pyelftools-0.25.ebuild 889 BLAKE2B e40f6d9226597cd0b9c07eedce8c0d9b94815017b3a929af87c7589cc8a3af755d6281c3898a429c43e6a8c5ac535743591889f8188ef0e950985b882804b62c SHA512 9dae901bf85378568ca6a09e432f4b6e6e6daa4652fe5be69340724c8eaf1a1d7637f25f44d3693ccd0b27066f23d22db82c3e99c2439bcb9d2d12614fb560cb
 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 a82f2882ad5f..1ffab9c40321 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_test() {
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 88037e3d44ab..609fbe4f5821 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,7 @@
 DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
 DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-EBUILD pyenchant-1.6.6.ebuild 770 BLAKE2B 3497b828044fba68e539cbc1b5a4abfbe0ed6e2bf61337102b01bbb93771243b27de7cf4444198d4140cde91fc538c76efe89bb873421c22e80668241826d7a2 SHA512 a6de324154cef7c602e5055f73b73d3f577c0228e1d4d487814bb5ef098e17af749965e23bf88420014ed73922c8d0e38da54a76ee98898d055cb8a867a83250
-EBUILD pyenchant-1.6.8.ebuild 771 BLAKE2B 8b109760d1cc3febfda270343472656d13640ec8b5eeee7d2d7c5b06326c8064cb9e3a986ba888e772ac3ca16f0e939aab3b256d12c61d5f633d9cc609c047ef SHA512 be271c20fd38bcace1e9465e0df6d0d8b2984fb4d21f4fb570539b5af372dd6ea6f5bd41b10d35ad33c3cf00b3777dc1d86645bc8ecbe955e39b6918e18df0f0
-EBUILD pyenchant-2.0.0.ebuild 931 BLAKE2B 8ec545d98f7c1c9bc66c6bd857c6ccc861fa26f3d5f7136714447d46075511b82b38e2c8930508d4f8d60a86a5c1359b5e06cd79a1170414000213c6e66a857e SHA512 ae1cc94d011dfd87a5e0e18cfdd68486a54554adf340050041568d4a7a47f27bc477134753be21440ed89dc6356d42a68ca58da51b899b92b956665ac8902384
+EBUILD pyenchant-1.6.6.ebuild 772 BLAKE2B d41f07dcc460be3a1c064fa458688992e996a09f490f8b764dfbe897fc09b44a08c9ba09a1d4e433792a030872e71df27218634be447b502abb2becd26034781 SHA512 392947e1241988fed602d8270e54066cc8317e8e347c35c388d6510cd1ba0cc66db3df38c89de04e3d7c232225b56e8a1d4dd1aedb7d36b5379751fb09a1ca6d
+EBUILD pyenchant-1.6.8.ebuild 773 BLAKE2B 8d9ec7afec4cecf52f9d9256be3b9e7b3d5bdb6da429923bf4e756efe770721e52529a5ad8dbe9bdb823e862ae9be80ef257088ed68da9f25d68c455549b8cc9 SHA512 607a8b9ac521804a9f4889599e7fc042d9f5b5ba1a6acb7672a45651f722206531aa14b0128a68d2ad3bf37db92036146510377c57be1042964dd42296a88ea0
+EBUILD pyenchant-2.0.0.ebuild 933 BLAKE2B 46fbf644373d70c48290c868ecd01a4f95c1cac45cf71752c03ff7ae09a9e4fd80fcb8136d7a405f46e8393466eb7ce6fcfddbd6df4e031d7ff9cf53315a1b03 SHA512 a75a72cd333e7122bdb37538b09edfb49234afaf98c81a203315314c03c0539bbb1ada9db5d48a2ebe959acac1a53ab6037c005dfbd22687973f198a4d090a68
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index f1b8c3a1c833..a4f971093a10 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-text/enchant-${PV%.*}"
+RDEPEND=">=app-text/enchant-${PV%.*}:0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"
 
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
index b2fcac14d9a2..5deb7e2e9c55 100644
--- a/dev-python/pyenchant/pyenchant-1.6.8.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-text/enchant-${PV%.*}"
+RDEPEND=">=app-text/enchant-${PV%.*}:0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )"
 
diff --git a/dev-python/pyenchant/pyenchant-2.0.0.ebuild b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
index aea7fc5f686c..65263239f7e4 100644
--- a/dev-python/pyenchant/pyenchant-2.0.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-text/enchant"
+RDEPEND="app-text/enchant:0"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 0502e160f1e1..c565df3e7a00 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,12 +1,8 @@
-AUX pyfakefs-3.3-sandbox-tests.patch 1277 BLAKE2B 2ba11e2b2f5160dda4876b62723b965a6a38c8a96b8f56eaaa964a7ec038f61f3410a3a4c968bc06fa5f2e5468cad20a7d210d4288d328a9f4ae937e3cb50c5c SHA512 1ff58be274dc1380763149169b903ac10847a1b258191d3f0a3b90d0d45b169f9cd858396704d1410658cc32d9fd17cdbeafdcd34dce169d512dd7edbe9b83c3
-AUX pyfakefs-3.4.1-tests.patch 1734 BLAKE2B 3461bbbae5ebbcd4e349434d8fe429ef16b9ef21ab5f915d499f9bbc695cc5c71b17278c8843fab03a99a5cc7af1e28a02600dfe462e66e513fe9c8e25268de1 SHA512 752fe84adcb017efa523a746b82a70af41873017f3d5e6496900dfbaee09ede04a4b95a8928032d5e8305766953b69214a0b6660ee61baa18be58b93f0111c0c
 AUX pyfakefs-3.4.3-tests.patch 1725 BLAKE2B d2db35dd471ea803a9ddc65ad458cb3b17e74a406391e2658ea61ae14e566f3a5ad107119ad72934790a930c4d19b775fc9149b2638b6d2fa0872e8462457ce8 SHA512 7a62c91f9eef2a505287a075f45838b722979f11c85a30cea9e695037bf396d977daab95817603c65e695b83532e3a73eacbcf7bf3928f12cae1fa1269935744
-DIST pyfakefs-3.3.tar.gz 141704 BLAKE2B f805146024d9886ce6cb25b23f6f818bb37cac00a51528375b3da3e728515cb5ffd292352888861ff2b434ff71dd730bfbd84874fee0ae1f4d2cfca974f73771 SHA512 0044643964a4f2329d777476940b38d2d63c6de8f854992b4fba7b7e49f1186e7ce9811f83c9870655cbe33b7dda816c1aa1ce685e800e55c06d175c281748b7
-DIST pyfakefs-3.4.1.tar.gz 151662 BLAKE2B cbfdd7ab4c2936d484b5ff1e22852438c5c653e8875b7d363324e0a1aed0bfc5c492c2cd5c64a47052fcb4d043f567819f32067527b870ab42da8cfd92d40be3 SHA512 1be0254455f6046f1d28bf4377d17e0fb943b4b0db09e933c114f587f3d917877b23ee1610cf83a6330b406bb9ae66fe79dea31a6bf75c0b9c2b79a88d07e753
 DIST pyfakefs-3.4.3.tar.gz 156896 BLAKE2B 2450cb67dbb25d2029a113dd95c3d51e60ef66c6683a5898ea73800ce1269d628af9f8daa85195d5b473f18b7c3262f2f26fc9c17caf80ce2f5159c247ebea5b SHA512 aafcad5d801f625273239221c56e46229ff8ab622cfb474d92f8555cfff90279ad9a092c20878279454c59033ad23d53cfe877023ac5d20c5a67a610b62ba7f1
 DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce830583d263dcecc6f007e6cdeb8a8eefcc4f9eecfba4a9b5b485508749f6dc75a47ff67bc8f5e77f2c0abae2cdd1778 SHA512 e72042dc80545d4a8602bf90bc832298184040389c8fd182df1ef33712061b4937623ca98d70e59b4a388677626f861ff096de939b5caa372849ee10fc3dd8bb
-EBUILD pyfakefs-3.3.ebuild 706 BLAKE2B 194f957a15cd50e054ae98c08d9408452cbe2ca9ec5a545f2fd4ea7cc501677e1e18ac0792befc7c84c2f82d893649bcc4fc89b84d594dcf558944aafd949d72 SHA512 8cef48aec6f558ab513aa84560e5a68f36e3787a7d0a7251da75609468e481a44677427b24400a8ff23ffc531b46b5655df25fe3a7faec13b1eba1449796f426
-EBUILD pyfakefs-3.4.1.ebuild 709 BLAKE2B 2a46a3ae89a1ba39e7e336ae049a4059d4fd79e3eea344d00fa4abe228d468c1f754e704cbe5ddfe205285370c465b561186ff3480d6ebb589b0265e2f4cb231 SHA512 de026d62f12362235f25bb88c9aba62ef3fa563d670a95ee3853ae7fa781f3c5ccf66c858bfb09ded699e34f7b68f61995a0a70bac91b7272f63797b5a1f92b4
+DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
 EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
 EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
+EBUILD pyfakefs-3.7.1.ebuild 854 BLAKE2B e05fabf45881167b7e0cd089886ce68db5070f8fa94226f660d365171017043c54ed7263104ea3fb294f1a66de756189641479e9674639066443412912a69a75 SHA512 bf55d3ad92243f8d9143664e30b72ca455fd66c15c0e8bb5cb914f8a385a0eab21b0e23aeeea5593dfda727fc908ea83c177aa3deadb8dc6c74d83fc8c9edd56
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch
deleted file mode 100644
index 58f24fc89bb0..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.3-sandbox-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix sandbox issues with non-existent file tests.
-
---- pyfakefs-3.3/fake_filesystem_test.py
-+++ pyfakefs-3.3/fake_filesystem_test.py
-@@ -1418,7 +1418,6 @@
-         self.os.chdir(directory)
-         self.assertRaisesOSError(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assertRaisesOSError(errno.ENOENT, self.os.remove, '/plugh')
- 
-     def testRemoveDirLinux(self):
-         self.checkLinuxOnly()
-@@ -2811,8 +2810,8 @@
-         # trying to create a link from a non-existent file should fail
-         self.skipIfSymlinkNotSupported()
-         self.assertRaisesOSError(errno.ENOENT,
--                                 self.os.link, '/nonexistent_source',
--                                 '/link_dest')
-+                                 self.os.link, 'nonexistent_source',
-+                                 'link_dest')
- 
-     def testLinkDelete(self):
-         self.skipIfSymlinkNotSupported()
-@@ -3158,7 +3157,6 @@
-         self.os.chdir(directory)
-         self.assertRaisesOSError(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assertRaisesOSError(errno.ENOENT, self.os.remove, '/Plugh')
- 
-     def testRemoveDirMacOs(self):
-         self.checkMacOsOnly()
diff --git a/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch b/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
deleted file mode 100644
index d893a3adcb7a..000000000000
--- a/dev-python/pyfakefs/files/pyfakefs-3.4.1-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Drop checks that fail due to sandboxing and skip failing tell check.
-
---- pyfakefs-3.4.1/tests/fake_os_test.py
-+++ pyfakefs-3.4.1/tests/fake_os_test.py
-@@ -449,7 +449,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/plugh')
- 
-     def test_remove_dir_linux(self):
-         self.check_linux_only()
-@@ -963,6 +962,8 @@
-             self.assertEqual(b'\0\0abcde', f.read())
- 
-     def test_append_mode_tell_linux_windows(self):
-+        # skipping real fs test - python2 on the actual filesystem is also 7
-+        self.skip_real_fs()
-         self.check_linux_and_windows()
-         tell_result = 5 if self.is_python2 else 7
-         self.check_append_mode_tell_after_truncate(tell_result)
-@@ -1885,8 +1886,8 @@
-         # trying to create a link from a non-existent file should fail
-         self.skip_if_symlink_not_supported()
-         self.assert_raises_os_error(errno.ENOENT,
--                                    self.os.link, '/nonexistent_source',
--                                    '/link_dest')
-+                                    self.os.link, 'nonexistent_source',
-+                                    'link_dest')
- 
-     def test_link_delete(self):
-         self.skip_if_symlink_not_supported()
-@@ -2233,7 +2234,6 @@
-         self.os.chdir(directory)
-         self.assert_raises_os_error(dir_error, self.os.remove, dir_path)
-         self.assertTrue(self.os.path.exists(dir_path))
--        self.assert_raises_os_error(errno.ENOENT, self.os.remove, '/Plugh')
- 
-     def test_remove_dir_mac_os(self):
-         self.check_macos_only()
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
deleted file mode 100644
index c4d151cc93a6..000000000000
--- a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
-SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	"${PYTHON}" tests/all_tests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pyfakefs/pyfakefs-3.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index 0305b6844914..b611cb0e0d0c 100644
--- a/dev-python/pyfakefs/pyfakefs-3.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
@@ -13,14 +15,15 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${P}-sandbox-tests.patch )
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	"${PYTHON}" all_tests.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index f6eff1023450..ae01b1594563 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,16 +1,7 @@
-AUX 1.0.0-fix-pypy-tests.patch 9242 BLAKE2B 3a3c015dab48d3c671189ad656b6f208812b4ffa8805d9a27d581167c1b36ff0cc6219e0ed6688c21d8ec25d247b3c6fa7cbe92d06889b60eca1bd7e40c148af SHA512 4772c32ea90e163030953f3ade2bd2434a10cf0e3c9234f4acaf596a44a812581ba92ef1498998566a7bf78e1bb8c7051260ebf8aca4ca2cd3a04e21e307bbfc
 AUX pyflakes-2.1.1-py38.patch 1641 BLAKE2B c35e47c00b035d2488d49deab5207be6e539ba1c3683564ad1fea75b91e4d0e73a599a3ffcc9bcc7dca12fe7675e6e47c7e94fa2848d352c7be3639b07322efa SHA512 2605bf1c8f28eed285208219b3dd9816ae207ced87458c0f294ea6b3cb2e2a1f960fad257d3813b5e6dbfa07712644d5b38b28924340f34d3a8d701b09862222
 AUX pyflakes-2.1.1-tests.patch 7973 BLAKE2B d0b6663e9bb17e301e78104c08440a9bc7493e6cc2de56e73677c865d34b6bfcda39d2565414e6cd984a181c27cf7540e5de1ca9327103c03589f154d5bb4a3b SHA512 d4360525526ad0de395900aa4f986c03091ab06d77a3fe6ab92d4650e10a2a24accc5d77c1acb4800e095db5ed663d3ab13715c5433368c334891cee1b44dcc6
-DIST pyflakes-0.8.1.tar.gz 32981 BLAKE2B a4d02202e5cc9e1174d9296834edae7bc2c3d66e0081979438ceaa80dab9dcf41710b23015f8fcabea062d7dbb249ffc7521657d0860fd115cf58b441721b778 SHA512 b9843637891f3e82a8430121395ceb4ec5df48b5ba73b96a307ebcb4a393e8cebee1681e094ee1f71a85b58bd2f32562b78fbd61d3fa85634f3ac448b1244637
-DIST pyflakes-1.0.0.tar.gz 35365 BLAKE2B 7b0f676fcb1f77f85a4fa85f02dd26f181f7d8085ef3226cd06b3f1d33b9b235384c7da835b07b8128ac5ba56e8b5e4f0cb5736b25e18bd50c76c6ace9491368 SHA512 89a9ee2e5be87d32d5c259c0cb88bbeadb96d27a3bc5eb3cf6f86afa51907ea01107a5336decbf003679b7de65ed9a16d7fbf55a457e0c9bbb1b53500f719bcb
-DIST pyflakes-1.2.3.tar.gz 44776 BLAKE2B 9effec80b58ebac140a6a8b2f5f31a32c4fdf9e842d3fbd2858a3e74f33920925f10b6377300d962d1e2b1931efe8bb5318b97ef51c99aeb003a3434d08810db SHA512 e0b49b4cd388b39c4f4f5ab836520cfc2ee940ce24de084fbeca0a2f13beca23b3ca89741e297a6f450d211ec27ebd91a7d23a80105e50d14960a3888d7693f2
 DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf8d1fafc97e48e003f529f8c16ae8dca444c9122fc5c50618fec7120b2f2b2e6682e1d86e502ab49096cb42bfc SHA512 7e9c2aad6ebed638a1354cef51c7e1f68b25e59f8caf4694997a9afecd7cd8baa629a9363297ac0d961430f007fd22dcae7dae1bcbd7838a3b5d4285063bc7c5
-DIST pyflakes-2.0.0.tar.gz 49002 BLAKE2B 146d1108b7cf9aca3316d33ad2ac3a0d1627af525b5def8c6140787fb4d1f47bb45c3c9ec9cb755e51e7ca4e947346e5e9de9b4a1b461389ff1bc4521371a684 SHA512 4961ebb8372f51783416681e79342d6be94318ecd007190e5c27f46c48f8f163c7a5f49cbe3025789ff1d9cd37c465b2f3baa219059779163545f9828a766f71
 DIST pyflakes-2.1.1.tar.gz 58072 BLAKE2B 68dccddae2a9dc77f2d1f1251c80e2552935281b6b79e55fd2a0805cb30bf5e1c227b60a7e1f55f5f92ac42dfd18a69eb0b76ce06f43ac1c48dde3921817a271 SHA512 7ebf5843b38146305c1063e070480fea8ec3b47fa1be546b1fafaeb242a688a5a001f978e7257fd71d5905b9a338b466ef17c7330725191587e9c40ba632c3f8
-EBUILD pyflakes-0.8.1.ebuild 723 BLAKE2B c76a63f2a3ffd1d3f31630654eed0dfd61aa810bd5751e618711cc3da169ff7c07fd838a3bd657b4430d384cab4efd6903787479f14028ecf5596de62ec67f8f SHA512 ebff66086a6ac6b38c706e57a5169f7036c3e1f54e843c964e027c286839550d925f9c90f525b1994af803c7b697657bcecf60867edff7a5fcb24faf608ad2d7
-EBUILD pyflakes-1.0.0.ebuild 749 BLAKE2B f958984d002f0864a220c0be3e061dc861da8df470a3149c744307ff9d5066d4943d4049c142740392e11c2f6fbc66a466df27ec639ac8fc140d7e495cd6ee3f SHA512 0b1a16f1574ba46a6881c3ce45d73d18fd71ed17f06499dd23923a66a898c74ac1939da34c4bd24389c688ac6809e545e465287e6ff1af210c81414b828cb2a1
-EBUILD pyflakes-1.2.3.ebuild 687 BLAKE2B 398170cf42a1bb6769c70ce0a9f42b06d8f75483c6950aac587ab96b5da9823d0ff29bb79f551f9b0b0ac1918ffd89d0e2f91676bd460d3d91a9f8083e27cc2e SHA512 ec2698fd7b758375f05f5309d692106b28dec6ca9a9567eb344ddf55e2bc9177933f03f05e529714dd16372abf231df1262671fce160151dc131750d4816df2d
-EBUILD pyflakes-1.6.0.ebuild 683 BLAKE2B 2cddd08ba51ad8ed799b3c287c98ced77cfd968acc0ce1a9abb7c6865fa53d004916966d6cf611eefff8fa9aa1f50e621d299dff52a92cfea2639aa50601f5a1 SHA512 8ff17220266200e27566fade2673d7a5e3f33b05764d5fde21f3aea0b54ba62ab2b0d06ed97d0a608a34a1c65c0fcbf4b79164520bf97810bb02c61a5855c6aa
-EBUILD pyflakes-2.0.0.ebuild 694 BLAKE2B 003ff1926059e9a1188b6956c0dad98cefd6b424c38820f3c43477cb220c806ca46146de9aafbc082a356883b1be4e7e130ae235c1819ede37267e69207caa3a SHA512 531833c4472b54acc1e015e8ef436d86482c4ceac02275b87212cc0136dcd96084dbe6151183d7935bfcb2ab6502db40b5517a3e65be0968cbf01454b1b34530
-EBUILD pyflakes-2.1.1.ebuild 784 BLAKE2B bf617b688658c5cfb873b1f1219c245a767313a769fa880294d12a22a1cf287ea1dc8cad2be8501d896dc0ecdbc0514f6de8236aa4b04a7c3afc64f87472cfc4 SHA512 6ecafba562c6cb85a2ba40568416f9e71a8baf773657eef59d8a6a3c4ea71078358e0b5f1034fc24daa6189234f1dee9c62159d4ebec0b936262c19f9902c706
+EBUILD pyflakes-1.6.0.ebuild 684 BLAKE2B 45ef9908c5a7c2888cf182ff6250a10bedfb654df7646665609072cbdb10c67833e7a439d4c844ee3992ef11e00644f724542365b2c75386e485df50bb0a6b9b SHA512 d74b2c54b4944ce54d733691cc8d5e52eeb7e6b98a193503d8914d8ce2978120b289f7d28f7b5b47e51f7afd136bcaa0f6207a0c8ba91348315686a8fdd901a8
+EBUILD pyflakes-2.1.1.ebuild 783 BLAKE2B c73ff7ead894de61ad039c3ffc832dabc2e9aa927d94234adcf9918eae4606e0c35dddc028a7cb054c4ff09cdb6f498fd4b9aa42198412ddb168cf4c3c3e0906 SHA512 5ab721bd10c6b007a263ed587f6df2a12de166452f343beb50a7d9a2fd9c76f41d735cecaa49ad05d86d8739acc5112c06908e375f6aa38257b41047a1d97e15
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch b/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
deleted file mode 100644
index 41d1fa8ca86d..000000000000
--- a/dev-python/pyflakes/files/1.0.0-fix-pypy-tests.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-#https://github.com/jayvdb/pyflakes/commit/3088ffbd6256521e0213b361bc2294c1e218e6fb
-diff --git a/pyflakes/api.py b/pyflakes/api.py  #index 3bc2330..2a46a0d 100644
---- a/pyflakes/api.py
-+++ b/pyflakes/api.py
-@@ -41,6 +41,18 @@ def check(codeString, filename, reporter=None):
-
-         (lineno, offset, text) = value.lineno, value.offset, value.text
- 
-+        if checker.PYPY:
-+            if text is None:
-+                lines = codeString.splitlines()
-+                if len(lines) >= lineno:
-+                    text = lines[lineno - 1]
-+                    if sys.version_info >= (3, ) and isinstance(text, bytes):
-+                        try:
-+                            text = text.decode('ascii')
-+                        except UnicodeDecodeError:
-+                            text = None
-+            offset -= 1
-+
-         # If there's an encoding problem with the file, the text is None.
-         if text is None:
-             # Avoid using msg, since for the only known case, it contains a
-diff --git a/pyflakes/checker.py b/pyflakes/checker.py
-index 753fa9b..f538d3f 100644
---- a/pyflakes/checker.py
-+++ b/pyflakes/checker.py
-@@ -11,6 +11,12 @@
- PY2 = sys.version_info < (3, 0)
- PY32 = sys.version_info < (3, 3)    # Python 2.5 to 3.2
- PY33 = sys.version_info < (3, 4)    # Python 2.5 to 3.3
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
- builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
- 
- try:
-@@ -594,8 +600,13 @@ def getDocstring(self, node):
-             node = node.value
-         if not isinstance(node, ast.Str):
-             return (None, None)
--        # Computed incorrectly if the docstring has backslash
--        doctest_lineno = node.lineno - node.s.count('\n') - 1
-+
-+        if PYPY:
-+            doctest_lineno = node.lineno - 1
-+        else:
-+            # Computed incorrectly if the docstring has backslash
-+            doctest_lineno = node.lineno - node.s.count('\n') - 1
-+
-         return (node.s, doctest_lineno)
- 
-     def handleNode(self, node, parent):
-@@ -642,6 +653,8 @@ def handleDoctests(self, node):
-                 tree = compile(example.source, "<doctest>", "exec", ast.PyCF_ONLY_AST)
-             except SyntaxError:
-                 e = sys.exc_info()[1]
-+                if PYPY:
-+                    e.offset += 1
-                 position = (node_lineno + example.lineno + e.lineno,
-                             example.indent + 4 + (e.offset or 0))
-                 self.report(messages.DoctestSyntaxError, node, position)
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index 34a59bc..d2a5036 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -23,6 +23,14 @@
-     from io import StringIO
-     unichr = chr
- 
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
-+ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY
-+
- 
- def withStderrTo(stderr, f, *args, **kwargs):
-     """
-@@ -312,18 +320,25 @@ def evaluate(source):
-             evaluate(source)
-         except SyntaxError:
-             e = sys.exc_info()[1]
--            self.assertTrue(e.text.count('\n') > 1)
-+            if not PYPY:
-+                self.assertTrue(e.text.count('\n') > 1)
-         else:
-             self.fail()
- 
-         sourcePath = self.makeTempFile(source)
-+
-+        if PYPY:
-+            message = 'EOF while scanning triple-quoted string literal'
-+        else:
-+            message = 'invalid syntax'
-+
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
--%s:8:11: invalid syntax
-+%s:8:11: %s
-     '''quux'''
-           ^
--""" % (sourcePath,)])
-+""" % (sourcePath, message)])
- 
-     def test_eofSyntaxError(self):
-         """
-@@ -331,13 +346,22 @@ def test_eofSyntaxError(self):
-         syntax error reflects the cause for the syntax error.
-         """
-         sourcePath = self.makeTempFile("def foo(")
--        self.assertHasErrors(
--            sourcePath,
--            ["""\
-+        if PYPY:
-+            result = """\
-+%s:1:7: parenthesis is never closed
-+def foo(
-+      ^
-+""" % (sourcePath,)
-+        else:
-+            result = """\
- %s:1:9: unexpected EOF while parsing
- def foo(
-         ^
--""" % (sourcePath,)])
-+""" % (sourcePath,)
-+
-+        self.assertHasErrors(
-+            sourcePath,
-+            [result])
- 
-     def test_eofSyntaxErrorWithTab(self):
-         """
-@@ -345,13 +369,16 @@ def test_eofSyntaxErrorWithTab(self):
-         syntax error reflects the cause for the syntax error.
-         """
-         sourcePath = self.makeTempFile("if True:\n\tfoo =")
-+        column = 5 if PYPY else 7
-+        last_line = '\t   ^' if PYPY else '\t     ^'
-+
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
--%s:2:7: invalid syntax
-+%s:2:%s: invalid syntax
- \tfoo =
--\t     ^
--""" % (sourcePath,)])
-+%s
-+""" % (sourcePath, column, last_line)])
- 
-     def test_nonDefaultFollowsDefaultSyntaxError(self):
-         """
-@@ -364,8 +391,8 @@ def foo(bar=baz, bax):
-     pass
- """
-         sourcePath = self.makeTempFile(source)
--        last_line = '       ^\n' if sys.version_info >= (3, 2) else ''
--        column = '8:' if sys.version_info >= (3, 2) else ''
-+        last_line = '       ^\n' if ERROR_HAS_LAST_LINE else ''
-+        column = '8:' if ERROR_HAS_COL_NUM else ''
-         self.assertHasErrors(
-             sourcePath,
-             ["""\
-@@ -383,8 +410,8 @@ def test_nonKeywordAfterKeywordSyntaxError(self):
- foo(bar=baz, bax)
- """
-         sourcePath = self.makeTempFile(source)
--        last_line = '            ^\n' if sys.version_info >= (3, 2) else ''
--        column = '13:' if sys.version_info >= (3, 2) else ''
-+        last_line = '            ^\n' if ERROR_HAS_LAST_LINE else ''
-+        column = '13:' if ERROR_HAS_COL_NUM or PYPY else ''
- 
-         if sys.version_info >= (3, 5):
-             message = 'positional argument follows keyword argument'
-@@ -407,8 +434,15 @@ def test_invalidEscape(self):
-         sourcePath = self.makeTempFile(r"foo = '\xyz'")
-         if ver < (3,):
-             decoding_error = "%s: problem decoding source\n" % (sourcePath,)
-+        elif PYPY:
-+            # pypy3 only
-+            decoding_error = """\
-+%s:1:6: %s: ('unicodeescape', b'\\\\xyz', 0, 2, 'truncated \\\\xXX escape')
-+foo = '\\xyz'
-+     ^
-+""" % (sourcePath, 'UnicodeDecodeError')
-         else:
--            last_line = '      ^\n' if ver >= (3, 2) else ''
-+            last_line = '      ^\n' if ERROR_HAS_LAST_LINE else ''
-             # Column has been "fixed" since 3.2.4 and 3.3.1
-             col = 1 if ver >= (3, 3, 1) or ((3, 2, 4) <= ver < (3, 3)) else 2
-             decoding_error = """\
-@@ -474,8 +508,21 @@ def test_misencodedFileUTF8(self):
- x = "%s"
- """ % SNOWMAN).encode('utf-8')
-         sourcePath = self.makeTempFile(source)
-+
-+        if PYPY and sys.version_info < (3, ):
-+            message = ('\'ascii\' codec can\'t decode byte 0xe2 '
-+                       'in position 21: ordinal not in range(128)')
-+            result = """\
-+%s:0:0: %s
-+x = "\xe2\x98\x83"
-+        ^\n""" % (sourcePath, message)
-+
-+        else:
-+            message = 'problem decoding source'
-+            result = "%s: problem decoding source\n" % (sourcePath,)
-+
-         self.assertHasErrors(
--            sourcePath, ["%s: problem decoding source\n" % (sourcePath,)])
-+            sourcePath, [result])
- 
-     def test_misencodedFileUTF16(self):
-         """
-diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py
-index f15acb8..6793da9 100644
---- a/pyflakes/test/test_doctests.py
-+++ b/pyflakes/test/test_doctests.py
-@@ -1,3 +1,4 @@
-+import sys
- import textwrap
- 
- from pyflakes import messages as m
-@@ -11,6 +12,12 @@
- from pyflakes.test.test_undefined_names import Test as TestUndefinedNames
- from pyflakes.test.harness import TestCase, skip
- 
-+try:
-+    sys.pypy_version_info
-+    PYPY = True
-+except AttributeError:
-+    PYPY = False
-+
- 
- class _DoctestMixin(object):
- 
-@@ -273,12 +280,22 @@ def doctest_stuff():
-         exc = exceptions[0]
-         self.assertEqual(exc.lineno, 4)
-         self.assertEqual(exc.col, 26)
-+
-+        # PyPy error column offset is 0,
-+        # for the second and third line of the doctest
-+        # i.e. at the beginning of the line
-         exc = exceptions[1]
-         self.assertEqual(exc.lineno, 5)
--        self.assertEqual(exc.col, 16)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 16)
-         exc = exceptions[2]
-         self.assertEqual(exc.lineno, 6)
--        self.assertEqual(exc.col, 18)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 18)
- 
-     def test_indentationErrorInDoctest(self):
-         exc = self.flakes('''
-@@ -289,7 +306,10 @@ def doctest_stuff():
-             """
-         ''', m.DoctestSyntaxError).messages[0]
-         self.assertEqual(exc.lineno, 5)
--        self.assertEqual(exc.col, 16)
-+        if PYPY:
-+            self.assertEqual(exc.col, 13)
-+        else:
-+            self.assertEqual(exc.col, 16)
- 
-     def test_offsetWithMultiLineArgs(self):
-         (exc1, exc2) = self.flakes(
-
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
deleted file mode 100644
index c808c18397a0..000000000000
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS.txt README.rst)
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
deleted file mode 100644
index 6dd529e80c4a..000000000000
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-pypy-tests.patch )
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
deleted file mode 100644
index fe7cf3e932a5..000000000000
--- a/dev-python/pyflakes/pyflakes-1.2.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test --quiet
-}
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index d566ca2cc6d5..876f5a0f54d6 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pyflakes/pyflakes-2.0.0.ebuild b/dev-python/pyflakes/pyflakes-2.0.0.ebuild
deleted file mode 100644
index 896bceee4a86..000000000000
--- a/dev-python/pyflakes/pyflakes-2.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyflakes/pyflakes-2.1.1.ebuild b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
index a2fc6e4a962d..c7b4f8fcfbc9 100644
--- a/dev-python/pyflakes/pyflakes-2.1.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${BDEPEND}"
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 4fbac4f03950..dadfe158782c 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1,3 @@
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
-EBUILD pyftpdlib-1.5.5-r1.ebuild 3096 BLAKE2B d2e90e44db5ab4bcfaad7f39cb6ba8eb4941bda1d954ef1dcf502d6f88facd205721a0ef361e8596dd25d2b2e37e61f095feda29513fe1f2dbbf9b5e48cea40c SHA512 fed1be4d590064ec1a67d8ef9efa654a51f0b2f7bd8f391d7d0bb70041ee8546b1cc9e26c10263a9762cc0688689559c8ec6bed3f95bb8479c6fbdf9044c01a3
+EBUILD pyftpdlib-1.5.5-r1.ebuild 3097 BLAKE2B c25dfee499516bfbd9722b265b834425af6d77ad92a07fbe078094d986727b36e1b1104d1321e4a5e92defb3eecb9706bf2b5ba20ce146a1a75b61a59d6615d0 SHA512 1aa8d876bc2000a4957c45a00528441d47c02539e038221b6124779c79679c92143706ea243629c228c73108aefe6a18239e2d64b89cf2073603196fe2e2013d
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
index 759075bad823..57361cfa884b 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.5-r1.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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 52ad95309610..9049220e1de2 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,3 +1,5 @@
 DIST pyghmi-1.0.22.tar.gz 123267 BLAKE2B 8cfa716d04411dc5228d86cf8813ddb4fb61b7bfeb6618f0182fe42c7ed1deb46e876e085a732d69b3c7390c37a8bc62a3bf15313166574ec98ccefa784b97eb SHA512 9e3bc6b5f33d5496d7e58d2ea558d20d45a7690d493f2d1ad56fdd5570279a38e8934d8425c3d3207d8001da85a9a0b1319463b802fa9f121db7448aa919bddc
-EBUILD pyghmi-1.0.22.ebuild 1243 BLAKE2B d73baf3b88f5846daefdf4381b0adc2825de42ce6f0dfab8c7d98ded4ebe489dc0417606c5a1ba8fc5ffd98663a80da1a9fd44ffbc7661f842684dae4614ed91 SHA512 3ce4d7be91b8b0df06d68718f1b06ba0e693f5e0e391af001c56a6c7ab79b8530924fa9628dbad1b8da241a9282db30b45bc26b197c9b7c66b5e2d7692bd5e39
+DIST pyghmi-1.5.5.tar.gz 195830 BLAKE2B de7acc04e4b33f9a623cbe1afcd0caf869dea3e635df5e7ee1c609ac223cd6bf203735da54b6fe0e9f9a98e2371077f6e2d29dea60112014d58477195e798118 SHA512 9f1e1e0f0cf88c0ff794a29e4116b20dcf5eae141c1eefb6c5b8e3fae948fe6f928cd98dc4b95248c5cddab1cea3b841818e3255ec85c11d5c039dcc2c315cbb
+EBUILD pyghmi-1.0.22-r1.ebuild 1266 BLAKE2B bb7f5c9dc99478bce9e2fc9eea4fdb29f161eff886b94ddac468b2372c1f9fe6d91e07308c6afba6adc755d0b51f130efe9a4eeef59e702385b27fcc33036881 SHA512 43ed93ff7989d9e172d4afa1195118116fdc2fbf8b42de77afc519ec31aa34b542ccdfe8ee00fbbd49e7a163eec5271fac3639bb893c537b6e62cc8e9e517eae
+EBUILD pyghmi-1.5.5.ebuild 1147 BLAKE2B f7af8ac75f98ca2c2d5dbaf9cedd773aef142fdee6f09351a9d1f4b5c93bab1e4fa65f7bece5d83b96f9f9fe7a118090deaea0532ae6b89b68445586d36fb1dd SHA512 f54e5c3f6b2edd3374fc97cfed5828f19d7775838f4be5ecf705e8f91fb757fc537399dcda272aa697a2e6276ccab27f29577b9c2d084e7c32d5bef259d3a188
 MISC metadata.xml 343 BLAKE2B 107a20dca0846a5e4dc8d61825da4193cc7525abad94e161022371ccba00523822c69cf0cae23d13b6f650ec11b98ef4640b5cf18437d60a9a5a6bf37867e9e8 SHA512 cb4c5f58339d6c5f181bb0e9a1aacb4e3c30c5690744e0ee6649e82eece03678246cfe3b13c219e177de8812c6916fe1b6b49443c2dc0a00ed1d024c8858b5c9
diff --git a/dev-python/pyghmi/pyghmi-1.0.22.ebuild b/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
index 39164e26ed17..d825c3250b25 100644
--- a/dev-python/pyghmi/pyghmi-1.0.22.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.0.22-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
 #636824 older versions of cli_helpers break the build
 DEPEND="${RDEPEND}
 	!<dev-python/cli_helpers-1.0.0
@@ -25,7 +24,6 @@ DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.5[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
 		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
@@ -35,6 +33,11 @@ DEPEND="${RDEPEND}
 		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
 	)"
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed '/^pycrypto>=2\.6$/d' -i requirements.txt || die
+}
+
 python_test() {
 	esetup.py testr --coverage || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/pyghmi/pyghmi-1.5.5.ebuild b/dev-python/pyghmi/pyghmi-1.5.5.ebuild
new file mode 100644
index 000000000000..a2085f3c7d12
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	stestr run || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 907aac0c2871..09b7ca96cd5b 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,7 @@
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
-DIST pygit2-1.0.1.tar.gz 501496 BLAKE2B 6a844a6ecab453f589f407acbd94aba46018a46374ba745ef50e72f4a5eda35103873287af7533ec963a297775eb3703151beec36984dfbcb68d751057c46c78 SHA512 c225204129cdfa41bcc50d76ff219602bfe910cdb77e246c49ecf5265b5a88c5c4803a7d107f4e00c4ec2f0b0d30e1a729d15413bdca8575d6ec23bb9420a90d
 DIST pygit2-1.0.2.tar.gz 501736 BLAKE2B c8f1a7e4a3257af42d97b0fae8e14f26968e2be535e74863c97363e77e37774d929fa239bbb46982bd398a3c2032f3b3122bd42aa41760d3827a18b7b0b22663 SHA512 c76bf8ce2847ec8915201a714f076488a0dda4a790762293c02709b8b88a9a2b898f97e61565cf41cd11b10bebe2e1d76b5643ff2e86f9bf6a9517c87a988769
+DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
 EBUILD pygit2-0.28.2.ebuild 904 BLAKE2B d41f74f5516bc0bc7bb1a485493e36250aa76d4a210d2af30189641dde7a703bf111bdfab2ca0d0bd862fde21483682d4ebfdca3f90f79cf96fc2fc35ec867c2 SHA512 3c8bdd32422ac1f140ab2804a96f93e4c43df75e077c6c8a2f22a70bf4acf32290c0a6a97bd62caeca40939775bada4e38cd54eff431f4e8918dd1262e24176d
-EBUILD pygit2-1.0.1.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
 EBUILD pygit2-1.0.2.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
+EBUILD pygit2-1.0.3.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.0.1.ebuild b/dev-python/pygit2/pygit2-1.0.3.ebuild
index 920c961be99e..920c961be99e 100644
--- a/dev-python/pygit2/pygit2-1.0.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.0.3.ebuild
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 07e2619e465e..aa0123482b5f 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -5,8 +5,8 @@ DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cd
 DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
 EBUILD pygments-2.2.0-r1.ebuild 1615 BLAKE2B 768bbce36b21c4bce6dd631bc2a5a0b0255c67f8baa41602f14d21a0bb1cafdc765882cf8d5151d7f18ddb4d34ac989ab67b999c836197d294b1a738d69e8b2d SHA512 203332c057f87b4a885242a2f6b7c1d1578f2c79905bb103b4731e014de76e5caca16b8255286c121e736622c1621764a615d6461e43b7ed038ca0d25596caaf
-EBUILD pygments-2.2.0.ebuild 1766 BLAKE2B 9353b980a7fa969981e9f7a20c3753c7460da5d91b8b6ca2e940181504b06c235010865103231e953e1896dbe01426e30708030b758de84373e3b72755948cf9 SHA512 3f84f6beb408c38358a4c4c661e9835af5efb84db619caeed765b660a0efd85cadadddb4c5cb456e237195ce98dcbb238854213835e48ce1f0d6a725853ff438
-EBUILD pygments-2.3.1.ebuild 1427 BLAKE2B 0cff4825b0d7d763c016a5591e003690dd9e313b0b14ca9d4a742fa4b68778b0902c4069a12edd77c5420a48f3b10d43e0afa731d93d52cbb94284e870affc78 SHA512 835269bf0ca31b6c8fd38a97bdba2814dc4bcccc245276cd76bfd37cf8bc085cab52831f76d76f071e0d38d1f75fa332fc7c1eec0dd071f1dd57979297e23f37
+EBUILD pygments-2.2.0.ebuild 1767 BLAKE2B e4cfb79a3c348196c3afae5629cf9a40769144b58130b42a1ea2c42ceae9fd5dc9ac3a886c25f520961ae906222776995d76f36159986fe014773c87971541ba SHA512 611575173b2b7e932f273368d9a30854328f5c08905b91ae19220af58df56b645ab29381e42c6b3e69585b148ed2859c86e3fc54c5170fe82015d70b1479cdc2
+EBUILD pygments-2.3.1.ebuild 1428 BLAKE2B a266ed307506d6863aa0f0f759d448721bbdab8f159b6c6e765e0b435bd424b167215d2bb848bed19964bf5577eba29d8a0c07c940b4d31968865478f6d021a3 SHA512 b06dd64b3eafe026004dc2dab8f8806bac397642a9aa171444a8deeac1f1edfd3b180dee5ec6f7bdb044b47ca4c212abb204119760500320693dd32184c01f6c
 EBUILD pygments-2.4.2.ebuild 1157 BLAKE2B b3d1df915fa7a56074bea2bd51430fa1b1e6ba9a837e4573ac2c5f5e6dbb2d4c2d5823525b0d1dfd7ec98ba3a8b4b4169fa1f4dc882b866fa8aeb1dcc00ae842 SHA512 e82fd0d04cf54e193d7d3d4afcaf14a9bdce89e2500ac809866b2893efa164facc041ede9c54b8b1154462034555dcb102bcbb51bcc21ea8a5c393d8c9737616
 EBUILD pygments-2.5.2.ebuild 1139 BLAKE2B c0b3deecb13b5a0e5aa4d0847a5414eb4643aba959b162a7a3417b3357105ffb6537eb735050715bc7fa250e272b0887f811b196fd19cdf2df36cf6bd6ebcf0e SHA512 5297a48b0d2ce337ca8f2e201ff446b588c00b81233ad0f814e2b3b516df4471d4cedbf45334c0c465a65129267a205bd9235a7836269c9a4ac45b308f239848
 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 b1c137b172be..b9217c8d5c31 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 89303b821fc2..24361968ca75 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.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 ~riscv s390 sh sparc x86 ~x64-cygwin ~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 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 23050d67dcc4..9663cf21e4f3 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -8,6 +8,8 @@ AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
-EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B d6d227ec9cf7d2797de5986fdf88ce2311dea6412abb0b67390f387aeaad6179a4c0d4c81d29b83204e668ea7f7432cdc20627c55179b341a56697b0d1bea6dd SHA512 cc3f51e95721b0d7d6b9f188dc6f648e6f325037f2eb902c563be92a88aafc3a73d493e566020e59bca979f5468cf3ba177bc0a4ef66dda58497830259efa9f8
-EBUILD pygobject-3.32.1.ebuild 1775 BLAKE2B 32c55680370a5789a73cd3cec4008e890f11c71cd9452bad8cb63da1a1187722490116d98942e08bc36c0f46c1b34206b9b8d9443eda9a6ec54d3330d7aa4127 SHA512 fd8e8fe1f8b0ae21d286eb61d9d1802422c656e5f340714770f1e9be2549527a1f42bd95bbfb4493dcffbeccb4e00bc55781429f9e9f82e17230a703991e5dd0
+DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
+EBUILD pygobject-2.28.6-r55.ebuild 3542 BLAKE2B 534eafe4cbd21c550b60ffac41dd01a155b504cd33afb0bcf31052c9b113ec5583780c0b979618940aaec715540345a761e6522e061a0cf0493ef666a6e7a7e1 SHA512 d61bd1ae6bf86a53831a5f795370e6adc8c6276cb050bcc6247b953d622636df5cff512a92ae850d3ac4753d139eaee771020cb664fc51483f32d2a934978159
+EBUILD pygobject-3.32.1.ebuild 1776 BLAKE2B 56469675d852c953f726b4f2a449f710eb4459536c1148c55b142b6e4cae37fd74da75eb24b0608c42b684fb0ee9a7d4eabb6c34cc18e23db3ab6474677235bd SHA512 c282e29f7a24e563c0b2fe6580762c663782cbb137bd665c457bf8096b5d1492031bdd8dc377ca20d3c98dc558060f4584ace8e55a56c2d6e54be955e11133e7
+EBUILD pygobject-3.34.0.ebuild 1778 BLAKE2B 89ec5e3f8d2fc869554998d5e89889ad58e61c43b78907c5ab07d472d371aaf1bb698a443e3685210c57d6823eeb3dc02f12b3db68bda4aa306f8a673c23616f SHA512 ff4202b2d9eb30f3cee9433a0f25e379a64cb0570eac0b29121dd9406927c5b745fe70cdfdb077ac1437d8dec1645276b285e569c90e9127756fef1d77905e87
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
index b816713167bf..35c389e27290 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples libffi test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index 9dc9cab0b0bb..e146b2002947 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
new file mode 100644
index 000000000000..ddac6151afb8
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.34.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/gobject-introspection-1.54:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_use cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 469807fd82c2..3165107cc7df 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,12 +1,4 @@
-AUX pygraphviz-1.0-setup.py.patch 1215 BLAKE2B 6b680df9adc31aba21d98cc745258279d96822fb635e56c0ea6043b34dc5ee6c97042f070a77331c8bf0a8185b75441464eef4cf67b8e5aa2a5d530bbf0a43dc SHA512 176497d1e61ee74b6ca576b322ec47eccfb67d2fa1341c7f0f857ecc32ccd16660262abe46a90871ee4cba60587670d8b479bfd60944ac0de32b13f4aab4846c
-AUX pygraphviz-1.2-avoid_tests.patch 1620 BLAKE2B 8d7b5c81eec0f06d5dbe103429da92249ad751d354981a79f83d0c714230e3e4f687f9822de2cbca6eee29ec5d597b456cfc019baf5b819fda09c69966de6dd5 SHA512 74c161dbeb69ad2b9f381428b6cc0e0d8411d95b121fb16eb0f1e45344a52c2dafc2bf06cac8a6be8152fb1592bd55bf001da85e4e53ed82bec39f61c7d329f2
-AUX pygraphviz-1.3.1-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
-AUX pygraphviz-1.3.1-swig-3.patch 790 BLAKE2B 5cedc7992e890a5901bb83486fe5f2a2d470f71c35fd2bedb02e7396ee708d5e4e0aa608b4756a9fb4e185efd1ef9ccb5c69340e7a43b90dd866568dcf2bd2be SHA512 37a5689360aa786a94bd3bbad98bca4bf5f3a61eb2dc54de1c4bec3b6ec677e4f99a817b896687e2506386becc67f5e31308a30ceaedd388e57693ae9e8de2d4
 AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a7ec6db0e8cea9260e8cd4960ab5aeff52ebf81b2bf5dd94be5a0f87b7c10c92cbfc720046f6705e478082b18a5 SHA512 003ed3275771998a40c162abfc61ebf78cb149b20b2b4c770725459364e08a5afb33fe39b00e2e662706a40c3a91033d9e0aead66a7cd627b3b0b2ceba5a62d2
-DIST pygraphviz-1.2.tar.gz 90913 BLAKE2B 2031b3d1366ce038fc10a1ed632bae9ae67789eae1c45e9e9eb418cf8e5729d47baed96508f52e962aa0138a1fa6231a50bbba2049435f4af959ef467eaa7454 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3
-DIST pygraphviz-1.3.1.tar.gz 103336 BLAKE2B 267c85ca4639a2f0ad8c06d36eaa1f2026c6afafe357be23ea4c108b7953aedac2f397bf262a68f336385a5810d77bec9d200bf86da3d101b4d402dcc2d77e1f SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
-EBUILD pygraphviz-1.2.ebuild 981 BLAKE2B ec7393d162ecf32e423ed08b8464e1caf99d91dca43d7ffab048b25f9fe870441d32dd72849e89fd414320e32a9e8286ba44d7136eb8cb3e8e74ce5b4aabac03 SHA512 1e30090835e51b5bf59c8e26d2bf657b248a242b302a7f46ce5df8663fd38253588c2cd0e4850fc2b0e87ccad1090e321921fafa3c98dd6f1ed5ca67a6117c1a
-EBUILD pygraphviz-1.3.1.ebuild 1119 BLAKE2B 6109e31df0d0b5d8bf73fb91b0afa846c9f498d5e9c5fbc982a5588da31a963c8517509cf7070c9985417f143c9c276a5bc5763f2f84741e6231e0f6b9c9ee49 SHA512 215caa815030f4ed8dd54c988bcfd7811f76501b186285d5b0d44bfcd55cbe3010ea66124e928758cd15a4d897b4412e8292b6a0aaaaa5fd92663f559502a0a9
-EBUILD pygraphviz-1.5.ebuild 1088 BLAKE2B 3f777db42953967a94235b43ef9c2d307856b8ece61a6294070980dc8f7e7c2387993e2b95eaf11416dbc07722378639d6fc07366fb69f5bdd1ec16e25144e57 SHA512 6dfecdcc034426d1a32c72788dd19fb49f050677510d65029005814198ce0c557970ab81a9d6ec24982418f5579daa99a43df3344a48415996f4bed0e53f43e8
+EBUILD pygraphviz-1.5.ebuild 1078 BLAKE2B 133a5338a68859472e4bd0dac9dc2e51477a8740ba0f714b49132d6bf61f9fc98ceea743ee21bddb256bd8e2aa22aacad948d82e78c3697d7e7ea2e9fdddf5ff SHA512 f41fe9490f3c080b4d651e47b8bbc84a349b80b3ef72cf6e9ddb7b2251a5c778cb37f24f10d083f9a209d888d891e2256982d422f30a49447ead9cd6debdb5c1
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch b/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
deleted file mode 100644
index 13eb0f213ce1..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.0-setup.py.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- setup_egg.py
-+++ setup_egg.py
-@@ -46,7 +46,6 @@
-         download_url     = release.download_url,
-         classifiers      = release.classifiers,
-         packages         = packages,
--        data_files       = data,
-         ext_modules      = extension,
-         package_data     = package_data,
-         install_requires=['setuptools'],
---- setup.py
-+++ setup.py
-@@ -98,12 +98,6 @@
- sys.path.pop(0)
- 
- packages = ["pygraphviz","pygraphviz.tests"]
--docdirbase  = 'share/doc/pygraphviz-%s' % release.version
--data = [(docdirbase, glob("*.txt")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),
--        (os.path.join(docdirbase, 'examples'),glob("examples/*.dat.gz")),
--        ]
- extension = [Extension("pygraphviz._graphviz",
-                       ["pygraphviz/graphviz_wrap.c"],
-                       include_dirs=include_dirs,
-@@ -130,7 +124,6 @@
-         download_url     = release.download_url,
-         classifiers      = release.classifiers,
-         packages         = packages,
--        data_files       = data,
-         ext_modules      = extension,
-         package_data     = package_data
-       )
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
deleted file mode 100644
index d444ee3d2df7..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
- pygraphviz/__init__.py |  2 --
- pygraphviz/agraph.py   | 25 -------------------------
- 2 files changed, 27 deletions(-)
-
-diff --git a/pygraphviz/__init__.py b/pygraphviz/__init__.py
-index a807801..33f727e 100644
---- a/pygraphviz/__init__.py
-+++ b/pygraphviz/__init__.py
-@@ -68,5 +68,3 @@ def version():
-     neato=_get_prog('neato')
-     os.system(neato+' -V')
- 
--# import tests: run as pygraphviz.test()
--from tests import run as test
-diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
-index c9f735b..90a661e 100644
---- a/pygraphviz/agraph.py
-+++ b/pygraphviz/agraph.py
-@@ -1771,28 +1771,3 @@ class ItemAttribute(Attribute):
-                        value.decode(self.encoding))
-             except KeyError: # gv.agxget returned KeyError, skip
-                 continue
--
--
--
--def _test_suite():
--    import doctest
--    suite = doctest.DocFileSuite('tests/graph.txt',
--                                 'tests/attributes.txt',
--                                 'tests/layout_draw.txt',
--                                 'tests/subgraph.txt',
--                                 package='pygraphviz')
--    doctest.testmod() # test docstrings in module
--    return suite
--
--
--if __name__ == "__main__":
--    import os
--    import sys
--    import unittest
--    if sys.version_info[:2] < (2, 4):
--        print "Python version 2.4 or later required for tests (%d.%d detected)." %  sys.version_info[:2]
--        sys.exit(-1)
--    # directory of package (relative to this)
--    nxbase=sys.path[0]+os.sep+os.pardir
--    sys.path.insert(0,nxbase) # prepend to search path
--    unittest.TextTestRunner().run(_test_suite())
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
deleted file mode 100644
index aed5c9075b88..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- setup.py | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index fc0a96f..98b7f58 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,13 +36,6 @@ release.write_versionfile()
- sys.path.pop(0)
- 
- packages = ["pygraphviz", "pygraphviz.tests"]
--docdirbase = 'share/doc/pygraphviz-%s' % release.version
--data = [
--    (docdirbase, glob("*.txt")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
--    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
--]
- package_data = {'': ['*.txt'], }
- 
- if __name__ == "__main__":
-@@ -75,7 +68,6 @@ if __name__ == "__main__":
-         download_url=release.download_url,
-         classifiers=release.classifiers,
-         packages=packages,
--        data_files=data,
-         ext_modules=extension,
-         cmdclass={
-             'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
deleted file mode 100644
index 912667e7f5a7..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- pygraphviz/graphviz.i | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
-index 0d9b43b..5f1f6b0 100644
---- a/pygraphviz/graphviz.i
-+++ b/pygraphviz/graphviz.i
-@@ -1,9 +1,9 @@
--#    Copyright (C) 2004-2006 by 
--#    Aric Hagberg <hagberg@lanl.gov>
--#    Dan Schult <dschult@colgate.edu>
--#    Manos Renieris, http://www.cs.brown.edu/~er/
--#    Distributed with BSD license.     
--#    All rights reserved, see LICENSE for details.
-+//    Copyright (C) 2004-2006 by 
-+//    Aric Hagberg <hagberg@lanl.gov>
-+//    Dan Schult <dschult@colgate.edu>
-+//    Manos Renieris, http://www.cs.brown.edu/~er/
-+//    Distributed with BSD license.     
-+//    All rights reserved, see LICENSE for details.
- 
- %module graphviz
- 
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
deleted file mode 100644
index c4a7bc3f7843..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.2.ebuild
+++ /dev/null
@@ -1,39 +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="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.org/project/pygraphviz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-setup.py.patch
-	"${FILESDIR}"/${P}-avoid_tests.patch
-)
-
-python_test() {
-	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
-	"${PYTHON}" \
-		-c "import pygraphviz.tests; pygraphviz.tests.run()" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
deleted file mode 100644
index 174617915ba2..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://pygraphviz.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	test? (
-		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-swig-3.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
-		nosetests -c setup.cfg -x -v || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.5.ebuild b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
index 7f0c40611e5a..ebb016167c1f 100644
--- a/dev-python/pygraphviz/pygraphviz-1.5.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 401e17652692..7c9052176333 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,7 +1,7 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
 DIST PyGreSQL-5.1.tar.gz 642216 BLAKE2B 4f3ff4e59c47d86007884b41355ec5cbc3893ba21e3e5b7a354aab698dde947622ba4b7a1590325ae36f132759e26f37868844c3c21605ead068261129331453 SHA512 d36be0f121c20469193600c551e15b430fdc9e44db00e4ae7adb4985697ddc5653f52fb642b0f3de8316fb916616d07ac1ef03e1e6b20043b7cace131b232a3a
-EBUILD pygresql-5.0.4.ebuild 699 BLAKE2B 854a2ef8cf4ca8a36ae09230ab76dbe6f11318a54f43bc42fda1b6031d29290d159495f622d431f6b3376f2e8b98d3bdd8f9974f59292c327ce17388699aac77 SHA512 31a27c1ef1437098d909a6f9e91def7db70d88b69c7065a115541648b31fa2b70f5648d0f7a82ccdb8ee41626b478a20589c516fef84e8a427273cfe02b47532
-EBUILD pygresql-5.0.6.ebuild 670 BLAKE2B c4a9c491be3293f398906abf5f6b7baf721b71fb68cbbea4d29fae6fd0723939cdab0eecdcbfe64ad45fe7a3d90f2b6d1df973fdd305d5e19e7604117baf51ce SHA512 a138046800abe3b7677cfbc61f54274146d8db37694400c56782e04d89ca12da253b4532b3dd7be3717d9cb3f5e6e47fa97f120a8a7ae08f781cc1316b05c130
+EBUILD pygresql-5.0.4.ebuild 700 BLAKE2B ec45404c6a47c5edf5144d69ce240ed892672f1c9e2a4587f0d64d0888d8d4c75a6de008105c52d45271ad7bd877ced6342208b3443866595f37c9fe8469cf84 SHA512 b9d76a0f3ef7e662f9288d5a15dff4ce7bde85f1a9ec7f1750f5e04923e98086e809872880fb54e1cbbd8b9ebbccf87d43c88fa1c65a497a71dab706fde84900
+EBUILD pygresql-5.0.6.ebuild 671 BLAKE2B 5ca81d997dba2b90b9c2d44e9af8363033b778c9465505abe65f97d755fa08da714ed2c56d9bfedcdc329f93c1f88f7d3eb0001c83c6e4c1f86862e035fd6912 SHA512 78a679df5a67874aab404e372e4c6690f6ce6785d9a43fa1ecb78f4c7257df0b83941f855831af4ead6346f0a79bca5bbc30269d5469550888afd07a907f44e6
 EBUILD pygresql-5.1.ebuild 740 BLAKE2B 37350e30ac6fd858129d2e2303c3dc8655a270f8d1378b486b292d7f5c91da8147c1dd497c1d5ee5ff89b03442965a887f60f0ffa272f764e999017906f453ae SHA512 bb28a8142d4a0f4322f25ee4fb3f70f093433df1bac6d8e350d8b42132dd2deb232e237bc0f64d62eae0ff30d7d37b3803060f13e8ba2c7224279c930e2a209f
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index da8b3e3a9b6e..94062a1af335 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${POSTGRES_REQ_USE}"
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
index 000a8dd9ff17..aa288a73a372 100644
--- a/dev-python/pygresql/pygresql-5.0.6.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${POSTGRES_DEP}"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 59468f2e6eec..e1efcfce9a44 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -5,5 +5,5 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
 AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2778 BLAKE2B 1d07efae21f28472f545d137c874facde194c1468a716bb71190fd3b720e2319f77bb05ddef9e97f0303e03e71a7c11b078786d661e5b4c498a91a6d31f27b9d SHA512 7967f3528e53178788a93595bf7b66e2e42ec12e3a58f7a7521ff59a4204f0c499c4eb8f976fa9fe04c5da18d1973071fec723f5b824a969f257ffcb164d6724
+EBUILD pygtk-2.24.0-r4.ebuild 2779 BLAKE2B c0d313813e1c985dd41b65421df46036a0f1eeef5b6eebd1a62c5dc2700eb0df485e4a8ce884575b8b88e10b995d89030ad862656f65f89febe595601f381cf6 SHA512 67a9f837b673548ca266f7699b1ab84a1ff039371fa3806ab481ae4973b6e16349cef140d1c1c0f409cd7cb27ce936d691f3c934cc2fc20a23bac6fe62758f52
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index 1e78941ac11a..88e91b3bc842 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygtkglext/Manifest b/dev-python/pygtkglext/Manifest
index 7913eb950af2..f84dc50bae2b 100644
--- a/dev-python/pygtkglext/Manifest
+++ b/dev-python/pygtkglext/Manifest
@@ -1,3 +1,3 @@
 DIST pygtkglext-1.1.0.tar.bz2 349067 BLAKE2B f36a5b408283b137dcc61398469f4a4ee9fc1e2c748690de69bd69f8f7ed9121a5e5ecb24035ecb5618cb8694f40cc9bf6ace6a1e538bb816066a256a3c6c733 SHA512 1b94725d7f93c3ff01a4c2df7986ec3503493a39e78187ed8b440f9609daaf33d801f24b27acef324ea671ec4d46ca1b8cec508f685aa8f70bbc17cbefb69ebd
-EBUILD pygtkglext-1.1.0-r1.ebuild 1156 BLAKE2B 8355803ef4402279b1fd861519bade8030abbd477704928ad418e95a69b481b5ecf349156055e58f116afca40bf90a078c23bf0d24cb4991f5745a7ee07d6948 SHA512 abc3e7556282de70798e04b18ec10944e8ab0069816085593e09d2633494283d272df92d52bb6c20b843e10a89d43a1561dc682af9600c33c0a79ad390bb8a59
+EBUILD pygtkglext-1.1.0-r1.ebuild 1157 BLAKE2B 5850c8a255b474430a845ad6eaf911b8eea22140577a71fda2675ea8ec7c679fdea8623ba962596868a2ebc2b8af4fd6289ffea17423aeb0dc6bcb27d8d1f483 SHA512 b26069713a7d9f9ab6010b220e7340d20dd76f64f777d4851ec54249774efbc0508581faee04fe2bc72a4fc3f3c7e27c3c8bc9f4bf805166b7c0e984d6f86f82
 MISC metadata.xml 318 BLAKE2B 378c299ae69049114f5f3f9d4359b39f7c3d41ed3a4f80a9fb793a2424f4c7fda5f201378916d3e2c05b6dcb06907923adb051934fa06f27b790e4476347b239 SHA512 8a0f450e5eac29ebd11d6390cdacdd2f4cc0971d7124665506cb5fd6c051d5d1b0abe6d421795e212725c4045517effbd34e2f4b75c880b2690508cd8ec5963f
diff --git a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
index d29f9713f50e..99b436acb81f 100644
--- a/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
+++ b/dev-python/pygtkglext/pygtkglext-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pygtksourceview/Manifest b/dev-python/pygtksourceview/Manifest
index bdf082b7096f..c6b2c7062ba7 100644
--- a/dev-python/pygtksourceview/Manifest
+++ b/dev-python/pygtksourceview/Manifest
@@ -1,3 +1,3 @@
 DIST pygtksourceview-2.10.1.tar.bz2 290249 BLAKE2B adc3ef17b06a2c860c9d396aedec1cc3361d62539ffd6bfbf749d5e0ad14a1f567fd4fdeb829a8e9bfe4bdab5e1db3253f9469d2c068f5053a10342bc0c2d70c SHA512 6f8f35ba36cb26f256861ff7f14c3236cf566d6d02f3dea69f63844081caee969ad6288a2aa48d35d4eb542cda73da9d4bfe2cc57548ca15cd372011cab0276e
-EBUILD pygtksourceview-2.10.1-r1.ebuild 1244 BLAKE2B 06e6d652973171750932e0620ced0dc9fed539b767758d3d5172ba9526717d4d851a1a711ea792b7a73fbe86245b300629113a310c65d7331c04e0cd7a19b667 SHA512 0203a1052f7fb60ebe6354de71c95b7eea4cc4aebe77495d5b2bcca98e2ff7fa39664505798aea9cf4f9ca8578e3f10d4ba453111d0c270667e108bc57d353a9
+EBUILD pygtksourceview-2.10.1-r1.ebuild 1245 BLAKE2B d112b1ae8801ad82e4b3ac3f6e57404ab977af947e0a09bcc3931be1ebdb85e769cca3e1da059f26c5cbd451a0e7dd93304d0641e1bfd4b67c7d8b8a534ce3bf SHA512 d1198460e761b1a8da3a863ade68f8599f47394317742a80fd6c0099ed52747b6bbf3eb9f876aa4da318e90f613bf10e78ddcfaedb01567d812259d4c546dd79
 MISC metadata.xml 371 BLAKE2B 17fcf46f5d1a6f78ffd2117fae5abc0b06eec36118e4093462637b9bf0e63b8f655cc9e910c5a250a36c39ca8ba275adb507fc106690c897e8114c37fad13f3f SHA512 4565cd4175e40911dd6f7ad7880b7a8e2214e0e4bcedc10b4eb37558309717bdae656257e87dbb1c9ee9220321e800336219e370b41e28437d11404b6a20f7ca
diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
index effd874adad9..6432a5a6ec88 100644
--- a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
+++ b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 24fd2d572f4a..2a8348ae2411 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,3 +1,3 @@
 DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5
-EBUILD pyinotify-0.9.6.ebuild 778 BLAKE2B d775c6436e9102ad432ec1181a3d05b1518fb093d1c9cafb0f30721a911382710d6d05c989caae99da1b79eceda37f79c87fe0703cb45ac77d46dd0a1561698e SHA512 b4619a2a513cc45b8de3b3bc9e41574d1ece0d50a489540c9ffba6b4f8c37ddc25b708810240874017513d648f2e33c1f3da4a06a489de0eef9091fc34a98659
+EBUILD pyinotify-0.9.6.ebuild 779 BLAKE2B c26d6edb56816030c622daa46d914706028e01e8796cf774751c716ce718505f950d873403f65b4e9ccc727963fb09a08d8763400db33d7d58d5ff7a76db04a7 SHA512 f9391c5e6775202927a4d13dcf3f87460df79762f30e4fd8a2a2d360256e7e024ece142722ac09b93ce1bfc572f3d272168a5ef2d1f7a798fa3728f4134ec937
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 639f994035c1..cec4b5d13b2d 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 39a9fca6849f..9762585a3f82 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.6.5.tar.gz 33680 BLAKE2B a80d976a6a5e7903f3e4aa6b36777b6a938d52980232d1858bbd602d277bce4b058f8ad404e6dc6692e6950ff36d8e698ff0e3afa44c06334a6bdbe728f15cdd SHA512 0ce2438622cdb3e85fb70d4246cdcc29940181dce82a1a641f6b7900a13f09cba0f871038992019a2e1ccc720dcd6dd5e21786bd8a2df40479a34c500a80fab4
-EBUILD pylama-7.6.5.ebuild 995 BLAKE2B 5f046b5a4fc1cd149cc4b64f87991062ba3f6344c10be51e10461e3661348ec9a706bfc676436a6d849997d1a54fb40fcdf2b68840887492ee01753b58d0f483 SHA512 ad4c7b3890e1222276bb18944bccbdb72cf66c3ca65dc19169342ade2bf4257a78aaac43e1146cace28411691218700f9c055bae35a92a820396c1079087f7a8
+EBUILD pylama-7.6.5.ebuild 985 BLAKE2B 1d06881dce4fb80ebfeb1c8fb265fea5b78a6707caca50c4d9c3e2b33b4b69b15dcd7d3fdec1344040f11b5d60542d8914fb312e9c1176a3f308f3f86ebaae26 SHA512 0d2194712b439a5a26298cb778d6e411dea2150dcd94120afd7aae14948580715d0d17e5bcf85eed3aac78c8cc05b4a3ee2458d4fa20ea315cb3f30c8c212a9f
 MISC metadata.xml 364 BLAKE2B e25838a0c27434d26117da6629070f6a3af99f5e48bd572812b2dadc979b99d551c3857bc4fa5ef23f7c9f53e16ed8bd2c5b91f1a1cd624047abd292e5fe5399 SHA512 add19bb038ff79b28e6af0aabeb1cd634214a38892533c3a5e4ca2c1ac9761e758dace11d47a276b449f9e895d74829b5532b7566c1b152e6e3b3dab625f36b9
diff --git a/dev-python/pylama/pylama-7.6.5.ebuild b/dev-python/pylama/pylama-7.6.5.ebuild
index 1dd232b80f8a..4270c54a6663 100644
--- a/dev-python/pylama/pylama-7.6.5.ebuild
+++ b/dev-python/pylama/pylama-7.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 2bc400ce92c7..dd65db328756 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,5 +1,5 @@
 DIST pylibacl-0.5.0.tar.gz 23886 BLAKE2B fdc447701d2856a460ad6cf5d4a31e9334cf5cda668af7d44c780bfb3320d2aa9d58e44d43d2b43b134a9fbac76d657a03f9190fd0c8ce1b6f4061da93cee56a SHA512 c12390b6a0ca73fd351b84860a9d68d74126dbcd8656916d677a39002a6e4abbac704d450b0b0118bba40987cdd11cc11ad14008de39dac8dc9ca7587ae54c46
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
-EBUILD pylibacl-0.5.0-r1.ebuild 929 BLAKE2B 309c70e5bbc03a3b874b179484823300feba75bf9090dbb0bfb469271d0330f85a06e39a630d0a545bde5837cb06e53f34dd5ef71c0ce51fcf821b323d7c7fdf SHA512 810c25a04429c703b42e4f159db7c7e45b6f5f96647cb89b78b0a86f8514ca171cb14ac38c059bc66202a296647962b6cbe8ace43a9246325c4aafc4e9441659
+EBUILD pylibacl-0.5.0-r1.ebuild 930 BLAKE2B 23d37c562b0e4061827ee8a9434426e31867b899cb24a4430ac58c0b4f5a7360a39c8b477d7b33dffe3d937c902631bf75aae2d00bc0904bb5ed5f180819842a SHA512 2ccde698b58ec675dc0a781faefd3763c87b12a100179747cb243659da5c45bc3b6a790979e57cc90783d160d679b850714c2e0b678abacc5aa6b17a9acecbd4
 EBUILD pylibacl-0.5.3.ebuild 947 BLAKE2B 6d12eed32b0b0eb87142dea843585798dca98aca203aaa5b00037f74b90abe36d3c741c5605bc1308a957a95e1570dd10f6921688a6c3e96cb8df1dcf7091083 SHA512 433b10975b2936abd6f2b868fdda0c083a9853e3f475428c979c40fb45d03cdb2a0a13af0b4236f2db8166bd3842b0e7b7e6f312c97a4f0faf0a9bf9d16c9ff7
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index 87a70f1d5b56..29c164513f3d 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="sys-apps/acl"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index d583b7442f95..24fa6f6dc5d4 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,9 +1,14 @@
 AUX pylint-2.3.1-no-pytest-runner.patch 395 BLAKE2B 06d770f92d8772afa9febed3281e70f3aa08ea50b31bf3aaf87dca4acb0a7fabfdae6b5481648ccb7ad6db6f5f9eec29f2da13bbd9689aa080aebafd9aabef51 SHA512 3ae8024c82d426d841106ad43d165524de243d1c72ecf5883d39806f735bff87087db4ac109dc59a3a164e218e3b75647877fb56d52ef8ec387884da2e4b5404
 AUX pylint-2.3.1-sphinx-theme.patch 537 BLAKE2B 62f83fdaa8c1ec45f8ef7b03e7aafd85a00358ebcd906f098294356ec0dabf56e31e00a4336edaf4c1b7c5823a555de1aa3314f0f07ae3f729c20ae93e0d23ee SHA512 c5168423de4bcaf945b4d17cd766056f4f1a9c93cb082ea76df25f4335fda05118bf1309b8f622876625a15c0ccdfdb47a2daf2a9da66f87ab4047d0d2e3b656
+AUX pylint-2.4.4-no-pytest-runner.patch 345 BLAKE2B e11b2be3eb2721817d118bc161fd0fa6e7fc36febf1fffaa78f9c5f7810c9e316e59db2e28d07c161a53df34c8948083da5e11915eab18a45039d90e61e4ba28 SHA512 b5fd6fa2a902219515ecb733e338bb0d0389d1dedb947853111c7e7c9c0c83b80e595d854252a344bec6c5a3da3f1976c7b510910ba1fe199d977d70efaff5de
+AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
+AUX pylint-2.4.4-tests.patch 522 BLAKE2B 1ec6a2c49a111a35f50f755b59e0c288e4fa801204b72a0f4f8a6b4ec54fbb35e0bedfcecfae329cf39022fca6c35c99a1b3130dbf63bc0fe5dd6ebcc3a42205 SHA512 d7a22c0f4f9adcef0a3bbeca0321c90c1ebdeee678ff5f2fbb5b404514e110f69ae294fb3bbdf2431e932326d7bdedbefc5fca5cdf145f8221061eae15ff92fd
 DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
 DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
-EBUILD pylint-1.6.5-r1.ebuild 1790 BLAKE2B 47754e5feebe1ec200269230c463fb4ad4df6fe7d9de8e3c9ff493f63c7e8c3e0964019cc31228fff1a0392d2a298e9f64c6790bc48002de13788e2be9b17df9 SHA512 ed478141eb00508d1c83ed7aac059288634cdff5ef6661430ea4b85c1385d4bce5b5bc740947eeb7d4917234b5f57dc3da726ecdcfc46f6ebdd4b484ab6becb2
+DIST pylint-2.4.4.tar.gz 646113 BLAKE2B d62b66b056e01cc13e90f45ff4a11f94983e0b9b42b9a05e5c7b7385280000d15ead9a282e7eea31a8ee6a24ffe539576a6e9bd40dc4d89093263da99029123b SHA512 835e0687ebc76c530e0042c5a5188b8aedab446531f621627e990cbeb37ab6ecc8de0f8c6ab171abaa63488e049e8d7782958461421f9a4127435f56b6d2ed0b
+EBUILD pylint-1.6.5-r1.ebuild 1791 BLAKE2B 7e139c0dff53c6ccc17eac6d37cc865b621e8fc7f2155be3441f92f05946a6e5cfdf0ec708b748c70c57caee87c0a7874da5981d1c7f3ff0dde74083ffc04fba SHA512 3a4ebbe7946d4856ff42731ccf6becbf72f0e7a3d219df088699429f18023a369e1824b055dce4cb9927792e95315dcf8dda19e5cc73662ae6c67391e82a88ab
 EBUILD pylint-1.8.4.ebuild 2467 BLAKE2B 1e55ff2939fe5185d4e8deb20acb31143de82a8350d9e39fcf1b091ab2a47dd57d40c617551ad6c67587490f2ac9ac7179ed03ceb92544e55a97e91e3b9c94cd SHA512 7e72496d0c6efe4731945a91f48477a02c8367ea314f370f41a5ea14eb619f4966f973929fe3ee79ae0b8967a11715470312e19b5b1675e197434ef00a648b15
 EBUILD pylint-2.3.1.ebuild 1649 BLAKE2B ef78c010054846cad6281e86a3acc9629469d22a58df635986dc82b101c07f349ddc19ae340ced07d7568285d2bff05eafcb246b8877df434a551600a6255b35 SHA512 564c255faa76b208c363b38c69f0e4a29733bf4784e3f62eda9eb54e4222afb5f38c0bd5e3f824216782d3e7659d0ed6e48817aa7508def98d57d13f5d7b650a
+EBUILD pylint-2.4.4.ebuild 1446 BLAKE2B be035ef9f3f7a52ccfc8bf233a07b02178c0597facac153e35362befdcc486ff47f794b9fcd7cf6bd4ef78d02ae928d1867e260d9d1a5c9d1bb6960e938fcd10 SHA512 07a7056f1203691c137c157f500bc0fd9d14cbf77e40871bee1d51c3401bbc6958d3034abfe1c0b72cac729dd6947cc442b1e34be0179ed10ff99e0cd30d45c9
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch b/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch
new file mode 100644
index 000000000000..0d668d01cdc9
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.4.4-no-pytest-runner.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 4d16b79b..b2a1b9e9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -143,7 +143,6 @@ def install(**kwargs):
+         extras_require=extras_require,
+         test_suite="test",
+         python_requires=">=3.5.*",
+-        setup_requires=["pytest-runner"],
+         tests_require=["pytest"],
+         **kwargs
+     )
diff --git a/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch b/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch
new file mode 100644
index 000000000000..1a84400a8d78
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.4.4-sphinx-theme.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index 906f0315..caca0c0c 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -100,7 +100,7 @@ pygments_style = "sphinx"
+ 
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+-html_theme = "python_docs_theme"
++html_theme = "nature"
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
diff --git a/dev-python/pylint/files/pylint-2.4.4-tests.patch b/dev-python/pylint/files/pylint-2.4.4-tests.patch
new file mode 100644
index 000000000000..b11ecb7c505b
--- /dev/null
+++ b/dev-python/pylint/files/pylint-2.4.4-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/unittest_lint.py b/tests/unittest_lint.py
+index 4f942cd0..d54008bf 100644
+--- a/tests/unittest_lint.py
++++ b/tests/unittest_lint.py
+@@ -792,7 +792,7 @@ def test_filename_with__init__(init_linter):
+     messages = reporter.messages
+     assert len(messages) == 0
+ 
+-
++@pytest.mark.skip("known failure, see https://github.com/PyCQA/pylint/issues/3198")
+ def test_by_module_statement_value(init_linter):
+     """Test "statement" for each module analized of computed correctly."""
+     linter = init_linter
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
index b5e847516951..75c33e68cec6 100644
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-2.4.4.ebuild b/dev-python/pylint/pylint-2.4.4.ebuild
new file mode 100644
index 000000000000..7bffb5ac54f4
--- /dev/null
+++ b/dev-python/pylint/pylint-2.4.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via **kwargs in a dict
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/astroid-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	dev-python/mccabe[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.4.4-no-pytest-runner.patch"
+	"${FILESDIR}/${PN}-2.4.4-tests.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pympler/Manifest b/dev-python/pympler/Manifest
index 916b2ffcf742..2c0bf753946a 100644
--- a/dev-python/pympler/Manifest
+++ b/dev-python/pympler/Manifest
@@ -1,5 +1,5 @@
 DIST pympler-0.5.tar.gz 263627 BLAKE2B 5ce881664e2d57d1a7a9b87238cfc6657fd35a140e6ab906b55ca6e0ac91fc8a74377d4db21706708c55773f8ca65d3578c101669ba409339418e09ca53d0fb2 SHA512 254b758df70bafe57f315a973de0caeef6cd616bd0cc7b4475c74c3a9a94f52b3ac3da3f073483db3560cd0060536c95ed1297007c24dfe8db89fd893ff1409c
 DIST pympler-0.6.tar.gz 267267 BLAKE2B 84a8df3177d0defed949869bec9342beb4336c912be5539c597388207abcbc53fa5218da34b16a872dca804ff559a448dc092b4d33396d570164311c1808765a SHA512 891822ce0a76377d74aa99dd2ce8b21a364084f0bc03ab6d6fe505597a0e182dde459b218dff8e0e6a753e1d88ba9f01b3a4b97be31a20e73a93d6c6fee66e1b
-EBUILD pympler-0.5.ebuild 1038 BLAKE2B cdcfec3799b0e3c8d9b4b18b56ced52cade40e92882d14b8a593247f8aa2dacdea4641d93555c41ee06496d32412daa6f88c8f5c5ed83f775620b6c777c0c84f SHA512 8e36a8752053a8feea708bed09bd91fbd6a640224f1559d31b3bd5a9c7d9b0e9792b4cc56c51b38befe0c780b1abec41640ff650d774c22a358db0ee91877630
+EBUILD pympler-0.5.ebuild 1039 BLAKE2B 71fc05dceeae452d9cf822984d2806a63e6a1222a664e253df8288f4ef36b169ce9d9b28081660721c23ed6e75536a67b4aca0e051cb468224245ae719453958 SHA512 e86860799187f54a394fa606ed3668b39b1fb1533f43d95b685e0490132ac85ba16dac55ddbf6664cc4423817dcd18e6ea8bb9196eaa3901dc42de2103fc8680
 EBUILD pympler-0.6.ebuild 1050 BLAKE2B e14e974e0e9ddcbc384220c7798be9defc66c3b8d8fdf2a5905a905f907422a2df69fd1d0e36203cd55e380ba01a707133d3fa41ae6eed0c053d0ece96bd65d7 SHA512 f4e1dce7f5db262c792a5e4cdf4f53c1fd2765af1c09f52e8e186fcbb804fd0371745ce70829ab13737dae9da115f3c91cb927f8d308c872e1032a462e3941f5
 MISC metadata.xml 775 BLAKE2B bb415e7f09dec344f5f97fac36d3659c0670de5230a628515f26b1b9177883b6d99bed0ad2992af116f6b800a9f73aac3f436a6480a57c6ea5565e01f56c95b5 SHA512 e97ef9decf71b8f941e1fb54fee0aef66dee9c3e722f590d1d08f87dc20ba709713089c91891f0c686d69053321894fd6c8e6de690154f193e2bb72a5d879d41
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
index 1258d7361c91..1026066d1f6e 100644
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ b/dev-python/pympler/pympler-0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 9fd8fdfe2418..fadd933551b0 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -2,6 +2,6 @@ AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746e
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 DIST pymssql-1.0.2.tar.gz 175469 BLAKE2B a88c04be044478c2bec76a15e05ff751b961d253ca2e071ee8293c0899e091f96206a87486333f2543de609c7b38ff9e8a1a4ba7686625489bb9ed5c56e3cf19 SHA512 6e9a2d26f2cc33bac093f2a2a41771aa41ba336413076c793137558c05e48cea7409f74f35530939b36a708cc47c66ec0dc765a768bd5f857642553568fe859e
 DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
-EBUILD pymssql-1.0.2-r1.ebuild 619 BLAKE2B 87be9f35236e57593f6d93407f5e5438824c7cdb396eaf095550dd1c961d6c042bd809c49ca4d95ff514b6b93c893a45679ffada389b7ec3d542ec4e82950fb8 SHA512 e6aa8a42772b4f9fc8bc14b302c21aeef42861bf7f78da5d69ded961b0fc915e6564da3c37ed0220c6e3ced1b9ab54dbf3c21b0e700fcd3b215ccdc39efc345a
+EBUILD pymssql-1.0.2-r1.ebuild 620 BLAKE2B 8d7291d216e95587719fc39f34c83cb3414d8a508606a861ecc4baab5a61d0a3d2fb0ee5303da42b9de2bbfbe047f8981566d8c37b8368e97f40748f13949db4 SHA512 fe37a2117eb6eb604582dda213e6f97d6b0f407f7223e0107166d901e342bfc401b913046585c8c8101a314b7f825a528af2e2c619afe059183b5cfbe48393d3
 EBUILD pymssql-2.1.3.ebuild 1100 BLAKE2B 83155cc6d314510cfbd2067c1105717eff8c98e7eaca52ff01e29e537bb7d9f700df94876ab96b00a4c6731d831f66ce9361c8584ce086fb98f5ff693d944386 SHA512 673761d77b09c328412ac457e97784ae160eecd73ff4e568f5c83bac8d460aa13a99f9071e2f71471bd0b0a0cb62817e2bd56a5d1e005c4e1ec98bc17f55d20b
 MISC metadata.xml 396 BLAKE2B bc47cebbbeecb1c410ad5ffba2ebd275b9463e73f984ed9bac84720e3993365aca52a7b32a010c61a7e4e98e14b17aa3fdccf74692e327717fd1113ce087e263 SHA512 dea6de0ceb2f3661fad588992687c8bcda6204b731756390ad5d1a0f2ca2bcee77075e72b80f72a31ce681b57aafd830ffe984279cd8cfc96f520c04aa2e0eed
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index cd1de058e1ec..c083c0e7c74a 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=">=dev-db/freetds-0.63[mssql]
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 641e7257b86f..a55927ba3912 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,6 @@
 AUX pynacl-1.3.0-hypothesis-4.patch 879 BLAKE2B ad16a87df5bdcad6e07afc4474a0cae6284e8cdc547405af05b1b4bae32e3c01c9ca523f3045326335536f509cb72c7014d31ccee8a3ad8b2fffd3c9cd837935 SHA512 de3bffffd0a16934ec5653c850a2d9b2075468dd0ea59c646af0c2ddfc9c4dd2994413a917e58fc67d436d2add6d111749d4979b02e4bdb6b8ff4e946e283109
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
-EBUILD pynacl-1.2.1.ebuild 1021 BLAKE2B b44726cf87bd184004506dbb91a8c4c4f147ac78bc648239874737f85d74201ee838e1da7d65aab1bc8b8f3cf87047028498e842c7de5e24183028f0508fb89e SHA512 c1a9e110cc33ad72691ab1b3d78e51f223a8f2c613cd40c67a20d99bdbf18028c20b574eaf3895d78e1978620c030c7d6fe8a5be7cf31e69c5745c26e3906456
+EBUILD pynacl-1.2.1.ebuild 1022 BLAKE2B 86c94d679d690909c2fcde6058e90b240e688f5e50a7aa282acd857d27d75e663bc07cf2e67e995681952ed7bc06a41991c1aac63fe7db14cef329c62976e803 SHA512 6794c4e51aa9624adc5db3ed0b31133dce59f04e86926d4569169e50f84f9f779b7643b0d533c4a1b6f2f007805107e0b4d13852b823814b1f635c55dd56d435
 EBUILD pynacl-1.3.0.ebuild 1108 BLAKE2B f7f2af37ebbaa71ca74766a08141fc937fcf9d033b25a6685d60e9895a4b57990ab017a2d43bd6ec6cd3c1969a3058c6512603069ab3532f80233233da53c2ed SHA512 70226ef5577e29403d4a706dc0ba2347cbc1c113a161c880b6ac635f6a91cde61c5ada4e7cde574cfb212a93b032c4bce2b16b195b959e8a5bde79b829632664
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 9a1e768124cc..31d4301b834c 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
new file mode 100644
index 000000000000..13adf7fcf332
--- /dev/null
+++ b/dev-python/pynvim/Manifest
@@ -0,0 +1,5 @@
+DIST pynvim-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
+DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
+EBUILD pynvim-0.4.0.ebuild 810 BLAKE2B 7f76e6dd3930b5753b9e2dc2ba5dbec74f8c8fac4f2b28bcd428950b6e455d702cf6be51a8add2b9038549391572be66e54c0d849c284cd65cdfc845a9d60439 SHA512 35f2da8c0b61d6cd1746f7e7ec434e38b3027e16a192ef0b42c903b71c42c101a63703fa25f7d2d7413dafa931aaf4226d93b7120ffb3a5b53fc7e955976ddcf
+EBUILD pynvim-0.4.1.ebuild 761 BLAKE2B aec1d6e96770f5947f21ea6766037dc13d0441aaf1197110c2469f7f8996309a4f6217c22a0d86f01e7188b7bcac8598eed5f2dede80ee98e33bf798a44928ad SHA512 83166637eaa445739d0c3f8e5553d7c079154c607c9d0ba44804d92427150b77aa7402a7bbb0cf3958aa17547a7420bba92f82d50246c94080d05d52dbe14ac3
+MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/neovim-python-client/metadata.xml b/dev-python/pynvim/metadata.xml
index 2cfdf28024db..2cfdf28024db 100644
--- a/dev-python/neovim-python-client/metadata.xml
+++ b/dev-python/pynvim/metadata.xml
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild b/dev-python/pynvim/pynvim-0.4.0.ebuild
index b226b59a0c4c..08c2fb448411 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.4.0.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.0.ebuild
@@ -8,8 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
 HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/pynvim/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/pynvim-${PV}"
+SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index f424f4b103ec..cf1c0d3a5dc2 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.3.2-r1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
 HOMEPAGE="https://github.com/neovim/pynvim"
-SRC_URI="https://github.com/neovim/pynvim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/neovim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -23,10 +23,9 @@ RDEPEND="
 	${DEPEND}
 	app-editors/neovim"
 
-S="${WORKDIR}/pynvim-${PV}"
+distutils_enable_tests pytest
 
 python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' setup.py || die
+	sed -r -i "s:[\"']pytest-runner[\"'](,|)::" setup.py || die
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pyogg/Manifest b/dev-python/pyogg/Manifest
index 22a3be6c1fb2..da3afbbd900f 100644
--- a/dev-python/pyogg/Manifest
+++ b/dev-python/pyogg/Manifest
@@ -1,3 +1,3 @@
 DIST pyogg-1.3-r1.tar.gz 24094 BLAKE2B 5d9819d744564d99570cd43957c182e6bd7630c8447e44029357cd182bf9a4838a593f7de3bcdcc352c8ec99bfd7b80c6cc418608e4d5075804a73fe811b6e2a SHA512 aac8ac880080b3a0b7008fd52115b0790892a41abc36155fbd7b6b363f0bb0ed14b2c839cafe28233f17fed34f1511d3218db09df728bab6510c7f81e028577f
-EBUILD pyogg-1.3-r2.ebuild 855 BLAKE2B 28f268238ff9e583cf381d4fab888a4dfeef509c014ae1cd552312e4c2f246fd36982db2d65e85dd092ca08b1fb61c27f5cee5743678d2b7b7ae141c223a0972 SHA512 8c4f5c564b271a28260de9ccda71603efb7d3deae2e4130e8f58f0ab2a3f279ef51eaa7587f79dd4371cc33598b9b194b44cf590ac3eb88b24a04ca9ba2c4bc5
+EBUILD pyogg-1.3-r2.ebuild 856 BLAKE2B 6b257d1b0749256268ff53a3266820670c5a2cc0a77fdcd9ce7ecf5841a906df7d820d8f7702b0f16b91c6afa2530c46674f344fc486edd34be09aa5741f3786 SHA512 8e6468b07ba7888e044a1e5d6d66bed8cd8cf73273afbccd655ad29307040f8d4f4a613f428298da0de5118f9b4e8f64690a6a187214a4dded8180782604deea
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyogg/pyogg-1.3-r2.ebuild b/dev-python/pyogg/pyogg-1.3-r2.ebuild
index e5e6f162fbe2..cd463860dbd3 100644
--- a/dev-python/pyogg/pyogg-1.3-r2.ebuild
+++ b/dev-python/pyogg/pyogg-1.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}-r1.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=media-libs/libogg-1.0"
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index fd31649d8ef5..5f4fd3305b09 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
-EBUILD pyopengl-3.1.0.ebuild 812 BLAKE2B 4fbd78d0f9ea4a278bd1804c67e3cb7df1ffadca59e859f80a927eef9874245ac2e37bbecb3539ba23dd789e6c8b918fb9704f37b0ede45d6cc5ff84c0180e4d SHA512 f115beb0e06ac269baeefccd8890df8eecdd1adabc2a527f8bcb2d80d557380430d5bfae2a3789807480aa4290ca2adfacc8e42e561e7139abecdee0b76b76b2
+EBUILD pyopengl-3.1.0.ebuild 813 BLAKE2B 4c5b2647119a360526ddae0f012554bf287ab55407cdb7e867afc53b8428f2b2b1c84fdaa5f5d2d968755f194732668767cf0b815f2fc9a374264b768ea7e6e2 SHA512 7b79980be11e73c2db71fdba3313f4cfdb9afd89112a8307ecd0a767f04922fbeedff32fa078863b37d766ea19940a953b732b4f6c9a364e56a45374bf6afb98
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 9abc32dabe45..899e674b19ee 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -17,7 +17,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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="media-libs/freeglut
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 7a00e00745bb..ac0447359df0 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -2,8 +2,8 @@ DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db35
 DIST pyOpenSSL-18.0.0.tar.gz 167296 BLAKE2B 3a9c8db02e92858353389508d9791d2ff0b07b54150d27a513b4c26ef62899167d184702cd8ac3a9fb5be120a92e31259ce265a400513de4622c30b1269ecd9f SHA512 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15
 DIST pyOpenSSL-19.0.0.tar.gz 168551 BLAKE2B 762d3358b3cc4f1e088e9464ac079e5212c537d25691e51edb3255a192c42276506c758ecf16eff999082bfd05aeb92a37741338d92036d2149b87c95008db05 SHA512 a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818
 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-EBUILD pyopenssl-17.5.0.ebuild 1720 BLAKE2B 41043ab5a2684f64acd7b003eaf2c7d86fe12eae48bd033b59eb2a13d7a39aea9320af065d0ec2b99468bcaac924c7c883d3ea8098221acd70f085f84166cb08 SHA512 9664f8c2a77b1e3f60af5aad324243c5eb5d469a8c07d4e3447f28d5e7e705c7b91ef484f9f32e99c15476f4bbcd47c6a156165f0cb2d06009bfa6955971c71a
+EBUILD pyopenssl-17.5.0.ebuild 1721 BLAKE2B be960de0cf11fc8de18f54e1a9f2d01411913b27ef865c0dbb2994548efb57daa1cf564cc5e07526c7d9613815986e98c2bc7575bf42853b5d7de9a0cc71d6f9 SHA512 1e7933717202f5c5fbf40a0fe197578eac316160a2f2021cbdc0e0e77e64a603c559360ee8299a1231b23d755af754bca5cd578955f1886ebadbdf6aa5c18a75
 EBUILD pyopenssl-18.0.0.ebuild 1734 BLAKE2B 0b2f65a21a71de81957e112ae0ec7b5dca06f3c669cc9f0b7ef773ba97eb15c4e8831ae21bf7f2136cf42f7f1608ada5987c35107dffe97227830bff6eebc445 SHA512 3d020d281ff64b1f33f821aee4395ed25725383764965ef6b765e6c359af8d51b7b0db78e38541d85ed92e1c12d9ea2db8a96c2862209d37cfd2ab4e8b2fd079
-EBUILD pyopenssl-19.0.0.ebuild 1731 BLAKE2B 2566b89c541cb469f574dc020d6525bb5f7eba0904654409303fa56db68a154b77cd3794a4a67af97c0b98ade6df2d7c0de1ac572b8c4ade00ecde9e2cc097a6 SHA512 c9ab929d0c04e5f82d5fc0ff9b9b362042fc8ddc59cd3ecd9d35a6852e8491ff8cb912639e38ee1c19dee9f1c27e94daf8370d76ae0f75b17d319ec39702c8e8
+EBUILD pyopenssl-19.0.0.ebuild 1732 BLAKE2B 30ec117d5040c4e7af07120c6a7d3da5eaf3af5056a6330637e710d91037b484b83c06d4210a74a1fb1cab635c52286f3383771c8936c27522f1bd4b5534826a SHA512 a78df3cedfa7b9e26f887989ae7e97e60fdeff402105717437e1a49c00af1370988127a1bc2c4ce19a83297adc33ebe65c757f592f4dd6ba9180e5973545ca31
 EBUILD pyopenssl-19.1.0.ebuild 1409 BLAKE2B eb26308cb3cbd8a812be9c80532ade1f5bdc588237178a7727b6a06db1576021543161d7d1c45748abdce76fd0c89b2a13507d2de533583c08db2a1ea5866b2b SHA512 aed3fb4c129dd1848908838ef206403483813fcf1b382168a7dfbb63787d7bb2ad30a548f6938b38ba7d296449048b8baddab55c08948dcf57dd852745cbaf76
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 51116a09100f..00425f8df5f1 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
index 4ec6b717b05d..71222827fbe3 100644
--- a/dev-python/pyopenssl/pyopenssl-19.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.0.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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
index ec5c3c931ed0..ec9978a9364a 100644
--- a/dev-python/pyorbit/Manifest
+++ b/dev-python/pyorbit/Manifest
@@ -1,3 +1,3 @@
 DIST pyorbit-2.24.0.tar.bz2 293054 BLAKE2B 214a1bb9c1128312ac2ed84e150fd91b184e60c26edda7b239dc9316bd366a80911d44a886ce523c3786b10adfed50f763c3b4fcc8763c95723f72383f7446df SHA512 07824722831ac39d853bbcb35f543c6a1f24606a0fea8048881b3b9e370769592b2bc92b2ec6c9c6e88a2a7f84838757a115392fba6e1dbc0d29cff6f8da8141
-EBUILD pyorbit-2.24.0-r1.ebuild 992 BLAKE2B c6dcc5dafb8cc9fbeb686aaa0ba4ef5bb0cd8233b5dfc888fe11f1a3ce276581a4edb2b74d3a349e31308349b65cc4657e5ec304f42249748f3535adc90d47ae SHA512 69c5b403cf4c67fc6954fee1e764e02cfaee767af771e33a5fd1f08fb7d017d184167b720e992085806fad74a70ff6d839a61c3afa6290911e431fc808e21ca0
+EBUILD pyorbit-2.24.0-r1.ebuild 993 BLAKE2B f44267925cb7a68cd31ad22354a86d13de5f3e6f0801826ff9b4bf7612d7f92a4e742e44f05106522cb319b1dc401cda45697bf01143153e27929ff555c49c6f SHA512 56544b9d149a31858009474db16cd67533c82bd7589bab6ded1e013a938cfa941b5941a25948407aedb230508100505bb0de29ae7507fddc04646c6dd1ad7364
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
index 6471f5e3cb98..34650a058dee 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index e6938dce1947..a03890615dc3 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -3,8 +3,10 @@ DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb
 DIST pyparsing_2.3.0.tar.gz 624393 BLAKE2B 9fd9bee7742953d455ea34310ef1668df0a7633642deb4eeff507439228ae018e4ba99d3476c5cfe374a908b58b0311527ae5f04ddec8eb7e219a2a9d4cbc8ce SHA512 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e
 DIST pyparsing_2.3.1.tar.gz 619405 BLAKE2B 4c1b9abe6ce6e511a998eff19eb32c835144473bfe47204880f43979b1ad72f5c73ff72bfc17fcaa3cf2a9b52875f184b122927cc0d9f9eca5cc4facdc4a119d SHA512 8c0e2c7a7dc7ec12f3e7c260bde25a33f325af89d9bc2329b7882ebd8a3f506fb06a36fdaba0fd8ed48040d5b7fc5288c41b01f2df84459a9980a035cb213dd0
 DIST pyparsing_2.4.0.tar.gz 625419 BLAKE2B 5555a255cbfcbb076fe4d385b2da967bc44a7110acdd1a4715fb3e22db2a3f5b7bef1ad61423f6d0419cd8cb403abe222e426a96ea755044d04e0105c2798317 SHA512 2888b60c2518b19979e00b01ea499c45cd0a98affe0551f80ea7985acd649d62b4e231e142d3efd65cdcd9e3a0182680bfe1c4d98e310fa2ac476f37ac4ff344
-EBUILD pyparsing-2.2.0.ebuild 1293 BLAKE2B 5ee1b9124f59ea54613551ae0e726207a6c4d0c3d85ee8292ce6b2e4c90283488733162e7129ab7573ea93f25e168b1833d5419762b5899a4ee28645928192c9 SHA512 7c686ad8b9ed2aa06fbff465fb564a83bd7102c7ecf20c5e4aa9254fd7b590088d265f3bce20f9f074e96a438745592d43f8bc25d4acef38bbc4b82ca9e79ddc
+DIST pyparsing_2.4.6.tar.gz 647543 BLAKE2B f6c93fa1e9a7ece4cf6abcc74dae0c96becaf7f50eed5437a6410166e80768c17d429fa2d1e4d1958b2a7c5ad6ffd18218c5160bb0ebe03ae2963014612eecf3 SHA512 475b77f469d2051fb067796849f7c7d3df145f2c6cefc708c904a5b0af22661b4c229c521c2cac3c94621dde9bda6b28e428a8e31d936df6d4596d993263981e
+EBUILD pyparsing-2.2.0.ebuild 1294 BLAKE2B 4bea806a81ac8020add0cccd0efc62e02c81ddf1451888dbf93dc9f6814496366f72e3c84f5adf6d8c58a247ec62dd218971b0e117d2c86eb7fea145c249eb0e SHA512 6499f2574bf11b2ceadb6b0ed74c20118a51007f6d33c6c45edc83b59770a1df4e1aab356c67d405dcfa03a421799e784fb150e406baed00c532895ba3baa182
 EBUILD pyparsing-2.3.0.ebuild 1220 BLAKE2B 84e5ba0bf10639fad9c55093af9cdb67b866fb66464c6bccf746851c018402b3afff134611d097b3fd4aa78780f1d6bf6f34248ad098a026364e77935126cf44 SHA512 482e725a276b387165a4a5f891b3893050293d9cf2cf9535a179eaa2c973dd7aed451f3b15e006fec87ee2907a7fd05bd0c0f69f85778e422eb697bdf95f646a
-EBUILD pyparsing-2.3.1.ebuild 1208 BLAKE2B ac11a2f39c85192a4e793cabea896ee342d9fb3b2c38f7d468a99ae26ed4e4940d2a191b024d6aaff775a0d1cf8b40bd312dfd57fca9f41fe805597422b5eea2 SHA512 2b2794893cdce389c3c6fa373a04aebcc14f5c0af5274752216c77f8c6ad96c6d32431a734a2c16b83cf35298a9fcfd4c91854c9527573c3541706f906cfe78c
+EBUILD pyparsing-2.3.1.ebuild 1209 BLAKE2B 8af9203de502a8f494378bcd466d50f749810d38cb4d6147bd12aea7eb662c239e99e1652f403c1b62ffba3f34c9a92552c7bbc849dfb604189fd64421bb8efa SHA512 819c8de2bf55d6a2a3c601fb0c87ae0f7e0f124f88ae12fa6c14c9a471fb6154fc6cfa313bbfa772cd4bb1b105c8fb8cfcf8194727bffa1524753feba35e0a1d
 EBUILD pyparsing-2.4.0.ebuild 1174 BLAKE2B 1b5d23f54c66eca6ed5d8f006a7661e9ddcc982999c2f08118c643dd7fac5ac64328fa226d1c168d9bc034c606f65428ea2d96ee09d73d84454cfee004dfc2bf SHA512 6a582bedbeea4de7a777b4d70bcfd8e03960d9e85b1393bba6c06b98b96d208cf6f125dcd2b62e70fa4067cd66c6fbea5fcb5f8fe874161fb79cebd8b7571bf7
+EBUILD pyparsing-2.4.6.ebuild 1018 BLAKE2B bc67fb682800905232ab8d7f7ea13409f8aae62db3cc66c9051b6893806992243fe3597766ac083e34681618fd426113ecac1b1eb502ca1b8fa2b6cd5a93eeff SHA512 ddaa172df2d052e1ef0b2e94eb082910d60f4659c881346c82ca62a678437c072ccb4b9ba9b803c1d977b1ada927f63aaa5e6a3fb7b1c3f5feca013ac7a53534
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index d59a01c863a8..f3fe63fb5ce9 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 # not contained in the tarball
diff --git a/dev-python/pyparsing/pyparsing-2.3.1.ebuild b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
index 7f896f83785f..b8d78e191a62 100644
--- a/dev-python/pyparsing/pyparsing-2.3.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
diff --git a/dev-python/pyparsing/pyparsing-2.4.6.ebuild b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
new file mode 100644
index 000000000000..c4c1d378835a
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.4.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+# pypi releases and generated github tarballs lack tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 3337d7cd09d9..f83a9fe8be35 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -2,8 +2,8 @@ AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd41977836
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
 DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
 DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
-EBUILD pyparted-3.10.7.ebuild 736 BLAKE2B 46f27961391d8e4092f3db59a16139c92b3adf9d5cf8376be7816194ec8d27ab00056cdaf0b02c9d910287a34792926044a7b6b4f2e469775545c5e39e22ec0b SHA512 958d126827209532de3b1600f2bc7390249f83a6c428d70f4e8a73009d3653b4608c1586601f3605c9293de3f86c8c5cdac86d27eecc1abf624f74c623a39eb3
+EBUILD pyparted-3.10.7.ebuild 737 BLAKE2B 32748dabb689622b54945eabdbff9a3712d4e545eb71783c2bfc82f47d896700e0d8c77a3f233041ccd172fbbc4a71b4bc08c28c0d573e2490e17731e2fd54ee SHA512 c3f9cda8c8ea1786a77d2a9a9a58d8f97f4e30a2ba7a231715888a60cb5b6103ba58a699c94beabbd20d0e9dce076bf917e350d93cc24f2f7e19013c7b556741
 EBUILD pyparted-3.11.2.ebuild 743 BLAKE2B 4356386c47ef0ef69d335a1c9cfa2b845e42f2cd45044fac6efdb5b4c99f378e022db500807173eadd3beb17dbe450e13c7b173ae6b9b8932c8ebf270a7f1c2f SHA512 349fcca0abade57c3d2c5320957539bfafb8bbb037e3ad81bf79df6c81c8cb675bde5aa71a1cc4ff4554ed4ed6315e41ca140c3af7475f992fe4746bae035876
-EBUILD pyparted-3.11.3.ebuild 581 BLAKE2B 507c0d717d31cecebbd209143ed7c2140dea276bf881b8f9884dad6e396b1e6abf59d83553b9b2a5e3170f2b33db244c2b16ae96a0ff8a228dc592cfb14a4d4f SHA512 a5acf98a71aca4538fcf6bde3511008dd2dbd3ad432e764c520b8a773706a2c8139207370bc09fc10e322090f2a4807c663cc7d40a708ba1b6780eccf9833771
-EBUILD pyparted-999999.ebuild 509 BLAKE2B 5224c068ba54b9afe58941a7f63e3afb94e5933a03505ab325ba8092e6b0ab92281bda511b2b82f576c5971d2223226e2c634cb9bdecd7a209b66ba40ec5aaf9 SHA512 9737bf284c39f7a648443da641ad5c852705f9af479dbf690895ed6251b0773176ad817f2db3c6bb1c2124dfa62b8a1375369dec5f8a8c49b0d918ab97589592
+EBUILD pyparted-3.11.3.ebuild 648 BLAKE2B 0146e0947fc1bc103a709f5dbdafd84fb3c1118e294e8600d8b00b0bc99e23fa610451929c153f17d6a3ac9a71ffce06a005775e95d73d2b71399c26d97bf420 SHA512 3153401638ed7aa514b14fe3dbc4e4a846fa75589d91c84c416a4d5c4ac1ce390d64bb8d5896740f230ee4ececd4c18fb4c53091a15cdb24842a80b0cc01732e
+EBUILD pyparted-999999.ebuild 576 BLAKE2B 5850b2e8739c42ac40dd5fc7b63795b6e4a68c9297dcc85142e901b18754e2cafdcfafdd589f7f845228558dad029a1f004be5cd5bb137e4f0f08fd7da2fc561 SHA512 9d5d05541cec6a61069e6ecab557a2daadc924b7db6a796ad8de2eb0b16b6d1c1d4e26109677bdbfa0fae068b4136e3cb736ef037a64eaa35703202da7a3b4d4
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
index fce9a031d3bc..307aca112dce 100644
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rhinstaller/pyparted/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-python/pyparted/pyparted-3.11.3.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
index 53553209b627..a058461368ad 100644
--- a/dev-python/pyparted/pyparted-3.11.3.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for sys-block/parted"
 HOMEPAGE="https://github.com/rhinstaller/pyparted/"
@@ -22,3 +22,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 RESTRICT="test"
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
diff --git a/dev-python/pyparted/pyparted-999999.ebuild b/dev-python/pyparted/pyparted-999999.ebuild
index c31f80411993..b34350ec1632 100644
--- a/dev-python/pyparted/pyparted-999999.ebuild
+++ b/dev-python/pyparted/pyparted-999999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 flag-o-matic git-r3
 
 DESCRIPTION="Python bindings for sys-block/parted"
 HOMEPAGE="https://github.com/rhinstaller/pyparted/"
@@ -22,3 +22,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 RESTRICT="test"
+
+src_configure() {
+	append-cflags -fcommon
+	default
+}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 95bf66db805b..b722293fc33e 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1087 BLAKE2B fc5a69163aaace98255dbdd0ff6ce31bb72619ccf16a3dd89e8b00d367c0a98f4c3425fc4827f5304ad1f2f160c82c34175f1d972e396ff7b91e836fbed4188e SHA512 0994b81c46332808f1ab69b0e986f2f1767563d2b8cbed7de95ea7fb6f1d0bb80c13e52a66c969f7d805e15ad210012ee83688b365b6d09f8b32b32990f86f9b
+EBUILD pypax-0.9.5.ebuild 1088 BLAKE2B 891207cc729de2ca794e24a401ecf44eda535cb3e43a3044b738f74309888bbe8bc7d84d6b0b8ae89afe275163846afb92165fe0b35d071df242ba7e092eb44f SHA512 5d1c6285fefa89a5a1a9da68006b0f11cdbd26cb70544b16b92ce2ed8d31859591a107f19cfee16ef1ee06a6a14d7bd4ab8a2a2918ce1c0898bddb16cb89e476
 EBUILD pypax-9999.ebuild 1097 BLAKE2B e817420fdb25b820aa19a58cb07f8ea6100e2d48495acef16a48fc990342b6200c6079e1dbbb419aa902883f8ac11f2f0bb90ab6315351ca2c98f99dd69b5f21 SHA512 70bd0d9244dbb2a3ce8944f8fcb3e5ea7562c25979d600ab3b7c3baef76937ec11b7c9f5fae225165353f961df42d41ad694942886ab9fa970de0d208dd762e2
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 8742ac6971f1..8db6154f6e6f 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 0bf542f2bdc6..2ec4354b39b2 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,5 +1,5 @@
 DIST pyperclip-1.5.27.zip 16938 BLAKE2B 653b2e74b6f56839ef1f9d59b864218ffd55866660aa7de4284f0bab4c28b0c1aa7a4a65bce0842003d4744a5d40c87943e05bdea13098e250e534a8cb6c2132 SHA512 cefd79f1d246c9aa9d4d0f3d8cdad291ad31bcc2e000c83e5e05704978bbf7b9b45d49667c2e88305d0a5d6baaeacfb47b26bb69fabf89b6b6e3a1e6f1e23d74
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
-EBUILD pyperclip-1.5.27.ebuild 461 BLAKE2B 8eb09aa277638b5d8d825c638c22f529901e0f61b6bdcd28c7c2b49c2c312b96f661cf2a98ed5b893f3e39ca9edadc22c0ade3774c2515d37fdfa3a268982a07 SHA512 a86bdf9352983e66cb7b513d956f92d081826794171b546886c3970b2685107739332f7fd10a35638434c028e470b0bfe96accdcd96b3c73a7e97b38d8ec0d67
-EBUILD pyperclip-1.7.0.ebuild 747 BLAKE2B 135ca3bc2f5b7849988d670febdb67bd6b63d86ed5b8c59d42c300c9d2fb7db89f96afc151ad8ed67d4f6bd07a05f62c929e9b407c7dc5acb5b629f7344aeaa3 SHA512 974325b488bd02a6b89f0f35b848ff079ba77ca8a862b4d1fa9e7ae3d83e272a7d8527f8844b49cee57eb0c19cc6755c2112be92f4a9e7f6b634543414fb3b3d
+EBUILD pyperclip-1.5.27.ebuild 468 BLAKE2B 08212fec2b2628b92777c222c9743f161bd662cdf71970e93dbad72f46173f80c1dfe42148d01ee7f7eae312c80d2369b7c92f9599f3f1543325685a5140a2e6 SHA512 9542d0b6bc9fe68c8758d31b8aa5b7aaa319f75defcf660d4b92ce9c59a305dc152a3a2fef00463aad589ca431d03173e63c2f52169c5c47e145d5a55429a57a
+EBUILD pyperclip-1.7.0.ebuild 758 BLAKE2B 5b62c56f3b3ab586683de214d601edd445c6bb9e1e60dc96a918daebe671dbe9f0f2272789b07eab5954a5bda5c10a090c167ee2ccf88b2f9e8b5375fd68034c SHA512 7528dcf3930f3dc0e26bc9aec71139cf835de5011bf3b57ef7503fcae35eed30677439083a2b543b41e4c7f85a30888fc68bcfb7643c4cf36a7181153420290e
 MISC metadata.xml 430 BLAKE2B 0010f6ce7e189967ada83b89ea6449d6d4a894f9a04a649895f46f9d5af3349bc2b97ecbdb1e6f32a35c4ab3caa97c2799a950d6627e8225b0170bee943d6950 SHA512 883b80ca383707db508144d0434f091827e1809c9029a380c9369f8f98d920e69653767e9034eadeb730611601a0fbf09a222a45e015e08ef95c7fb54158d228
diff --git a/dev-python/pyperclip/pyperclip-1.5.27.ebuild b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
index 551ed99f674c..15e303b5c97d 100644
--- a/dev-python/pyperclip/pyperclip-1.5.27.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.5.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index c879f5e7fe78..51fbf2c2571f 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 564847111e42..d9b5edf6ace8 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,4 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
-EBUILD pypiserver-1.3.1-r1.ebuild 980 BLAKE2B 3e83458a4d942a0554d2b23e353fe139df54b7c9de3341218534efdf708d8601857ef04bd443d6b40280aa82339e95cdeb41df3983bc39c288fcbb0fe42e0872 SHA512 07dffaa40087c95b7f9660da2c7ef754e25933a0d475a48c74f222d42664b114a53672139b5c39c150c370fb3e873b204f28160964ff810fb7a08885655ac972
+EBUILD pypiserver-1.3.1-r1.ebuild 978 BLAKE2B d789c003cf7d7671fb34b6b30226b7cb68c6caee8ed056fc0ca1b9647373aa54e53e427b0fd048b839c41da595968affb03b1bfe7e8b0331b7cbd0be62dfa857 SHA512 dbba118cb295e3e30faedd487d19809db05c82c889c4505ca12a9fe37f1f1bd37a9df4c479612849299dec3102d8d7fffd3f9c095f3e54404cb15364d1485f1c
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index 3d66b6ccb800..8aabc6bf36a4 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
deleted file mode 100644
index ffcb5690bdfa..000000000000
--- a/dev-python/pypy-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pypy-bin-7.3.0.ebuild 414 BLAKE2B e8e54866dcc6edc8ff4b5fa7d9f3c7175b3371e60e48ec0f0678605aad025990c31de89cd03b0e48a4137e589003ff7dc990a36bafb8d3bd32523fd8827d9d77 SHA512 1ee2344e69fbf4da92992884e0e9f9c564914844018e2344a8a6d1a194ec5bf26d9feb2cae210249f158ce6b6ba7d1faed02fa1d368f3c089864f9059f63467f
-MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild
deleted file mode 100644
index e0bf0390f569..000000000000
--- a/dev-python/pypy-bin/pypy-bin-7.3.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Backwards compatibility package to install binary ver of PyPy"
-HOMEPAGE="https://pypy.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0/73"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm libressl sqlite tk"
-
-RDEPEND="
-	dev-python/pypy-exe-bin:${PV}
-	~dev-python/pypy-${PV}[gdbm?,libressl?,sqlite?,tk?]"
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 08cabd17986c..1f2293e2744e 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,4 @@
 DIST pypy-exe-7.3.0-1.amd64.xpak 13515366 BLAKE2B 52a3640b7a905a5ca7097a752d747e048a21e55b354d60bd3b9ba146d995ec1682bb510e97b94d3525cc46c6b80ba9be0eff8497f1c4c0aa0b60374c89077b99 SHA512 2514d0eef17eb41a6ed4081662ae1fa57fe1e74b0b29d35ab7c46ccec5729a76603d97fc98a3d3213e5bdaca4f29a4a3a42f6368bd610161e897f74f9a14680c
 DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f580289a5ba5d920cf3bc2a47fd146425dd38f08e0033ff16243914e95a18f79990b071bf93fe221f85a0296fe081ca94f6 SHA512 1afd0d3ab20ffb627159ef483260a446c6defc761ed69eea81e2b4edd36fcc29a0f43b91cce5f97f8fbe2f1f830fd395181faad281234cf60d1baf7ab1a48876
-EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1087 BLAKE2B 183d43f4251f0f5a7b11988940d7c3b1e3ddf7d3127c0a4806ecc90c0c902229937807749d9d28b9ddd3f072d637cbcdc7176cbfcefbc959a75d4e02e26623e0 SHA512 0c0065219e6ee5183dc6f11d261db2e4756fa777bafaba3dfaa2c1853c20b1a1afa64d3fcd9831d57d07b30c78de01603cf2bcc4bde69b92e81ddadc6affb7ad
+EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1086 BLAKE2B 72ff9ae93632b70aa0b6ce510b8fa2dcae3f86614b80b62439630fad4c2067212aee3ffd1437eef3eb73a559605668b9ab526861006bcdbbfda9cca0d2efb461 SHA512 6b1a3c2ed5c3ee66eacabff479006054525422e75f6161def8d078564fcb5551a80798d029479567e52799baf93fbe009ab2895c54ec3a768512ff30931dc8bc
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
index 1ad8ffeb016c..b61b72991892 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	virtual/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 48d6664eaeb6..fa6f59597c6b 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,3 +1,3 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
-EBUILD pypy-exe-7.3.0.ebuild 3900 BLAKE2B 8cbde27acc6ed45fdb9e614dd920bd791a48085cabcfc3c64b2a016b49f48b0d60de5455f887d79ab733f255eec13306575401357ac1abf3e59307355130c538 SHA512 c7fca6771e45a01d82f022fbefdd8f66dd3947d36192329d22e0fea7d89fa0082f0d01eaffec850faf0c09256c9e6a1d3572d8c1455315d06d76ced17dc36dc1
+EBUILD pypy-exe-7.3.0.ebuild 3899 BLAKE2B 93374c4410bf6e8c8f47ba2e943c1852fb128b9035cdf9c050c43356706297aa94031cc06ff4db530e106480f46bd478d39c51580f1c1a9f28c96c8d3baab518 SHA512 cea2a39e25b4e8aa6339f43f1fa5a76bd804225af25c87b3fc5ff89ab7a2e1a4edfd84aa2f5f04cc1c11bbf5e879b25c92b69a9d8b12c3d87061cfee7ae0b6a6
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 14e76e65ff5c..3ab056f52c89 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 0f6e79c1114d..0597883344c1 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,5 +3,5 @@ AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c5
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
-EBUILD pypy-7.3.0.ebuild 6053 BLAKE2B 9c242fe433212f51a00e0e8d1c9692418eb2c3771e4610ab283c199c2ed6818c19c47ce870e1cd1a3608689efbb55a671b713fd751d7cc7004f05cc3a21596ba SHA512 c8e0cea0027216611ba215a3b7a15fad48df275d8ef6b857cc5f00fe78c0fc08fb403c135f0985a6b1562f7cb851094cd6480e596c41f3703ce0b4e6a82da617
+EBUILD pypy-7.3.0.ebuild 6052 BLAKE2B c4f82c7d2ee11416997d8c8ad8bfd4b70add86a0f4fde2475b96b9c0fa5417fdd5581a6666956b639a4cb5f576648ebdb5394d46d3db262164ce542e607104e8 SHA512 2420d27b076382f9a81dfa91a73d9c39436e421d346d37e8b229a66616608e12c00c2156a6bf49918cb5472a394852db8268ad9c0a3d91a2de2e588b21038f84
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
index 255575b2dbe7..f1d3f53402e6 100644
--- a/dev-python/pypy/pypy-7.3.0.ebuild
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
deleted file mode 100644
index c78346219f44..000000000000
--- a/dev-python/pypy3-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pypy3-bin-7.3.0.ebuild 426 BLAKE2B 44a8a3ec4cb323c4e86fa3d72c5ec7f5a678e188c502d42be3e5e3fb80f957f1c9d2fd60cd01081abea29017d36af173251e3e8c4f58c3a9539fdb0522d3b3f4 SHA512 7257bc01b1effef5dd0119a67ec359e229979b78615f8914a96edfb10cb86bd030011a63cfc35b55c4c5c3555ca5956cdff812fb6ba79dbc95088c3bb85eb978
-MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
deleted file mode 100644
index ff5bc95069a0..000000000000
--- a/dev-python/pypy3-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">pypy/pypy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild
deleted file mode 100644
index 9b589591c45a..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-7.3.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Backwards compatibility package to install binary ver of PyPy3"
-HOMEPAGE="https://pypy.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm libressl sqlite tk"
-
-RDEPEND="
-	dev-python/pypy3-exe-bin:${PV}
-	~dev-python/pypy3-${PV}[gdbm?,libressl?,sqlite?,tk?]"
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 696be97c7ca5..30d50206ee28 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3-exe-7.3.0-1.amd64.xpak 11650308 BLAKE2B 49f8fff0675acb75ca8fa525f4554807ef90307a5236ece6d4ca242ab016629f926559d1b82641fd9b15d77eaf9736f9c9a2c82fc280a492d90f4e99218cc8c3 SHA512 b22d90e14f88ce5ea9488f9796931fe9afb68dad926835a3311cd284e681e2c680df576d8859c00ece41508d56682dae21ef0e34dc77e47010141a6e58322efb
 DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a752639d5111687b625329679f295abe1c6f5d5221e024352fd2310d20156100b107d520021f2060812f2a2cd6ce12a4d2 SHA512 969a38fc6f64e994b13bb7b0e62eba1b0f86949d63bd72116f67012ab039b696212d412d9d8d851ed33099f0bdc7be739a082e080893546f080da60789d273f0
-EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1094 BLAKE2B ab144d136f421ffe7b6ed236180c57349fd6c416ccc1e0914bbb958262ea1ff807e2ec71403a1a975fe8876dbe12b5a7f62a5075bfc2b30fdcd258e6d7cdf7dd SHA512 a8f98d893603a18d980bfc82989154cdbd8af65f0de33e2a314c0be80e1b5fa4a688d95caf7dc83cf1cacd7ceaa4534efd8abf1c487d863bcd45ff8dd91964ac
+EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1093 BLAKE2B 03aa557384b5f3f4b617116d317235b303a1576c9399f7adfa24f4b880f5c7fc4eb3030c59221411635def2bf7b8036d40e4e2a979a0f80f512046712a31d24e SHA512 ee1f459385318159bebbc43ddd39cb40457b617ec9b69b7ef0f3e20aac19ed772bbb5f99e79c8c76bfb257f9ff5a781e715561768a38a1c27a5e89e2eec730a2
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
index f74a892b39ac..fe7c279a1cc4 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	virtual/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 204bec2b866b..3c55a078803b 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,3 +1,3 @@
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-exe-7.3.0.ebuild 3467 BLAKE2B 9b8f3abfad583a92e4f540da9d9d311ac11a62a4bcdf78f66af9096aef4ea23e51c9dc2145c89078c7aec113dbf4228cb1e09189b57778918b957817354684d4 SHA512 cefcfa59c94ac108f4a07696421fc6a753fbe42ad342a3c573f6fe62df0a192f7597cdfd042e633b0ed86b4595c2341389f612430226aa771c994396557ef5a6
+EBUILD pypy3-exe-7.3.0.ebuild 3466 BLAKE2B 0e6c833d6855ef9cbb460b6de8b4556be3ec664e210b7ebe6b9b0f6e0edc3c121e1af0fa3fe98feb931ebc6da1c015df3d7f4b3d2cc35706d239b7035d0a6811 SHA512 7ed34914c72650fe31b98bc9ea96a9d254378dc52022832292b9b9a668d4adff07fc0f8e87c171d1669b1271cec566cdadfe997b7da2fc0d918a688efcf015cf
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index 0a9bf2e35e8c..5a123c3a605c 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 4b4581bbdf01..ef07aeacb34d 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -3,5 +3,5 @@ AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efea
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-7.3.0.ebuild 7517 BLAKE2B 41b7c9fd79c726bef0c593c7356a7f3f7f9f388dac4e44463841db2b34172866ba2b76f3299c5610e0386584ac485a1119d120d4665458f9576e6244b48a1e37 SHA512 63301b05c21a6f0504b9090fd9b181d0c35d67250d74124f6aec8c448e8162b8ae92d9ac709d5e50b2c6083e28d3da0812539d352371210de2b83561982c7f75
+EBUILD pypy3-7.3.0.ebuild 7516 BLAKE2B 455823f84451139179ec8ae2694259dc5c8bd1e69da3ea43bb5533c0633a0b20025e82e458e2a252a5553968de881a81f90e23e5e4515a0803f7c7d0c5fb1a79 SHA512 8f5f02a9b6ed6db51bb7ae7eee159878e358e5d4397b777ea3cf3dad3c7cebf4ccd2b133c65aaca51ba9f1e64c1fdcb5dc521c636b725706b0902786f0d0b6e3
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
index 731160f9b9eb..946314063a1c 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index ab509ec0fea8..b17bfdecf3ca 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,4 @@
 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 1215 BLAKE2B 8833116f7ddaf849e3ac2eedd5e9adc10216ad90b9349fbc39a71dccf4509ea7d53de8fc2c4fe072cf2164661c6006f5af0a11c72af00c68d6c721c062726dc6 SHA512 f35873f03b177f8b3cf8e46cdd0dc1a11334909f1fd4699a58d87b6aa59413f431733d809a0884d9a1ef7a2128135f6fbb678333e3544bafa0ae2723ed64957c
+EBUILD pyqtgraph-0.10.0-r2.ebuild 1219 BLAKE2B 6eeeeb6d25de6d0d791b760569eceafb34b5a0fa65af24a100cf9540ae45e0d8df327787f80581ac31504f6be32b5695a03e0238c290cdef6b62774ab5ad03fd SHA512 b5742c766f27a517867fbbe1b1b95204c984636f52975a47a070f00c739e3b4c300d7c160bb1558fcc8865b72e6c64de05ab4007b859634c432ccf1b7df2bf39
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild
index 5ec286616580..b3db85104e1f 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 1761cd03f445..da78d5c0c016 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -5,7 +5,7 @@ DIST pyquery-1.2.13.tar.gz 44032 BLAKE2B df257c6116b3f8804627a0b4a6556445c644410
 DIST pyquery-1.4.0.tar.gz 45215 BLAKE2B cb748c09524f6cc6b22c9712370da754495c31b159a44f02e9b5f00e4e94295d7259d224e63066297e6efd74f0b43a508a56d1df4f4150727cd261b959402e9a SHA512 523bc058fc93332b13840a7249bce5a449b0029f6434043a739a2f24abdd89efb314da8795f1b2be2d7e4464a8e4bdf6b061d768b895d0dd1630f44ee341f37f
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
 EBUILD pyquery-1.2.13-r1.ebuild 1364 BLAKE2B b3154caaa87434768e6aa9242e70ac2c82121a14a20d2cd73725f2eee5e481de1ff35c2f64ffdd1c2154301a75fd599a2ff11b93fa4759eac8148c7db7e0fffb SHA512 645e08930f8947055ce7528b991f9157e9495c3126753c4de4dd90f091656b67d52ab728ceb9a35ca7f47b19ff818a5e1824a3387ffc19768688b5b324410e8d
-EBUILD pyquery-1.2.13.ebuild 1348 BLAKE2B 11e2253af94f546d37a36a6620c8ecd2f9ad213e1fce9f5d22df898e3285814db8571d3a3284a92faf791bab2f285e63809f31e3976393a812068c51359df941 SHA512 243c1357a258a992a923d1c6f9b4de14b316ab7923e734f8dac8f4089e0ebcbc9002ee3f398e38f1c371dc3da83460380f4e13f995a48853906566e98b4a990d
-EBUILD pyquery-1.4.0.ebuild 1219 BLAKE2B 2a60926bab54075f9dab50f941c85c80edd26c82f9b668507ce450fe2bc6ea24b3ed910b567508210e2f9f88f8f8dda9ebe52878829043a3337cb56dfcd1a111 SHA512 c1b834b239f0b5993c292cb55a70315ac312b7322cdf9807f8558ff8bc9eb2eb6482da0cbd9fac3ff3e7291fbff775241f10ba9a509e6d39ad36fb721982fa3f
+EBUILD pyquery-1.2.13.ebuild 1349 BLAKE2B 665c2d1975918b9445aa23e3c2634c4ac39324d46b0adbe38680852361dce6ead0ace314fa7153b110831d0cabf9b0703010119b9bc97ef2b36f2fa1ff14aa93 SHA512 03bfb000ccd8e5575b3451a353238535b58dc2b6f8f0d940c981a0a9f44d9e7ec8004e6758fb2e8f6cf50448f8efda420e3d6b96a38407c88e244a015edee1e5
+EBUILD pyquery-1.4.0.ebuild 1220 BLAKE2B 8aaeec62ef8d9d02dadb4ceb4e4f281eb7f9f55b00ee0f2bd536ac0a59b7e4f8962212316e7ff4c9da91ea800e2efcb3ce0b80e756d3ec717b14adaff80f71c3 SHA512 b7df9a1b37b40da59c11105e707d19d8ad25fc9930ba55bce5ac2459806a8ce88503af1a1fa7ff3868efeb69a020899542c5629d4e5863ae714b5ee0b37a8983
 EBUILD pyquery-1.4.1.ebuild 1295 BLAKE2B 015de1eb07641622509c2729e3145b7990c801b535be7c1043ec8cf2e2e1656b40e97a2ebfabd64464579fc90dfb38031bfe9e7b2976c4e5aabe38021dadbc16 SHA512 f170135a90ad26e536cc0d9bba46f400fcaffe1fc9030f2747928ea44fa8a97ceedb4325e9c5df6818a8b2bce2c3bfd381e7a2e69a0ccba4462aad152405cc35
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.2.13.ebuild b/dev-python/pyquery/pyquery-1.2.13.ebuild
index 10c6dcbc39b2..b5b8640285b2 100644
--- a/dev-python/pyquery/pyquery-1.2.13.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.13.ebuild
@@ -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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyquery/pyquery-1.4.0.ebuild b/dev-python/pyquery/pyquery-1.4.0.ebuild
index be3f853162a9..2353f291849b 100644
--- a/dev-python/pyquery/pyquery-1.4.0.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.0.ebuild
@@ -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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
index e7f3792869c8..44cb6816af65 100644
--- a/dev-python/pyrex/Manifest
+++ b/dev-python/pyrex/Manifest
@@ -1,3 +1,3 @@
 DIST Pyrex-0.9.9.tar.gz 255272 BLAKE2B 852e4caf784677742ce6e207d9556b64adaeb72dce7ec8dcfe008f37524890e12017babf74fbd022ef84b6736669692df7d60a9e3b04697c0e30f585a59207c3 SHA512 724b14278760fffb751bd9dc24e18dbe85732f069d186ee89bc9f28dd8f912d5f69492d28e705f55de2db56c343f10f21c6a1c39bda1d7c234d09a3d5e192f6b
-EBUILD pyrex-0.9.9-r1.ebuild 843 BLAKE2B 001a581060fb10c5269330c19db8d55b65948af79b94c01224bf85c0657bea2bae1a7fe81a4ce09b5b3875a17732ed8bfc360f87d8dd7c031cc8a04839d2a176 SHA512 0b45193f9b44f49af756989912846f8e3ea54e71842d9cb5b95b1f3b21dd388435e383b5c242fd4037a244500ba809328c053f1fd71c78eb3f22aaeb31f84108
+EBUILD pyrex-0.9.9-r1.ebuild 844 BLAKE2B 4b6f8d3396820d4cc2925edd425c20a42cd13caf855cd40814e1ea5097ee4626f822d0c574916720584acb918bf113a0d4b67dfa5ff5829e001787f388937bd9 SHA512 cb74a1eea32f462b4a3833a1827a5b7ecbac5140fb43d6bc14739caad587812309f95cc390bb78c824b757ca8440701c641712eb74830709577dc0831e2c63b6
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
index 65c5c140ebb3..cc8d3237b233 100644
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="examples"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 4b3193b21b0e..c81500e46f5e 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,3 +1,5 @@
 DIST Pyro4-4.77.tar.gz 479025 BLAKE2B 20c7b53cea55b77efea11cd7b74a1cfcc45ad721ba45e039947f1d869291bfcb054f16bc48fb5ad21386fe7d47785514ff94953b1bcf893266c2c41015bba589 SHA512 52a9f90cec8c5e23ec30ddb69484a15bb86d61024d1bc718d075e01678a3d9655a1ed21f18da1891c121bf0e95282fb1151762b2fdb826a6408056079d2b1a66
-EBUILD pyro-4.77.ebuild 1457 BLAKE2B 0a108201ae9d101b47e320ba75d81e8ea3b9d7b334e33913e043be11cc535f2dd222fbd7e4980e8f613c85d3b62ab8a5be874c11b9664647cf8efe6bdbbee392 SHA512 f1b5f1ae7f11df03288202e8bf8b06eaeae700ea57a9f6631e5f50facb145a02d10f9fd8723c34bbb9fe58f8a19e95a71906a1d5c324af98cd793d29c0f7fa6f
+DIST Pyro4-4.78.tar.gz 490988 BLAKE2B 0fbd7129557d2b1603176a34106f9e287faa6e1725eeede7a7427c0b975f2c4e136dc4ce1573e826c43211a903fee0d7baca85fb8ae58360da7869a3309a1a2d SHA512 7a95828f6c8d9d94b8a5263c63263335c3bfaa54c5e527bd8e61d2bc00d4cdb3c4c6a92155af189401b892a6729ad91dad207e389ff43ee342a011b95ddc90e5
+EBUILD pyro-4.77.ebuild 1447 BLAKE2B 3f9c2237db5ebdba685ce715fd367994a6b1ff7b114fd1907859abec01109bc1f980eb2b650e425316ed1accc255217562580491271b84523daa6812af51426d SHA512 e9200252f7f942f32805a5589965a4b11570a3549974a1da4bde1979ded1e1123fd363087860607549e354df40df03a96a554829753697535526e412cbbd2c55
+EBUILD pyro-4.78.ebuild 1445 BLAKE2B bd0ea60e068e6b7bf9ee29246e869b0f76194d64e24fc32403afce7214898c3e2891545437c7e6205d217221ebea9ecf8575278c4f931a387c2e9431e3196bc4 SHA512 8b384f3b76514edadc6137c2012872c6b494caf27615b3b0b4707d4a73ddf5c6b0a93b371edb4608bcd2fd73d5e698b7ca9879fcdaa7c05e0fb406630adeeccd
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.77.ebuild b/dev-python/pyro/pyro-4.77.ebuild
index fa6444d38e7d..e381810cd88a 100644
--- a/dev-python/pyro/pyro-4.77.ebuild
+++ b/dev-python/pyro/pyro-4.77.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyro/pyro-4.78.ebuild b/dev-python/pyro/pyro-4.78.ebuild
new file mode 100644
index 000000000000..493fa5c46b95
--- /dev/null
+++ b/dev-python/pyro/pyro-4.78.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Distributed object middleware for Python (RPC)"
+HOMEPAGE="https://pypi.org/project/Pyro4/
+	https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-python/pyro:0
+	$(python_gen_cond_dep \
+		'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
+	>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	rm tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 9219354b434d..be01765a648a 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -2,8 +2,8 @@ DIST pyrsistent-0.13.0.tar.gz 96326 BLAKE2B 47388d7d48841c3a093c5309e20e92619b16
 DIST pyrsistent-0.14.2.tar.gz 97650 BLAKE2B 343990acbd1cd566a410508514393b6e3c4cf074bb2f1bb46404cd64af05a7397c3abc357ecc29fc82b9fd390f567ba4fa4a3c9c6dd52045f40f28fc7eaa97f7 SHA512 06ae1b9d15ac72b09d2fdb80e28849a105cd6955f206472649996318c2dc9915f251d76908a913c02d5583e1e818ff456af496b13fe9b094c043cd2548b2b6d5
 DIST pyrsistent-0.14.4.tar.gz 98660 BLAKE2B 08c6773ed6c8f4951bcddccd1b67ea11187feddb939b5bd9a529f3a2c3a162507a274f5efccdaf7b41a435484c89e42f78f065b4ed4d1f5dba02e39407096858 SHA512 6a2807be742c8aa33e8e244a449457774a9fed9a8a3d5f368f2aa91ca94904d3a8b73faec80a4e18bee48f765305fba4f8f1d2e66153a6cd3975ae412306fc35
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
-EBUILD pyrsistent-0.13.0.ebuild 922 BLAKE2B 2a39e28d71d11f9c0386d85159eefeafc311c00d55272dfa354cb8b6f8c7d30e8c7bf54ab2b8506a6d37a1fd34f526277564774c8212bee1709a2b6a5cd5fd6d SHA512 be61d38a1fed89d02bd6bda2b93467c7edfeb6b5980c93236d7d1253a16f012d6541326b66ad75d7bc4b9ae0453ab54f70d41a214f082e8e4e6ba9772999c7e3
-EBUILD pyrsistent-0.14.2.ebuild 921 BLAKE2B 6fc36cef0a3b37263efc078434a59555688f5ee4eb74b4380affcb4401c629f7003bfaad98f61d2eb9576bb0ee2ded6304c9e9c4ffa4cafdfb52d202e51c2375 SHA512 c4e24a237eb1ee86e0d22c642e4e2edc009828fa3ea09f06e1cbcc6a26d239bf813761bab76a9689cac6ae666bbbca3a5688e907d7ee3b4766aadefca21145ff
+EBUILD pyrsistent-0.13.0.ebuild 923 BLAKE2B b920659fb76139127b88c2185bb31ce9be592e2eaaa7bf823234c1bc58048b724ab77d066884575e1b495656b1d7521883da1de3d8eed3812e916aae58337255 SHA512 02b06db7ba51c4edf9ef37375a918b3c880ad725c06e6f4bce894b6524c73ecdccc8fa3fb00be1541b6c33c588d4c9b112059388ff3ac2787006de53c26ffed8
+EBUILD pyrsistent-0.14.2.ebuild 922 BLAKE2B 195aefda6f0af8d12e6c0ec23bbb1a9cfc8d1353dcaeffc25b9e48cdaf0be16964173e60191a66f9c37c57c7499405dec46fe3327146e0cd95efed55de51e2e6 SHA512 61e4516045420ce9494f3b6271bf1e35fecbc241ec10836b7b269ab8899905eef2f1f3b08ecc286c8957cde74ac9958d8a739f7764c5f9ea10ada1ba129f9d67
 EBUILD pyrsistent-0.14.4.ebuild 936 BLAKE2B 478da20728bcdbef2dd004f0ca36f05e53d3ede982c81a6fd7a546087201023a8a8285c4f11b6e9f83c389d294901799b9bbb9d9d20a8030274b37e8f74890ab SHA512 1e98b843869a0f22c5554a8dcf5b7e0b930ac706fcded6e63d951a4e78c00baa4b6d283eba945dddcb68409f345fb7895b1886ed18dc769c8903c546e6abc067
 EBUILD pyrsistent-0.15.6.ebuild 713 BLAKE2B 03cda956e64721223c68b9f1afd46078e3f55eace3975b5f969ad248e3ee739354b337f5961ad9e79bf8501be2caeaa683786a7bb638441235bf962d435c261c SHA512 fa1fa8f2accd562ef0d1440444aca7537ff92dcf9ee66669a6071e3977b6320a4da6459477a0444ea728d16f1c635f26c9cc00d1001075f03457c97c2b49db89
 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 95c365f23c5b..0c40da0d0878 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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
index 586b0fa75391..e54d3d37ed24 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.2.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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index e320a041f1aa..c7ad605103d3 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
-EBUILD pysendfile-2.0.1-r1.ebuild 594 BLAKE2B 7277293d666be67fd99386306b86c1e8ddbcde3ac946f000ee3707614d034bf96ad39d7e0c1397f545755946036025ae8f371f5d817c0f9c624f28a76f02baf2 SHA512 f7207b22be2c6e1654de6462e147dbb99abf9833b87c429f1730c5b44e7a5ebac24afe428b1b75d118471e5ab4939bcd25e7a5f46e947e0c24f2ae91375c5b00
-EBUILD pysendfile-2.0.1.ebuild 572 BLAKE2B d45a1d803ee34b7f401adb114d57962284110fd1dcde57dbb171e187e310267b50cdf2e2f1c9e322c78a1958105711092988d95366d4d196a3765026b2e05ac4 SHA512 cbe72c31d2b1e8a0ae399e72973206dbe3a992a73b6fe9633998245186c9624e265f04848ea66117d3acaef74b32a628d3af92304bfcc0c6040dfcbbfdefb72d
+EBUILD pysendfile-2.0.1-r1.ebuild 595 BLAKE2B e8d9f62d8dcc142b6e2a64e80d8a7284f1115d55d8bbec9ce1cde0673a6f1b81aa4a7688b659e9ccd0bedc812bff5d08d9bcfbd940d5b6d13820e402cb4597d1 SHA512 50ec8b8c0e5e9121005a72d548e4df9deadd01f1eab77f7502836c8b529a5c733b974d88c35c54ddb1d329801100b1c8aae274d4654f987db9ac30c5dbdb4b07
+EBUILD pysendfile-2.0.1.ebuild 573 BLAKE2B 734bc5f7f9e282ca0d9fd88e41b7809d4ed30f7c6ea1dbc2ec882f2a4951926b941cb4f342507012cbf8ca604292274f87b9e0d6cc30d9c65a828231f357bbbe SHA512 8c403490472bc5f9da9569bf228dfb0cb7f64c588c729c23c2db4333f261c9dca25054778289efff7b3bebb6945161abe4ad751abc736403a8c45a7192f89367
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
index 503fe6217d33..0a955be02b35 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 890cf8b2ac20..f6b36937bb61 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index df0a24fd5cd4..3543750d5cd6 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,6 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1107 BLAKE2B c988fea17067f8087d5c54ea530438148c59f10148a9bdcec2b97ce9a40440ef0d7c68428b03a8ccbdabd9116a7ef6231e5f33661c2a529ed5934b4a610f2831 SHA512 d00cb689965bba7fff7b1d958a6f6add8f15a2e2422d66860f2cfb3a3ade03597cc31fdd4a4d026ac6961de57e7460fcd54a16466c910c3449005e78e35fd3a7
+EBUILD pyserial-3.2.1.ebuild 1108 BLAKE2B f538979b8d3cf0c5ebb219a93c4c98891cb5ce9558712b912b347c5e2133271cc7452f7344ae098a0cfdf22e2c19b94f229898758bf27c249d2b0153b73f5025 SHA512 b4b9f6fcce7c5b12fc61ff7decd0f99ead2c9a0115a40f615aeffbe6a74b2ab089a010dd37d52e3104827acaf627d3ec9e1644e8b374cd59559de9c0ef46917b
 EBUILD pyserial-3.4.ebuild 889 BLAKE2B bc0b14db097ec9a743bb4837b54fdf4d3af5ccaaa2fe71002404b15d4df75f7452c63e57de49051668503d92be08c0dbbabed3227282c1239223837ade469bf3 SHA512 b857691aa348b52d595ae1422d1c38f38ea815edb5355681ebfe4f3f37b0b79358f660abbac718745a1c740692ea47608b581aacba067476428c7f9e2f9cd0a4
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index 5850a3cd9ec2..2e7cc8001cbf 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 69f44dd39f4f..3e46c0d4f6d8 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 999 BLAKE2B 7f6b6e2c7db68b04ba6da552acb64c990136c3b05c35b323637baec020b742eb005fb4fa06a36eef943615bac5997c2c252f4a5e8c2eef16c5392152dd08134c SHA512 3b9bf71e83c403f2b5db2e789b1df338de43576d1167023549f96045b1a525dfe2b2b3560d1569a657a46e1622a4cc49893827af4483da32974e9e4df7eec414
+EBUILD pysha3-1.0.2-r1.ebuild 1000 BLAKE2B cc70ea27ed4c87323b1b5bc0e2e4762cee6fd5fa2dd2010b7c68c853c7fd80a20fb4f8a311c62b0629c483252bdf5e615d202e216c86bfcd696bdd0e9af55a9f SHA512 5d9b483754af788beef0b769eadddb14eef83765358f84cd0f0591285f84967ef4875217d96f41d548396b95b3571514a11ae1191fe6214f23b2b009e950e54b
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index e550539d2594..1a7b0bd8b00c 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-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-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysolr/Manifest b/dev-python/pysolr/Manifest
index 746c8c0d069f..ef977fdff09c 100644
--- a/dev-python/pysolr/Manifest
+++ b/dev-python/pysolr/Manifest
@@ -2,7 +2,7 @@ DIST pysolr-3.3.2.tar.gz 14193 BLAKE2B 855adfa730a05facdd1a0aab529f7e52a3c052c2b
 DIST pysolr-3.6.0.tar.gz 28485 BLAKE2B 3994f1586a16ab8a65013d7412c71581448f15356db077f39b87ba780606d508702e0650b9165b96d2bb2064ba4c03d9dd715bcf1f8e802a18bc19ab3aea69f6 SHA512 15d2599bdfe5b364d0c0497f3125945c8a14a61baca6d32bb775d32fac8a8c2bb9ae46e90e4a08ba144e5f6cc83efba7e456ff7ff617c9af34116432bafbac36
 DIST pysolr-3.8.1.tar.gz 46775 BLAKE2B 978869ec1e65699f61c2c33ebe1448c020aec0dee8e65780727a455e25058be6bb0ab7b5d44559d361df09cf338c0dd8b8db164273dc77da2348b6f5118b9c87 SHA512 34489f32cdcbcb7e8109d6d94339fcb200b1367a188a0b9fedf587a77cd64412570b3a796a4da4e0abe6fa3e443a401c4dc0e4946bdc437dd810fee7eabd54a4
 DIST solr-4.10.4.tgz 150059757 BLAKE2B e0f74016b6a92b4c10538ce816b566c17dbf0f7e68a7f1209bb477a2dcf06153da86bbb86d6ceeabda93d79a8c0595e4c96d873fdca8f0baee5fd58890c84da1 SHA512 f7a83504e0f9a4c81b0acafdf452c0c05fcbdf185375f383450bef4fd478812b5259705b55203460d03da46add12cec2442d399ad3716e4e11c393a9a9a01b03
-EBUILD pysolr-3.3.2.ebuild 553 BLAKE2B 29bc3de5c65c792df8a2efc7c9663e818cb90d528ad106357ebd5fc1b623b8e69adc9f26114df3b95bda90f6495af24ba351487b4aeb63f409b81e7efec4a466 SHA512 0b66e9de3defc9adbc44cf8ac456d96a25a16d46c8a567aecd88b8d62c94fadc23e02d1d10e5dac9c0a57c4bb2d0d70e7448d3a31bba34be3d1ab9ba145eac69
-EBUILD pysolr-3.6.0.ebuild 552 BLAKE2B 3c7af72e673446c3b669431c4f8418e09a51c846e22fba26900ce53fb7daa935e8e1ae927a09bebc8a830c18f03842dd472fe6105d9dd05013d17b7c178f30cb SHA512 97b0c2d6297c25c29e8a2574c825577c61e79aa3ce3e155923d97ccecb7878a7abdb9bdaedf413d37830d13c32a82118934178b7b00e56c507f64dd507e61f45
-EBUILD pysolr-3.8.1.ebuild 1382 BLAKE2B ba1d604fb6779836ba68a6618f6e1be48db6b62489dc308efdcff7c868b3db024c6d40265977c982a5625e12859805c025f0f447dcd4473ac89d126ce80b1794 SHA512 b61b584c1f48aae97d096b0702ef597f4505ca097f56811da42a2a05a848c32fcdb69b6ece147421840c3b6f1071e24818791bb45ff889cfda0ffd916d39a535
+EBUILD pysolr-3.3.2.ebuild 543 BLAKE2B 2ea4c97ed11ffb95ed65a6ed7d20f53f4c4b702b174b86ca016b57788de7e63d720a17d999ce5cd8e87f99494a207e8bf45ed186de383db8bec8ce4a6c2dc41c SHA512 fd2f3b19781b5d57296088a7074f3f9d2df7ae20b541e1458d6cc716f0db82367dcd1512b94967884b3a0c1cb7ba19b46ae731e47f54707885b7edb95307701d
+EBUILD pysolr-3.6.0.ebuild 542 BLAKE2B 423d1c9b028770246f66d097fed645c4352d5dad968d33f3670e91fc0ae85999ce3c085b0e59cae7b328aa419aeb5fa0665a277201ab16014424165668d0306e SHA512 82249d792de77929e95ad13e76a3c25f3555eb3483169f853f5a30a355068994ce9daea7bb4afb2d77755dd64d8b7864b601777b05110c47f60b09be6a7257ab
+EBUILD pysolr-3.8.1.ebuild 1372 BLAKE2B b3d622ea9a65b69624e4afe1b08e7dcf97a4d259028087130e183c992599b9862841c8799a7c732b29fa895c6746baf8defb69008bdd7c062f09f58fde6717f3 SHA512 5614be78b3e8996a81de68d4510dd139489fce1b9a3a221d3662848136752f6f8a912c4784bc86d54a007bc4386f63fd90be3099ed83fff1df303fdffe453eef
 MISC metadata.xml 379 BLAKE2B 131131e4eb19987a2344df67b337646ab5102ad822757b77a5531a1111385ea9bfdc7e84b5f3e732c6f9f42763671628421b4ffaf4ea89d52234a294797168c4 SHA512 862fbb61da30df5733458c4a7267a3973bb7763d83ac7b817c42c7edef7dcaea6b1235de8df382c0ae6870ffb330b990b874b6dc169d4407da172959082e6491
diff --git a/dev-python/pysolr/pysolr-3.3.2.ebuild b/dev-python/pysolr/pysolr-3.3.2.ebuild
index f83fbb66e02d..f5cf20985d53 100644
--- a/dev-python/pysolr/pysolr-3.3.2.ebuild
+++ b/dev-python/pysolr/pysolr-3.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysolr/pysolr-3.6.0.ebuild b/dev-python/pysolr/pysolr-3.6.0.ebuild
index 23075fec2fc3..ca020a0bfaaa 100644
--- a/dev-python/pysolr/pysolr-3.6.0.ebuild
+++ b/dev-python/pysolr/pysolr-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysolr/pysolr-3.8.1.ebuild b/dev-python/pysolr/pysolr-3.8.1.ebuild
index 5ae3ad092005..6cf0302f2fa1 100644
--- a/dev-python/pysolr/pysolr-3.8.1.ebuild
+++ b/dev-python/pysolr/pysolr-3.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index eec3caa9f840..363d7bf4ae0a 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,4 +1,4 @@
 AUX pysvn-1.8.0-respect_flags.patch 4633 BLAKE2B 5063e9491623033155fd59f97ef794ae1fd8205b0588b369395b5e021d40646fd8e65387bd27b5daa95d43f1f573059e88de5cf266b76b98d3d85834039e8ea6 SHA512 e573b995e45f7129b0e52e702ce1793180b7b2c3ef3ccebc8f1b16af9454beeca581f2486eae519437f41cd195c0dc6535c51e9dcef1258dffa57f5a99c4600b
 DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b
-EBUILD pysvn-1.8.0.ebuild 1247 BLAKE2B 7b9611d941e0a1c2c2ee57b8067e9e94e9647d4b67e3c3adb92137d1848174d51bcf44e5b4ae07f7099db0d48c6d78588dd524b27ce97aa9e2024bd7a1e9ca9f SHA512 1ab3efc11dff462b9848a26b6f707c20a4ed87a797983037ce600420b517c2b7e6a64bc05f8cf0765c7404910fc617c0548faa63b4986f8c68d2c8f71a35c5d2
+EBUILD pysvn-1.8.0.ebuild 1241 BLAKE2B ec1f256c72bbcab0bba08b23d6c726d1fb5511946f33150322a979bbee46311e4c7ebda7bb7e1504bbc1e4e041d7c5a1700aae729062d64eb355368539914cfa SHA512 b7d7883bac60e5a3985fa522420e151539cf8d7b827534300d0c33def0eae775a125d56bf0c89c11898b0aa0363125405c9905af03f2a8df562d71d9494eaab0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild
index 2511ac62be9b..e5d65aa19fa9 100644
--- a/dev-python/pysvn/pysvn-1.8.0.ebuild
+++ b/dev-python/pysvn/pysvn-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 toolchain-funcs
 
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
index f3f3b89c7e1f..b9cd91d3c526 100644
--- a/dev-python/pyswisseph/Manifest
+++ b/dev-python/pyswisseph/Manifest
@@ -1,3 +1,3 @@
 DIST pyswisseph-2.05.01_pre20160529.tar.gz 488382 BLAKE2B 3bcea971448b13c40f440473ce2da13ca18796ab645265ae813fed517ca7062342170e0526b48a19b8686ac82526a16654b7c8e4b7d2dcd8e854c116d1fbf911 SHA512 afec6ce93a34ee116ed5247ff0004cf7c3adce33b4e0f95aa251b6b533a8925340d6f6d847ab80dfb2cf75933939d282455e7dc1f812c28ad45a42f21ce1e611
-EBUILD pyswisseph-2.05.01_pre20160529.ebuild 656 BLAKE2B 2e0fb248b9710d2f81e0776b8ca59a3f86dd5c0faeab82dcfbee048c3033845deac4c8c15c099edb28dddfc022f689732444391bffb8168da51548efc5c93b09 SHA512 dc84501ffcd15ff78db2006ec2f05c3e619599763d941eaa665980d42ec14593a882ce1e4f6c8996802a10ff84938ba0e3780576fc88c003ac3d93e71ff1cc37
+EBUILD pyswisseph-2.05.01_pre20160529.ebuild 650 BLAKE2B b27484fe9ee5c07e75d59b7e653600259fbeda3255f1d21233f1c399a384495250b3f80058841e8e5129d8ad0474fe51dca1c1ebd1f3513b752f52f6ef411e6e SHA512 916c42b9c52e7faa119d69a7fead4a9ecdc228707def0d2fd43891c8c7ea2b19888913cf68b12c5317d7f0264e258e0da2e2728688b3f9afe4b1644b25f35379
 MISC metadata.xml 511 BLAKE2B d88458ce79785b22bd75c3b39e845dc0a91cfb30aaaee7780e15b422edf1dd8fa0decf325238bbf34c469756fa31cba346a3cf8b9dcd7659a4a39bc967519f88 SHA512 b81b9b0110b7460c3a308a4a914ad59ccf21e1d5b003c898167b803b57720cb66e29d070d6998a6747d61039be9a364d907e517cee2ad31f7ad533e687d756ad
diff --git a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
index 93becb1fbfeb..a72e8ebba1d7 100644
--- a/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
+++ b/dev-python/pyswisseph/pyswisseph-2.05.01_pre20160529.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 8e74a024d8ba..c26ee52f47e7 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,3 @@
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
-EBUILD pytables-3.4.4.ebuild 1744 BLAKE2B eaba0470317e9cf0709c321ac5be1e1f4160ac5dcd06f6ae20bd29e3350043058492141feeba5cec4523840c2cec4407ef0667ea7bf4fd8dcade709e6504540a SHA512 10e54f260a9e617b27ded9bc496000e6077425083ea9a42cb4abb376f5efde2a0475e77bb95c1baf5c96d56d35a2f967349b8236495d68436f982a926a5f8a67
+EBUILD pytables-3.4.4.ebuild 1734 BLAKE2B 0b9d317bd8a6074c7770f29fbfa8b10bb8bb7b7925cdf95eacca691449070f8a6fffcdd4e7d4258212b58291631aef89070c4b044ebb07bc62540b430969f266 SHA512 8c2383039512ad9ecbbff0e0eaf986dd2bca5781534ed6cd4d4c8ed63072664220adabb3bbe08b6a8ce9d272d92689b37d44d78eadac28ec0fc018dd65c8c1c2
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
index 9b372c3d5fb7..9a5ed1e38117 100644
--- a/dev-python/pytables/pytables-3.4.4.ebuild
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 32e4f7ceb596..70f3bfd7c910 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -6,7 +6,7 @@ AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be1
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.6.1.tar.gz 35307 BLAKE2B 11974ff70ed5609d7db3c4c35f5b528b0ec36b48cfaf06974a090127706e0964841347592ac3f1e086f46800857ee10c05404045b6a4b467ffa278c2ee1e1957 SHA512 2dfd16e013d8bfbe5d14990f419291b651dd11560328a7e59b5449016d51b17f84d4ee3866fda866c3530389d206b1c4c67c84b23f097281c3963ffd19ea8caa
 DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
-EBUILD pytest-cov-2.3.1.ebuild 1498 BLAKE2B cdeb36304dd46840aeda73316031a4e36de2e0b693ddc15daa50d2854cf3a39d48603524d3bd285015f403df1f8fbf4f996a37051562cda19071bd220177ae61 SHA512 d2f2a12196787d731635912e2a709f913feeec1e48129fbc657d9eda496553321b1660570291ae7bbbff29883e029250ea109f18d1d1f7c558ae175cff0c50c7
+EBUILD pytest-cov-2.3.1.ebuild 1499 BLAKE2B 6e4eeeae7b983107d8a193e84ab4d25b753fb2e712e0885ce83a924a7639c9b1425a7f880ae09d85771acefbd73ddd373aa6199c357a2bc2b26095ecb23e4f54 SHA512 3698708bc4a72dce9af380c8db3bb1ee17ef626356927259cf067cad9cbfacc95a0c934c6adc5911b9725b3c2d52fca63ea438682384414df2c49c7e956056d3
 EBUILD pytest-cov-2.6.1.ebuild 1453 BLAKE2B b8cd06dc858f877e34ff505a25cceab2f2f89c79397c8d23a20195405172bcd524389034404dc1f0597ffe49ddaeaeed4814b09e1a5e300aae51cf1baece98ff SHA512 c6f5c465d983315496f55e0632c678a6013660ffc05fbff6c8c7ba0f4673bac2bf3ebb1204d3e33877a3c8628c87bb673bba8b0ec45d56baa6823b5a3642cb24
 EBUILD pytest-cov-2.8.1.ebuild 1395 BLAKE2B 552aa23139e450f9a3be2b18b1480970fcaaf4de0e8129c77f840ba4d93b5ea95b226101269030ace6d74f3a9a4e16adf03e7d8aa5f06c4cf1640063e8da6921 SHA512 8f0036fa0d289d6ed452e0d313ebe5fe8c020b1b45ef7e0706e0bcfc3b6a0a0f67eaa83d8459cf31ff9dd00535f1b16cff56a8d1258b27528e1dd177f8d17785
 MISC metadata.xml 451 BLAKE2B 61b39473b8b03a8096c5e63b8b59098cf1cb07bd5c5ab875e6d12af03b9113c2e0ecc8d16b395e73ea70378a568efcc3ae18d1970004aca5bb4c8a45bb266c67 SHA512 097e5da22a24c3eb0636095b4385bc7102f45968a489121f296547cd29cf9d416264f44b7b0766bb8206d6364ed40408e016790e755f139728d36954cdf5312c
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 076d1c5a9ccd..f3edac318137 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.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 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 3ba94121fb2b..a02cff7cd1eb 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
 EBUILD pytest-expect-1.1.0-r1.ebuild 728 BLAKE2B 87bf3a8a35a152c16133c072603ad5df7e7852d97adc6f775c7cb365681862ef44996760dc6c4aa00c528749f20948532a0638e9abb19a6af2573ec8fd3632c3 SHA512 9502d74f0de51f76cf265578e13a24ac9b8491dcc4a16ffa2e2ef43443d0045b3645b322a657ec23f3b19a211fceb06411b4728202cd54aad4fa5f9d62c527ba
-EBUILD pytest-expect-1.1.0.ebuild 687 BLAKE2B bee99418264de8f068655a45592810767d7edff3091b24d55a6e3e33e5d76062865e748104455f0a93c3429c66d63194709c84f59e09f319e65447900e94d12d SHA512 4fa1118914644eb90726cccee1a320d7511ea7ce1bbbda09f29e3ce9a3669cb39a948c0dc5dc78ecbfb468fa90b7afa90702b7ec1928efcb6b44823ccf961ba1
+EBUILD pytest-expect-1.1.0.ebuild 688 BLAKE2B ae93c2ed2f147e0ff7680058ce231ae6206aa15cf4c4bef00da3d91377dfe67b899363bc7f5cb5bfecc9b7463296f2709bdde95b1601603436abe75e5bf77b47 SHA512 1d2946e6292e7d585726d8d06b30aab6ce23f14f405e9a718a84943980333a8d03dde537a0db0098723d9894e3910c9c6eacf6f26af3c15c2dcbc2588f197e6a
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index 9469ca60639b..b9aa95d1acc5 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 4d591a4c275f..308140fbdaf5 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.2.11.ebuild 759 BLAKE2B 921f32103b9dedb2d51d9e1df3632ac06e07d9e75db17f780c774c639e10fe1e8f41487534d0d3522d352b62a5a07dc176edbd3eea12a316c213d2b41762346a SHA512 328f2f87eb4211fdf7981dfa04d99a06bc692a0fbaee74929b47c4ac5314b79e6b781eec97a67fb1521b8790ba402d6c7f091354036e62f7431bf154e91ee3e0
+EBUILD pytest-fixture-config-1.2.11.ebuild 760 BLAKE2B 1000fc39cd91893f88ea21fcf1fef3083ce5236709da5fd22ef2468f06773d279fdfa715cc7f028ce4340ab5f6d0c83c7c70da9f2fc575c5b3dbf1c5a6546284 SHA512 e8979f34c788fd1eed22b5e65cf7dc4f77f18390b84c78d40ac6a184cd72954831ee77d6aded167250a3a10a674477677ead8135f8142bc47c22e04aa6133ef9
 EBUILD pytest-fixture-config-1.7.0.ebuild 713 BLAKE2B d3315a0506c04e35ab441b526c46d08b6d4d304a45533e7fff7c840d7546d4b4ee54095077293c5bd18bfde9d53d0b63a7c84ff5fa4b862690793d1512230a0b SHA512 4835d8578ec7b124776dd2433728ee1e2f4dc2c46acfe02a18e48fe185ce29f9407568d59f1931524e8f998520536007d2567838671c5fc17b9e0092559564ad
 MISC metadata.xml 578 BLAKE2B 5beabb8f2090baf84278de31a3db0f16af516fdc5f2952b57214a2fc6c7f3322c539d904d42edb5b121567b1d116f7c15bba75146207dd952c38498a4328effb SHA512 6e01fbba94b5c93f444b4d6b30f1e06c2b60367d59f5a86167e1e652c9d2a750a087f202798802260312dd1b6d217596072135df9ec37513fb66ae76eec44c17
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index a3f002c1b550..e876418d8444 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 8034090e2205..7e0946960163 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-forked-0.2.tar.gz 9617 BLAKE2B f306c968447b73ddd606f7929b730d222f30640544ff89f6e3e2171ec3b0e98877e0263fea6564d943789de6daa1c344022f001ef80ca37b2467c1b9c360eed7 SHA512 5e84fcaceed46ee9da8eec051e72acb46f09e2df3458511651604c35d68e3ad06fc41d52578127fd29f0c216dcb5fce1844c614f10501727cbf8fa8f2316f231
 DIST pytest-forked-1.1.3.tar.gz 7308 BLAKE2B 70711228a5a815de23cbd07b2b628e336a26ccecf420dc9d30d9e9b7ed33bc362b0ba74a8f90fb7cb8dc9e7e0f61d2ac22da55584a84e8ac3a26fcfc2878a802 SHA512 2086884b0e78841b3cdf8eb2b144b8fa60ba95e4be79bc58a2b5775a5f997dddef59377f7c993e54974fbbe13e73fe8688eed4d035e85293e35a143c5f0180f3
-EBUILD pytest-forked-0.2.ebuild 912 BLAKE2B c0be1af9ab48a07f51e925f1652b255562f18fb6f3cd2dcd46898371fdf71d601c570bdfb42ae3ca2d024db8d3c86d956a27767441ac55cbf118e34ac122e3f1 SHA512 d3e57b67d1986590ac91feb189db8b51d571c0498becfc105c18bea2fca8079b017ebfc7f7959def4a37c26bdcf8629711cbf14e2b993db04d1b3562f36abbde
+EBUILD pytest-forked-0.2.ebuild 913 BLAKE2B 3d5974e530fd7ff26400d1612ba6cf2c69f55477749db1341992e13d585df72c055771aa5af5b9cb019247ea6adb1be32f370831181efdc1bbc68a26883de822 SHA512 c2b716f9a148d637372d36dbb6695aff77e43843f22c27098dea7cd2326467d0d6dbd055d3550f8db359fa6baf60535f0c6965d11a838cda3b7685ad2347147f
 EBUILD pytest-forked-1.1.3.ebuild 827 BLAKE2B 352d77caa194843e01b94ed1ab075628f28b2760fd237d20073a2ebdeec780fdc96c76a4c19c49e3c65fe93a3aea85c00198e757c9d363c0be0e1ee716011bce SHA512 c39d79a9fbb57d4999ff9c468838630ee5f4af88a64e934b46801f5e361c277f951f5576e0f7d9c34bb41ffaa30f5f05c161253821d4f77773270561d351652c
 MISC metadata.xml 380 BLAKE2B 6cb0f7646f94dcda5b7adcd074d83ece86cf7827a69ecbc87adcd273289b777cb12acf856f7068b10b9b3ff7a0eb5746c7cd8f7d8acebbd4cbe9cd1c5efd4ca7 SHA512 9106660bbd3a3197a9beb92d5309d3b1be687cd30f81753364556b2db1aa19e94237c30f2e31a5517097595033fd80b774ceac44cb09c7850a1f6a1eee6325c8
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index 3480a1c8dece..b51ba707c759 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
new file mode 100644
index 000000000000..a72e16442ba5
--- /dev/null
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-lazy-fixture-0.6.2.tar.gz 7737 BLAKE2B 5257a19314a1c9bd159222a170e96db12e5f7b99d2bf83fd2db94acda9726f10997a81239763d8b0d5f2b9f2be6b74acf350d996cff09cf413d3a8ac76e2d90c SHA512 d8d159e936937f4b9364e9be7fcb8228497849a1ef342878ecc8471cd3b06782d2c6029365fd1e02f1ff89eb048ccae625b8697dc5048b4dd8fa61d839ca3f36
+EBUILD pytest-lazy-fixture-0.6.2.ebuild 538 BLAKE2B aa39fd100917d7524f451e7b20009b1e65a319e0333c4a23b516b1ddadc03e2ff5a8d77d8d1af1f0a35de3fbc9919333dcac1d29b43671e97161b29772b62ed2 SHA512 b85a5d83d58ea87c938c49a54477a397befcfcbdd8abf10852412d25a37a3993cef2ccf31c096ddfdbe8f8a12ad5f575b7480c9deb223ca958884184d62812a2
+MISC metadata.xml 387 BLAKE2B 6fd0bd59ab8f2f63eb2c2e157e043cbd22b26a4c9e883fa9f78a01b0b43488d1873b4ac0bd69d8c2d24f21fc938ce703942c1bd0a1766db4bc993c91d9a3eaa5 SHA512 207f63c3317663c51ca3e6abdbeba25a08a2b8956d8d80812574dd522630e4e1b5ead010c7cf933bb02e356d59bcd9ec8ee39d1eb7af823b43a194af2d953646
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
new file mode 100644
index 000000000000..443a7275aaa5
--- /dev/null
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.2.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.2.ebuild
new file mode 100644
index 000000000000..de6b1f46fd90
--- /dev/null
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
+HOMEPAGE="https://github.com/tvorog/pytest-lazy-fixture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index d4c135167dc8..72c84c09a5fa 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,7 +3,7 @@ DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
 EBUILD pytest-mock-1.10.0.ebuild 1046 BLAKE2B 31d2747d8df4599de796a5d9bdd1b7836337bfc70dee6326da93d37ab879c22a23dc64599a2b4bb100c6a8c0a95e7ae4d1b58183a58b5a32425e1eb428e351ca SHA512 cd4ec2689198202824f75370c9b08f520fbd29ceba9ebeaddc18f5d2335ef02c1992f11688322f31263dfe8c9df77282f207e53de9649260711df4915fd3d091
-EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 39a3e10c20f40e0460dd0c5a5f5b1b2cb480c5652f71500c2d2f3fcff668f797af6701f203b3fc9c4edfc5ccb3079400744e1d85dc5f8b44ce6e08cdb6c91cf1 SHA512 91ff90516717d206967352e17b53a190d3d9cf7d45c794e2485bb9a62953dc853fc998b562e58e75f6b6b5042a4380e74f34404ad1de530e3589a58efc2cfc48
+EBUILD pytest-mock-1.11.2.ebuild 1454 BLAKE2B ca49492fad98b46f59fee64e388e9314879d3069f1b8aa435f05ed271e08313fdbca69ca2aefbea7f20299bec79a4f26efe5cca4ac978b5dfa5f2b265e71b72b SHA512 4b5b565dbbc8d8bb1dc10b9e2ac5b6f62cfaa6f726f47ac73a865c9d3a8bf564631d920b80e14a75559ecbc5fbf58a15dd2ed46881eac84da4d797268e2770e4
 EBUILD pytest-mock-1.6.0.ebuild 992 BLAKE2B c830ed45e41f6ee28ed7caccec251fccbec6d12d387993d22ddaf584c9cbc0e9b7be4fde2bbc538fc952407bfbc1cc2569919d0512aff1862d2b4cba5e1deba1 SHA512 5081ce4e0e2333aa54413f6d3c680c2ed3ecf673385f3a037b178736896b84774fdb011cdd5a6a29261827fd9212eb7ea71076fa4764d9066cf3e777f5feb2f1
 EBUILD pytest-mock-1.6.3.ebuild 1046 BLAKE2B b7f09c9ea65dee2637f695e56bc8b248baa09f22180458681dbd60fda8a9c6130b324fde44a2c7d8a1c7cf872173fe78576de0b310d8e55c93da24588a443771 SHA512 880dc8ee5eeb892647929544d16af0210dd7b42b6a74d0e8bb2a05c8320b586ec59acaab0a2276ff06b38f9ac51dab3f20b2c01087ea5c2ccc5d3b00a9f9c0f5
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
index 60339d3b6735..9d438f900a95 100644
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index ecd9cd3aa516..604959fcee41 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-runner-4.2.tar.gz 11947 BLAKE2B 97495bead800a81d879659f1ee522822f76fe8ac80579537d43e21e663323d7c10be8d2da7d05ffdb0931145149d8c10ef7c72b3ab4da2ce856d44d3f00a724e SHA512 278da7add27f77134e63470747ffd9fe663d93ab8e7cebfbae98902bb1d5ffba45277574107f958255251cb9e499b85a0db3e8173f9f10fb31d1561ca709a379
 DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
-EBUILD pytest-runner-4.2.ebuild 1053 BLAKE2B 23ddff0ba9c17ef75544b305bdef3dbd6939b27b3c698a0276e8c371597b76c4f5238b0b96669f2cff91f1ec817f9e56a1e110e52eef06167f6878ca8f808554 SHA512 699123d3d4feaa302d8c16a2791fb53cf35596d9d31643284a43590e880e624f1b86eece260f24abf3202ccc37a9e3773bdf39dca0850e6a63aff9d804668bcb
-EBUILD pytest-runner-5.2.ebuild 935 BLAKE2B 38b2dd7aa56f712e8d99809a8d6bfb44f1c7fce0b531fe1fea3cb8f0fc588a9a05e45d72d1b146b9817271abf574975e1650f8e902a392cdb674f8d259f2ca44 SHA512 c180ed5d52928def4942787a5387e7af78c0fcf7b06b359b7359f64bcda41754903d9b83827fdc033a4b8c1af801d2721acb559d604e469c28696727488446d7
+EBUILD pytest-runner-4.2.ebuild 1054 BLAKE2B 01912a0f4df623576a18032cf1d5bcbf4ebff6d5e6860ec17d858e6b15dab777cb172c23c7cb4a64b1018c06da869543619be3af3dd5955858b0a8a85c2feac3 SHA512 d172e79895e7af732c1e71185f9010d2d9a68835b4c6d333cc2e7fac9b0c71b133098873e63aca2ccd67af7dd7a938572b0b6cb383ee152cd67e6e8b8c0a1d17
+EBUILD pytest-runner-5.2.ebuild 944 BLAKE2B fbcd3ba08ad7f40ae8d18fa87db9515cd3795bcb27a55003e366a153818bebfd0e787dc091aa464b7cc7a1e523f5271ae44b9886e22c31ef01e5eef10c43c4f4 SHA512 a98e2630011c40a94538795810f136b467758e1792b401dab0cc0f8a5b1131e8adc8c9c8879ee80e273dc49536701f6f5b83b7d4ba9372bf2208c75c2424f9be
 MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
diff --git a/dev-python/pytest-runner/pytest-runner-4.2.ebuild b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
index 30aaa4ebf5f7..d3062452b42a 100644
--- a/dev-python/pytest-runner/pytest-runner-4.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-4.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
index 353d2171777f..26b4b629950a 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Adds support for tests during installation of setup.py files"
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 583b40c31ae5..8bee87079553 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
-EBUILD pytest-services-2.0.1.ebuild 1174 BLAKE2B 7484ff7004563828f666cdf0c7f8535f8fac9b9c6e297e53e6c2c8a6d9e79e7ca1a677f108b4cebf11998806f49ec34ddc29d532560ca32eaed0163236d3bec3 SHA512 743c3e1f720043fc8bf014ba8683ad6799bef3816b030bf5b0a23ee10d388a65fca403fd15d82e090be5c42881e8fb2e176b99b5194025ffa8062e8dfbdba917
+EBUILD pytest-services-2.0.1.ebuild 1179 BLAKE2B 2b910314e5c8ebf23b2a262298384a13593e14ca4c97e615498dbd561b9c90ea5a46a835517135554bfc61f42395ec2fd5f98d1c01132fede0b4833b72113212 SHA512 52f2048af23f3e28a4e81f2147a76e417f99c89d1d3fd233c5144252d9b000db3bae40a6feded87c7bddc3e8f8ee93890de3242540f54490c08524d36af24bda
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index bd37744da836..37e74ae7b5d5 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 5ad2346d7e8d..b0ec1d5f210f 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.2.11.ebuild 1041 BLAKE2B 6f3b9c87573bfee8b9ef034761934797d9c239620e7eed9971855ef74972ec2c7ed2540f5c979101aac726a1971180874fc41e18fef6efa791afc18cfebb1376 SHA512 9e86d7b2a7a92cc6973f8aa18b550b70692bd258ff91e73a4e50565010c68668b8824b9fc3bd47afa9208e0d40e30cee5fc6bbcf94a45065b5979a97bf2f0baf
+EBUILD pytest-shutil-1.2.11.ebuild 1042 BLAKE2B 16c3ce4f485cfc16d56a8f3bcfb89ebbd359a5c322c8336eca4d64ba8fd240f144a8009ff75fb60f3eaf548da1acfacdf56fa1fbc366cd8b18bd74c710e9d939 SHA512 c99be97b60006758c577b44304a127a57e0212e276943d8c9c2f496864107ff0ec2828bce09b04d7d1e81725fc02eb5b7fa62b2100149fd43d360a97fcc418ac
 EBUILD pytest-shutil-1.7.0.ebuild 1254 BLAKE2B 9a9ff6423a1d47aec927834e8eca7b025a5b60f0f1f3819e0aacbf5b83324d8de4e346d6d71882a8b1fbac309527c28a6bc58cc7ccde7abbd790de28767f047d SHA512 50af92f26344d099308fe00e4d7071f6adba58b4c35792fe72d8fce44bf33aeb9bbefb2bfecb64ddcbf8dd808658af1b6e6f1db33e7c21af51c21c27cd5a97b9
 MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 2a57a34b426f..646870bf79fb 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 978d60b93cfc..7b2a02f1be2e 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.2.11.ebuild 893 BLAKE2B 31c0b4adaa7bf9b529b57d9219f6f924f761bb196d3545aa1a6c6244f957200ff9657fa65c2ded24f662124a0a3cc0ef9ed54acf3c22beadfeb5780fe7006129 SHA512 8db3170852d84f78e543686bcf23ecf2811f67f010b1490be3cfd5eb8819cb377b928271a0c8899c014bd4b13167962cecf62a4aad01018a88b7b48e99b6eee2
+EBUILD pytest-virtualenv-1.2.11.ebuild 894 BLAKE2B acf0cc9fb6850632f622908294b5b2e1f202219a1b77b6b8916dde802428a6e8ab113a1c168e715f39e8c36064a6e56d6b054490c2afc448cb30959dacf4348e SHA512 75cfcdc7b321097ee1515e7ff694a363e67fb8219427a263ec17d62ab32a4c5a65e21c0355c0322dde4881c4e5dfe12763df54627fc18c359accb5997dfe7223
 EBUILD pytest-virtualenv-1.7.0.ebuild 762 BLAKE2B 4ae7ac09ca02b56edbc7484578583f6b3f6e8fc6d3f66018757d23a07a9a7cbe22f4e659472338091ab5e2820b4f77ca856232b2e68381973db50c0eb5cecfdc SHA512 03a182a37de21bad121233f1d77a0c2ce0eb4a3a0bb8d083ee6ab24fcef99ac4041077b573ff3ec5a2e6eaa8a02bf67ad099f6deef23d6ca506d82eb98b0867c
 MISC metadata.xml 606 BLAKE2B d6e2018080e6c9a166106a28ce2eb806b647fb0f5755b9dfacba36475968c3cb5131fb553e76c910b2e480b036ce22e246d78dde1c811ed6e65811e36f635057 SHA512 e390b6d7cacf40a1942892b5541c217fe33709ac80d49def174bf5763719a4990147a7fc31d331df79953359055d5b4e38903735d66bfdad403bd13838fc5f39
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index a254031e2c1a..8b1201bd5082 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index f1cc119d5324..49209ebc5e99 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,7 +3,7 @@ DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f79184
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 DIST pytest-xdist-1.30.0.tar.gz 62286 BLAKE2B 8d6a79c123bcee81751f2dd3a87e1d8effc82ff48a701c8cf0014292e5df575136d25847794c8e9fc94eb88a37cb42c659a142212faf30b0d1a0b1f9f948d2d6 SHA512 978b67df2366d916db62af21f2c610ac5d2de43cecf3260ec9bf52f904098514c3052ce8ca2195c17addd4012f3c5d38ce8a701d26c8158142a821b0d0cf9122
 DIST pytest-xdist-1.31.0.tar.gz 66133 BLAKE2B 79fe5f3bcad3421c1c751ffe6e09f0da42d4ff7c0016cb421ffabcab167028ec41ccfb02bbb275564cd74b13ade8d6e79bbb70b34995f3bc9000604a1533df9a SHA512 b7960d20295232b251c8ddcc5a3b9d6e7b761d577ba11c2647b4b4b410ee5c05998cf57fa57208561eb3ea7c4914db1fd446173794589d8c8e8e79ff8e0ad3aa
-EBUILD pytest-xdist-1.23.2.ebuild 1040 BLAKE2B d7b2c373a68f81507f411aa3f458658d5c63f38a39d01a6dde018857f7ee9c0abd0d601607d5fcda7bdc4d8ab9ad5d2873fd7c32bf94972cfe49b1fa04cac9a1 SHA512 11abbbf41401e53024d34be92c63f21797ff59762aa76b305c6c38ab22d8df8a0d910ace8d278146130591d98738ec233eefebd05383002fdf1c0ef9a4f522db
+EBUILD pytest-xdist-1.23.2.ebuild 1041 BLAKE2B 81cbc1659c66c8cd568f994a4c7084edde67dafae6a12d390b6bf62189a1e4a9ae6d25cac4429128032c3ea9af9ec124da626b536214bbd2364c21f7c92d1600 SHA512 74ec451bfcef44032abb9b1c031d63d4e4562ca00d95ce19e095b86d8f5965a77070ef71a62dad6dc49a99dc34539519b15e547628a65e2619aa6d3bf08cd292
 EBUILD pytest-xdist-1.28.0.ebuild 986 BLAKE2B d86f45dbed162f88fd5b5e48ca031e922a95fa49a0d87b8eefc8686267a8dfa884bf202e0caa4c9d23dede106c0af69b05fcb119f8ee1feaa43ad6326308be79 SHA512 6d6f25f9cafe11725bd4403bf4fc5188860e29c0b70d05896b1198d93750e71cafdb9726eb046ff31fcb1aab84621e5dfec0c69e37e278bb2960abb09e6931de
 EBUILD pytest-xdist-1.30.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
 EBUILD pytest-xdist-1.31.0.ebuild 966 BLAKE2B 16872e25ce64a383b3f5c48297a10373f0b3e3e47c21ba22b3d024dae816711da4b1dc670f1d49ad9423ed459d0e254581f3db16a5a3e9ce712b8897e30c5b8e SHA512 578228d144d5a47fc64d68833a5997f35d06c707ebedd6e175ebd3842dcf4c0453e9c6b05deee68e724d80dbf298f9f9672abcd3d9d2cb025be001682c20b804
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
index ce4fbdd49ed1..919d32d358f3 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 88afa721e96a..44cc63798b7a 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,6 +1,8 @@
 AUX pytest-xprocess-0.12.1-pytest-28.patch 1245 BLAKE2B 9d4e8aeead5690a3461f4377a2215ade77929d55aa3f8e842da05fcd0269f94f306d527acc93d56573e4c081bf0a380027e37223e4bd71e3a45b6763fd8d71a6 SHA512 4b114f676ff83ad019402ba7c84f2559e267c45b8aadbcd647f99b962d484ca176f59db6e98db297583f37f9560c5cdf54af9e4bd7ddf36225ce126bcecea134
 DIST pytest-xprocess-0.12.1.tar.gz 12078 BLAKE2B 30c3c2b41e79b79c5a18911c325ff273b80c45f29d269b96c4085c0c78a6897b2064eb1d2e83f9c061c4663d2f52d88230d9e87ea2ba4d114c6e04f42aa50a5e SHA512 fda868a12a056070afd5838c4bc466b4906a7138f685d4a0e6e0adbd975e5a1a2b9b37b8de36a45fb700e02ca14ae219cfe29c467f8d03e55d2a375a7efc9927
+DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
 EBUILD pytest-xprocess-0.12.1-r1.ebuild 837 BLAKE2B 54ad1fe3a4864f42e906728d0c017b692d9d9d737d24c515d852252fb48f8fc7e5368f35e14aae64429097b8d887f4716e06b6a3c76f7e07bd9c0a58a9da4c4d SHA512 c180a661f56a9afbfa7af04ba8837b05ad11706b482caa949f023f569c2d54109c6ac8af8d46438da096b5f76b1a2fcaccf2ea5bf18b95fadf9cdf92a33e2f4b
-EBUILD pytest-xprocess-0.12.1-r2.ebuild 840 BLAKE2B b14de3a86d2a68449b5eb7a35267d2af4cc8c0fd9e9344a26b369c75b7556b705e686afda0f4dda84b6a44f57b423b0ac515850bc715fcf9fa28dceddd15f20e SHA512 4cc2dc8d376f1ced0e7508acbba46fa64afc32aa18492e83c3b626b9d8d82fa7ee7b80113b038258e8067ad6d27bb18e3d45bbd26de0f2eb96c8914be5ee0491
+EBUILD pytest-xprocess-0.12.1-r2.ebuild 853 BLAKE2B 7021741302fc7d5275beecbe6b53be606bc576919f0d25827872ba2309f7a0463ff122e2dbe8dbd6e77dea66f1cbf741edcd58f8db82248cf7e26daeb57fcced SHA512 d3c8da5d823be5bfe0fcded97a346f8e9d6d2c3e4e363497ad934d6896aa3982ebff861302f099e9370e595e284654f638e8e7798b6115d2af314ecb9a2c5df6
 EBUILD pytest-xprocess-0.12.1.ebuild 860 BLAKE2B 6b85ebe03baa1413f5e80982efe69e23f66751b02ee8ed844ae08085598abb13cf8a93463b7399aa0279280db0214cd064f335dca63f1b1c11d619c5342957cb SHA512 ee5f0e1596bde058b1362c31da79a4667eff3219e906c5d2bbf1ff060f0e5ecc253c21d576e06f2fccc19c4f65b6015c324eb71a1ef04f8147e250543e792ed1
+EBUILD pytest-xprocess-0.13.1.ebuild 653 BLAKE2B 2aee997d560df26b5d1cbf05a770e98ce691f793c59fa1cb067aa5dc67760a4e0264a495dc8ac05a18feb67e6c8399ffe9c46b388d400ea69c04fc168887efc0 SHA512 663031001b275ad44579dfd2d6dbf15ff60edc892300163b742ef530397ea81f7eeda1b4014e7798e8fe43af1d4ec32deb9000725729accfb1a2db8eb22c66f6
 MISC metadata.xml 399 BLAKE2B 04dadaab28761796767c7a588294f6a8ea34cd665a4ca6b26dad8155432e12619f7d7825265df05d1457dc1c09265c1064efaa8280487d8eba60f1629798c648 SHA512 ae6d3628465eac8e46b14f8bb00a46884f07e85dc3246c3f3c1c6a85e178c7eab35511e583d08cb3b036f5ac28c8393dac90cf470ffb371a74cfd883a5978830
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
index f953393f04d6..1fc1b92b17c2 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.12.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
new file mode 100644
index 000000000000..394802f3c64f
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.13.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 734d3c87c10f..a3a9ed1316a7 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,16 +1,12 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
-DIST pytest-4.6.8.tar.gz 956062 BLAKE2B f28e3226c7dfe4188168cfdf9623c96d0b274a2476f0d3132c24367e4566abd2e0b496114f229b6f26ae53a67d1ea1f9cb64795f4f9710fc9fe0852991467aef SHA512 b396b200a8a13ec9df8dbc4dd64bb05638b26af9ad6b24cbea3c3de4d806665b63a1488c7359b12c5634d014d45b43c8c208f0e329c62266882a87c492e80b58
 DIST pytest-4.6.9.tar.gz 956816 BLAKE2B 7eaeaa0d47c17836a35d9cdc97663f8ef65253099b21d60a7ffc3655d8bd93c6b4e33045caa6c8ab9bb8b920b93e596ba86d8eac4ab07b3b7a5989b38312f4fc SHA512 ab45a8662aa798a6ae224ad2cd68e043c605e4830c76cb6c6aca3cfccef232c024cbbb6c48c9bae19148099c339abfef3270a2208cc7e5c37a10b34b0aa6ba79
-DIST pytest-5.3.2.tar.gz 995560 BLAKE2B aaea9d89e884a82056eeea3068c70604c73d50c96b8d78c6ee14c67bbe066f0e6d882c1b8f95539a2338d6739e047680d901a9db108b1923fa4d3d03dc3f2115 SHA512 2ab39973848d2d4693edd1dbd7ab2798b574026c9277bddd4a18e57aec65b3d93de201e87f58eb26030183b5c71818e6e56bcc1cda8c50892546cb1c04d6984a
-DIST pytest-5.3.3.tar.gz 990948 BLAKE2B fed1d9386aeec587134ac2057348cf59cf554a0fb3d4ff7251917662eb52e914021d17890adc58fb40f06382e770f0e22c2db8abdd0d27a2005f187daf1eaa7f SHA512 79ac431f6a965d00431d3fa8353c756166d88628acfc254225f495bae9ca5f9e78a0282156a1e523b044a18da5fec9925a1a2aab5fcda3bac39cdaf2dee7be36
 DIST pytest-5.3.4.tar.gz 990897 BLAKE2B dd6f0a277352dd72e6348e89813a7df50aabf9ee134afd69412100b87a7898128ec6b17bf29082c88554b66ba5622b7e0b9a1338d6b740795f33055a9279cfdc SHA512 562966d74d2ff12715ececa46acdd49de67f5e792687d52b3f53589f6dc6105aed09bd4c5098989d70b8a69e6bb4cfb9c0b1ee7e9cfc8e8252e3ba6b4d39e4bc
-EBUILD pytest-3.10.1.ebuild 2439 BLAKE2B 87a014393086daafd595ea8e94f1401ed79628b8c5e0a0715944e087592454f15a56eaebc953f1166178acff243701add12e376953999c55327f4681423ad067 SHA512 7e83d437cec4d3f7e0d834595dd1de605ed152e1f90384163eebd1d09a7648d43d872c623b02433bfc743bef8370973444480a97fb19af786806d5cb3c200ed6
+DIST pytest-5.3.5.tar.gz 990935 BLAKE2B 257628ca9bf7b5e17eb54d868f37fc18a6cc43e66e7ec64581aae0faa8c92a9aa102f011e3117f6c669fc3dfa27fb884c2fefea6b0771fa0ed8999364bc4e149 SHA512 14877d67aef83d498c8a2917b9633bda317948fa889100e6d1a00547a71f0bfb32d8a01506e97bab6372bfbae17a03aa21bdad8d81072a163a5c9c042498a3b3
+EBUILD pytest-3.10.1.ebuild 2440 BLAKE2B 1387677713282155a15b2f24e5ed62c070cfd00aec9629771cfa655b5dff25a7c6d5461f28ec3a3c33804eb7f1943e487bc8516d817bc3818a453250eaa216ae SHA512 82182a05a96951ddc874756b0dc576c7058762d386f8332c8150bb181103c7c95ea7ce3248646193f049fb182f018c614210a30dc2990d7cb626a630d803a593
 EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8
-EBUILD pytest-4.6.8.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
-EBUILD pytest-4.6.9.ebuild 2272 BLAKE2B 82dad69a74cdbcfc4ba788c69c7718608aab9e81eee8b0f35bede097597274ca5ab3280f450d6c71aadf8837fc4d0978e8cca2df83ff372e121acdb78000f8ea SHA512 a4664b2de0c77a2ac0046684cf77646ed6638d6faa07742e3662fb0273b9bee40a25dc50b82089ff97745efb8064c927eae4a7b609ec0107f6293efa7275d365
-EBUILD pytest-5.3.2.ebuild 1793 BLAKE2B 393b1a8d230062d04091436d55d5819f7f038bbc6eed96935109e7f6a42ce3e964e2b7069694ef48c7340c195af7d7258c554e8ce39b247bd8cdb0eb82266400 SHA512 78c659615a398d6e7a98408f2785f161b9f841f277050e952e96aba0817e82fddf456e1ca4da9d74f4c37d193733d05c0ff11d2f16fcaecbb383a62818239c5e
-EBUILD pytest-5.3.3.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
+EBUILD pytest-4.6.9.ebuild 2270 BLAKE2B fc957e2a2e4c9cfa7be3f8ef7e7dc85461844b7d23bcd9281361438b596f4f8a43066db226172db2bea1ac70f9158effd195d5128fd5a70637d080f4dd101cff SHA512 447b20a6c6f7a3eedd1b78144a02b92883e53832d77a165fe90fd105538252e254297f24f9611d823fe8a2ba2f6169927c4ae0d35662b7b9bf9dc512f290c30b
 EBUILD pytest-5.3.4.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
+EBUILD pytest-5.3.5.ebuild 1785 BLAKE2B 972536114ee0e21d3c1bc8bd26e8787df175cdbe2b41f7937c1199b62114b07afadc5bc1f11adbda476862d721a92df05c547d5dce8adb71ba3bdd81fcd7a1b6 SHA512 211e0398d2f25d9d5ebb6d836549e725dc27cc4ba32637218924fe5c13a3f45809954187e89a7c4151b2e25b438608acc1895b837888acb6e58ba2ff1a9d0e47
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
index 622bcb9bb453..c4d2de67cde7 100644
--- a/dev-python/pytest/pytest-3.10.1.ebuild
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-4.6.8.ebuild b/dev-python/pytest/pytest-4.6.8.ebuild
deleted file mode 100644
index 5267018ca93a..000000000000
--- a/dev-python/pytest/pytest-4.6.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' \
-		-2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
index 5267018ca93a..19a7dd3c6333 100644
--- a/dev-python/pytest/pytest-4.6.9.ebuild
+++ b/dev-python/pytest/pytest-4.6.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-5.3.2.ebuild b/dev-python/pytest/pytest-5.3.2.ebuild
deleted file mode 100644
index 3d6a7a5ab186..000000000000
--- a/dev-python/pytest/pytest-5.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" -m pytest -vv --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-5.3.3.ebuild b/dev-python/pytest/pytest-5.3.5.ebuild
index 1be7d663ccd2..eb0ee3e12587 100644
--- a/dev-python/pytest/pytest-5.3.3.ebuild
+++ b/dev-python/pytest/pytest-5.3.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
index 5f256574dc0e..31e6d2430f46 100644
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
-EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 569 BLAKE2B d8762fcea04ee47b356567fbcc6e793801ddf5eaac27594cd7338dcf2696925104e12fa15840624b03e8cf5621edbab47b4d314f4c7458511c2e8291e0692f47 SHA512 f127be2bc86d0fa089f1a6975824690d59a2e52e30a86dc53b7740d40a9c1baa50bc88f60020221ffa3590c69ad9ce9dfb538270950f42cefda3a836ce954d47
+EBUILD python-axolotl-curve25519-0.4.1_p2-r1.ebuild 559 BLAKE2B 90340d8b240e946608e292900c91e83225d4d69bc13b30a0de5e5261c5bc4989671a8a7453eb411d26c919eee12d3bdee7013668e4169965f52ca1785be9a7b1 SHA512 fc88d06fd1eb18619239510744d22923ff12ea333fa9aaab8cdc7f6428b359a766b6eb68c53b04918172ca6ae9047528658726935efa552594844c96b0ec38ac
 MISC metadata.xml 758 BLAKE2B 44d2f74b77f128d9a539067c204c0fe8463f252c9234dc57dd10258e75ddcd9667876056dca4f838164cc64bd89a54e2d4de100ba21df2b5b11f92087ab9d08e SHA512 a6488a0bdf2401098547a3a48529e91bc9dd0144d4b24142ae37470e703a1fb9d152686bf908522eb44b3935c644357d4fb8d33285a647d3fbf1da6056f054b9
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
index 0fcf7416e0b6..6bcd18abb008 100644
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 2c488f8e2230..0a8cfa370ac5 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,3 +1,3 @@
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.2.3.ebuild 675 BLAKE2B 9a2343df8c818ea994430d1d1290a9300eb834c087ca6ac4ca6147185a5021f8c340e084a7bfd0cf0d4515d7a02a2c12b126d657c71ded5b53d129c08e495ba7 SHA512 b5cd2cd374323d39ac6a55c2cb337c2c95a11980d447d35367131d6474700b1e9a27c1fb0d1f73699742c3ea8070ed7592b6e47728e91ec94ea417c4810ab7ca
-MISC metadata.xml 615 BLAKE2B 77180a7073525026071fcc934406859495aa2bd7cf59a0ca642f9389e686869e39f95cfbc72a98f5ab70c7c0966663463a2d8c65277a2e753f049e551fb449c4 SHA512 f96fe3592b1591c6db564751bf35d4a643521c4c9092f91de5937dff221463f09cca3dc69391313f29487318099a4c64054c5dd3f101d538ca85a9b1c559f3dc
+EBUILD python-axolotl-0.2.3.ebuild 665 BLAKE2B bc57d8945fb5156bf272c2c36ce5060f4bb06b4b834ce76c3582afeaccbd5467140cc0b41776f0a8a6f17d515a86b9097bd3cd9354cd6f541114a634497b24d7 SHA512 cce8faee4980862a5c661def235a769576ff82a87f597b435cce7bd3a4d3f313fb24894fd57f7663cf5ae71f7bae4eec50376821f6b0dcd456f89abeb39c8db2
+MISC metadata.xml 730 BLAKE2B 0c9161ec83f8400b375a9932747d552fce0e320176addf34523d72f0592302e961b4ee2564b405fe539d0f68d383811483757ec3861e673b3a9ea66c4da4b7d6 SHA512 efde207f98e3bb3d15a9f09f87822cde14df1fc4d19cf88cc45434d7ce32ce20e5277cd97b59474e7f6f7297cc1dd04d765ae258cd35c28b95ac86fc93e0ffbd
diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
index c2eecc786c2f..1c0ab210519b 100644
--- a/dev-python/python-axolotl/metadata.xml
+++ b/dev-python/python-axolotl/metadata.xml
@@ -9,8 +9,10 @@
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<longdescription>
-		This is a python port of libsignal-protocol-java
-		originally written by Moxie Marlinspike.
+		This is a python port of libsignal-protocol-java.
+		It's a ratcheting forward secrecy protocol that works
+		in synchronous and asynchronous messaging environments.
+		Originally written by Moxie Marlinspike.
 	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/tgalal/python-axolotl/issues</bugs-to>
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
index cb9eea3e8118..05c43ad2c920 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 40bc667bf4c5..7b30159fe45a 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -4,7 +4,7 @@ AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb27920
 DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa27973b2dc4b2c4f79eba2afb295fce7b6c21a8589d4643ad5af212900f55dc4139711929d5c7c4a2b094ac749d76125761 SHA512 b8fdc867aa67c4e5602bb3e9bf906dd4d32a6616fcdfd5f39d146d849a46d13c266bc9c2eae28490399fe608ba19dcb824d05ce96d556de07999449eaece7dfc
 DIST python-dateutil-2.8.0.tar.gz 327134 BLAKE2B 6525eee57aeaef3c588413210df7c1ad3627a380c6e44af78e9acc9abea523b29e8d9afec495f8d1e585d25d32ab82e6e28bf93dca148893d2e6a533e1f4ce47 SHA512 ec7da86203572582f883a4686acf8a732a2de4f396d809057eb51b2c60dbca5623a7fa90c2c0618c281a2282c60841739bd837731a51cc876f4ff369297f2f81
 DIST python-dateutil-2.8.1.tar.gz 331745 BLAKE2B 9785fe93976d9bbe21d6610133e37e558cdde4062a1a738ccbf2bf80aa062882ba59c60f2b9bfc44c53e0f8fc4b5ebdd5d12b6ba54a60706576360e453b2f160 SHA512 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c
-EBUILD python-dateutil-2.7.2-r1.ebuild 1209 BLAKE2B 39b59a4e365d5c59682198267e8de48249fb0487d4d0f79045eda6382604523a5ffe6c95b5911afbc792e02454b5c8f83e1ec3d0adf86fc96513b803aee52af1 SHA512 b28100fbec9379367f8798451fd5ec56f436abbfb6e4709477a6abb876e752d3e6410af82c30573760707a43b95009a96a267c7b2f76bfdbf84e43ede5dac4f9
+EBUILD python-dateutil-2.7.2-r1.ebuild 1210 BLAKE2B ce4c15bf22b294cac95ddd0269151bb24ca1ec5bfd6dea6b7110b24b998069a86788abdd648601c0976f4afc053f10df0574d3f4fde2d3eed24a9a17eb0c4207 SHA512 e249618a45d98d19bdddd76b7468cab9155359a145d12092e630fee8f88a15a18f6315ccbf831b519df9a189cedd7207289430989075f42985c3c992454a4809
 EBUILD python-dateutil-2.8.0.ebuild 1263 BLAKE2B 60e88087f2d182a7c5422795f441c8e9517be3e894847b5bd0dbc8cc74609864957514b04081d796cc19e379e6192e3e737fe4fd5544ddc5524b76b0ecffba95 SHA512 45c458eed0e4e2c13b2b6a1c2ed9ef3c292b70c489e1c68febd21ee3f3d0fa9240e8bea8ee700ec832fdf2dbb418956e919a8cbc29a467c219066258924e34de
-EBUILD python-dateutil-2.8.1-r1.ebuild 1355 BLAKE2B ee8d2909ca955d809c50b8e3132634e0cc415bbb2a66ae36c7fd9ba9397e4f690c265546480536807bd31ed2a2ca0f76b06aba842e1f15efc33ec5c072eabb52 SHA512 c6f2511bc6ff696a42ecf086e2c07d9e99d22d1bde4452cbf30773a4aa6b8968df57b1a15c8225d7b9170eb515ad25b6b9ed72d26228090fa647e36d50c7a708
+EBUILD python-dateutil-2.8.1-r1.ebuild 1353 BLAKE2B 0b1432833e7ab823ed776e295545915200414cca0f695daaa5f6f4c0cdf8297c751d52a0c64ce51576a60a69e7a6644105ca120deeff45cc9b6233b472a31599 SHA512 adff2d1f7dd7c8c98ebedef8f909b10351aa734a6f9a40c72f29897cd68c45094295508d85acec4badbad19a7da6a281be9969869fb5b80864b2fbb6816e1e46
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
index 342d4169996a..add890fde38e 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
index d437cf64d99b..2043c8454c4b 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r1.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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ddp/Manifest b/dev-python/python-ddp/Manifest
index 4371d9b97d4c..55a436e370fe 100644
--- a/dev-python/python-ddp/Manifest
+++ b/dev-python/python-ddp/Manifest
@@ -1,3 +1,3 @@
 DIST python-ddp-0.1.5.tar.gz 6032 BLAKE2B c549f1ae3252473b38f2b5742b664cf0eabd9d89e55a21015a94082979d58b3b60aa803a712a54f849c1a49d3126a53abae5480e3b4e9e2fba59c7464105b39b SHA512 25200624a4a2145d3189646c00ba023f1e55010ca1756eb36505f85b6faa24da8a505f2784b8c445232ed471d5d402b4c0f487b3c9460c948295cda74faa7fbb
-EBUILD python-ddp-0.1.5.ebuild 547 BLAKE2B 94ffc244e2a6a44286f49b6c7c119627bdacab9366169b1ee5af00270a8da919108237d7e711ae3d46e493a2010840d62614915e3508ae11b2b0e34440204b07 SHA512 bb708a3a629d3c1fef35935bc534c3e6ba01b175bda25e4dfc59b2e99af87b1f7dcec5a50b274eae8f422225e02cdde3f54b65f8451925171754c0066197c3c3
+EBUILD python-ddp-0.1.5.ebuild 541 BLAKE2B bc8c129cc076911adad4b427e60014a450b5bc38a159e33b868706111c4ec799545deb1d2620ccad30c68c6412b5fa897526d93a90eb1543fb245160538da74a SHA512 05c1678c32aab25a6af58ed914b5cdabb54e07df1ee0147d555c968e009f5fd5587f10b1940b83f9ee0b6ba72044b1e46b92e23f90319a2251bf3e1c2c5be8a8
 MISC metadata.xml 578 BLAKE2B e7994a0ad1cca168ba43ea03cb55cf1b4d1080f397b580c0f96a000a006b54442176222484d0f7904f600e9364028e9d08a4b248d146b36e0638b28f7d7075d4 SHA512 1e66e8908ef5f4fced36e2d6386cf0f53fa16bbddd0bc08891f8d6cdfa27e3f9546b2fa8015289b8a0a254dcf0b192269fc4c212df1187dba5729249ba5a8c45
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
index 033c337b2937..9f380c49fa32 100644
--- a/dev-python/python-ddp/python-ddp-0.1.5.ebuild
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index d738e0fd8fc3..3a13119d68b6 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -6,10 +6,10 @@ DIST python-3.6.4-docs-html.tar.bz2 5955729 BLAKE2B 71e6e198069297860ac84be12558
 DIST python-3.7.0-docs-html.tar.bz2 6222504 BLAKE2B 150382e6ce9c241bf8654efc2c7515e1399291eca38b91c44c51d24302fc239a764af7d22dcc69378338cb3c0f7e2d7e517af238f8c38f32be8a76037880206c SHA512 f5583e8d2792932ff3c90575ce98446f0f11eab3a78a1ea8df0203f29583ff9c2831879817ae5fb23cfdb32238d385361b7956c352c6431e9801e6509d3c5f09
 DIST python-3.7.6-docs-html.tar.bz2 6248802 BLAKE2B b2baff27bf3fc61ebe521b5bf621c265a50336d63ec8c2e14f8f2fa75b552fa4f959b3448ed39ebf18bece46cdc14f8a7a62cae3fcdd4f44e3db09489807bf4f SHA512 52657627dfe088184afbc0827731cf919884f21ae483c934a84e1e93bd1b03fe7b948da8ea8dfc1ba80e0557504d14eab729d22b7230000ba34731e1b866a253
 DIST python-3.8.1-docs-html.tar.bz2 6527362 BLAKE2B b13fb15b93f7a244e082b7cc8ceac6fffac5b81bffa5c183c546e19dcf8839ad227d3263cc5662717e46f1daccca7dc1299260c1cadf601ac43dd61d501e256f SHA512 5cfcdce2fc12824d512e59689b070541f461404ff74aa5ab980576af95449c18c9340687a405af6ea48f7f1826f85a26cd86dfbe07acdb984687bc0fdb5a8edd
-EBUILD python-docs-2.7.14.ebuild 685 BLAKE2B cdc451f37cdd1248b589b5c922d0eb754b6c8cbb0f62624a31c1ae5f97687e97392c415fdade1b49eba3c3eaa384ab19b29f574ba691f75bec707263db85df33 SHA512 6b1a75583c9a74bf486039dc504519b7e659af37b2d87585c49af4ca01a72634e38ec9973ef0d24b2d9923cd94c285a3fc0720439ac31acf4b701c1071f4962b
+EBUILD python-docs-2.7.14.ebuild 686 BLAKE2B 8f406558db55cb9dc77b9bb80761b81175476f8869461d19a2e363549226d07656c07edb717cd4ef31de311ca864f8d7850860a372a63f9520c797e34d4a46b7 SHA512 b29297ae7e78b814bd2387eb9c105d7a76162567f58aabc6c70b2404807d581bed01cc84107fb34120b2120e62c607cae5fb4a7763b473de89d8423be0f42f72
 EBUILD python-docs-2.7.17.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
 EBUILD python-docs-3.6.10.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
-EBUILD python-docs-3.6.3.ebuild 689 BLAKE2B 43bad539aac8c7859cfe282ea0f45f377473cd71785b15c011f38a42b230ace2857bcf6d5855155cbbe3dda1edbb885e6b1f16cefa0821e57b2f97c779fade27 SHA512 1c6592ea8ddbdfb25fb17342d9db9213dda79a97f75ba9b6bd5b43bd708e03ded813c2d38a501bbc4ade7b994ef82252a383875d93e899bc68409c8bff9adb21
+EBUILD python-docs-3.6.3.ebuild 690 BLAKE2B 3f2d1bce02bf156f7faf202bedffec3d6201542bbaf10d38bf92d1fdcdeaf7c2d0ba9825c5bb5f3613f66431c083c5a1dc8174c80ab99dffe269ab98ac33c57b SHA512 bcf23b5c2464bf8bbc951357cece6fe9070f5cdd731d2a9e001c484609a7be214931db93f48b7c38a58a84ac20a25b09a6e067b033d2d566c9d13f0ed031ae04
 EBUILD python-docs-3.6.4.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
 EBUILD python-docs-3.7.0.ebuild 698 BLAKE2B 78d13344db43878ba36e7965152894ce1c6ff0de794e822792dd8b029bc5bd4642ac12f5640bfa407ccc3674cd74094752d65c1e943353ac459877051cb91a15 SHA512 35652bd2cbd136cd7cec9bfe268df42382cf70e29f310cff8153237c5bdc8e168c7072ed037de4b00fd538e98a96d8026d49a838ec07565e7347f68a0adbbce3
 EBUILD python-docs-3.7.6.ebuild 639 BLAKE2B 90fe3bf4b5f2a85cc6690cb2e3ecff8f971309aaee674fa24693e0e17c139c3aa3366e0808af5d8d2c2fdf277da5765919d0bc8bcee905e8fa3c79b8e72727d5 SHA512 82276743d65be4eccd83a1c11d78182cefbc680e47a0c5969eb5ae25d1c3f23ea0a924a7c27e7c769860b68ac8c4ea6bf98eeb432119da3ed1a572a488419814
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 f5896c169c90..04c96a498e8e 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 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 83b3a27136b1..70b1d5ef720a 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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 S="${WORKDIR}/python-${PV}-docs-html"
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
index a37104c4584f..52223c59b058 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 668 BLAKE2B a00c98173c6b8413fa1b00e5b6649ebfb7324c7d45fb34734359544b25e3fd31e218a45a04c0c2e9ec2d89c2c8051d04902883f26135fdedb09fc72d238a5dff SHA512 bdbaf1262ad8e414f86deb17430312ff494c05da828c633541237c2de29d66359d333e2f0a3d7e37a16ecb84b26ccb1d77b1ae6724722f6c745eeedc29947a8b
+EBUILD python-fchksum-1.7.1-r1.ebuild 669 BLAKE2B 77c651d726fedb1f2a81db874ee23eb693aa0e53a73adaade1e663778a85d9269965a4bba342f82ab14971a8d0552acc2fbfd81ef323d7da28e510202d4bca49 SHA512 58cbc619f8989cea359a401e2d085f8e0be319b984ecfb78a0e94be2111682ba6c16ea27bc194021de041ce915b7d3519d1f825c52b973df02d29706cb42becf
 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 b8d08ac6a48e..13ad2f36eaee 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
@@ -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 ~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 ~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/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index afa49fb0d934..ede5ff65a57b 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,6 +1,6 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.1.tar.gz 52633 BLAKE2B 78966a7ffd924dcb16b4c6459d10cb06b9494150887433fec1e32e1b454f151386d4024f3ba1d307f756781128224c8106539480d9291dcc2ed82e85c8eef36f SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.1.ebuild 848 BLAKE2B a3893ba10aac27ab1c413288a78febd1224147f313f7688e79b89b6f2631c2de97c6800fb8d1a8dfb0d39ededb96e13bd67a95dd853c8efbad499c32caf91f1c SHA512 906c83b857b5080fd2a08f1320902c59f7ab9222d2f9e5f8223b08e7406d7a49877185c8eb914d36cd07cde66ceddd7f251daacbb152c083065fa38440e97c45
+EBUILD python-gflags-3.1.1.ebuild 849 BLAKE2B 5fd6b08abfc4b01c5fc7d93914747e55f11d290ad5889773f57db8de9656c93da0cc46e9f131aa187a2b2a5a0598f7462691057eba76d3914389b72c14172d1c SHA512 d231a83720b0eb7c99ed3a14ec0e78d0cad6ca7b544bc26c9886d787dd0726cc47099528a438681b3cab1766f9b8061b17b0bd60ef26f47a0b3c393774b47d7f
 EBUILD python-gflags-3.1.2-r1.ebuild 871 BLAKE2B 0a37de37130bf57486aa15337cfc1328507c9aa8fdd9709feadf13495431d0f1baed1e8165498e45c4bfeaf5a6437f4189768e4784dbcdddf9e3469d6872cc57 SHA512 a89f86534a29312b378c62ba905bab6e8bef40d2c84cbc3192cfd940350067b7c85f49a7e05bae9a362130cf9921b9183dbabf2ccc3d12497d6a5aa30bca094d
 MISC metadata.xml 376 BLAKE2B f93ffa8d2487172461a680a02dad64b46c2edb87ed47ffd8455c30c82278587daa1d2baa42fd0e77f0cbdcff7936e9b99a1f8a8bd496f55eb27975d708656069 SHA512 acea21fc3fc83a3ab1a24f47ed7250c1ffc15ac4507c4c1472716a55b42fa0740b0a5d2eb20cc3dbfeacc575eed67d59b59e722e96dcbfc87672ddf9b9787c26
diff --git a/dev-python/python-gflags/python-gflags-3.1.1.ebuild b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
index 76980732b520..268deeb9c0c3 100644
--- a/dev-python/python-gflags/python-gflags-3.1.1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.1.ebuild
@@ -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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 5914e903e3f6..92fbad895fb3 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-jsonrpc-server-0.3.2.tar.gz 32493 BLAKE2B b1e89c798e247b3b039645b99ca25898fa846676c646e58d8fabfdbd772e3efa1ad895dfa7b31931f1e7d91252c4327a324b929cd861b16bc2be32a64e064db1 SHA512 1d29858b8f6850a017c8e7e94196a972c985e72e9f57956afa2964feb109d9b5cfa33d534d279d817bd5a1454dfcde7d32cd13149c9a53fe1f9e6e0a5899f15c
-EBUILD python-jsonrpc-server-0.3.2.ebuild 733 BLAKE2B 8b6c1770512bde484c69d01791d5e24278492b3b30d53456567939888b3f1c38a606f0ba7c2a4d579bf397650e9143b21614a86ede709ef6e7e2057af36f2cd5 SHA512 35bf59965f1b7e3e9ef775152492456696f2ab96d666b6c38dbab772ad1f4b9d1cb71caea0963966ea553df3bdec17a898d9d6682b288795a41144086507c10a
+EBUILD python-jsonrpc-server-0.3.2.ebuild 700 BLAKE2B a416a3434dbdee800515599b86736463c2ac6bd929117b679cd516c7e8089c01783e5cc8f003d37aec59b22ff333f5027943b5aba87bae00061243de54baaed1 SHA512 735146a8291245610107e0c1448d5063fb6b3295e048b87fb2e41749fc744d1c0b64b3a638f0c507dd95178c1cac4441d508b0d9341bb0dc9d67bff53c1d37f6
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
index ece8c0451d53..c3430e9a8277 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.2.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index b3b3ddda0692..935593845340 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-language-server-0.31.2.tar.gz 64048 BLAKE2B 6dcb9d2a7eecfc1611f74c38b0418da5369f43d2e787d6402d49f03eddbbefabd3c95f8eb7f0e95f251b3088ccf4e94e060c8f8a7a7f71dbb0bb8c95d686dfbb SHA512 f36150b4621e818ea94d9f276e8752ac5a76ed46c7f387e8ae69991fa9d6145225ddb4a513f10fba696f4683e31085a547613a59b076006fc13310d05e752fe3
-EBUILD python-language-server-0.31.2.ebuild 1304 BLAKE2B 2f8bbc9d3244d88479cce94552ed984424cf0f080ddc856eae452a0e58111e6c3b55952164c6818e7c8149b500551b93146b1bfa38df825c3c8d772068c77c6f SHA512 41a573f05ce8dd5afb54cd8c1a1840472cf77a002f52cf2d3e9693dc399fc67b35de48cfe7ba5e66409fbf5b10d027d31715938f3f05fa7f1cab0ec9a11f3f5e
+EBUILD python-language-server-0.31.2.ebuild 1338 BLAKE2B 3fc6a1b158421c35010ec050d37ad48299550b95641e67b9f1f09dde5dabef6624b914e0c4b62d5fbb1693b929df9b269012ba7a02ef0940e6606b7fd57fc74b SHA512 09e42a90632a077d8a5607ceccd750f7ce7b439a7eef3c57e86f48bb3c6d990a87aa373ce2113bda95222a3b140b7f6cffdbaa23ca1b48428df234de165e8d42
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.31.2.ebuild b/dev-python/python-language-server/python-language-server-0.31.2.ebuild
index daf1642be484..07d9ee4687f4 100644
--- a/dev-python/python-language-server/python-language-server-0.31.2.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.31.2.ebuild
@@ -5,6 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit eutils distutils-r1
 
 DESCRIPTION="An implementation of the Language Server Protocol for Python"
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 83653b5f4cfa..3e86092e7139 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,8 +1,8 @@
 DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
 DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
-EBUILD python-ldap-2.4.19-r1.ebuild 2431 BLAKE2B cf2d5158cf779081786017bfa59dbb8ad102df9871fe4787c6f9bc4c732d7b80668f5bfcdc49a17dc4164755bdbe9276f8eeaae8288bb6a53c82a3938e203d2f SHA512 3b48e7b4d942ec1664069bfdf0782a36092405ec43172b1670a18192f6dddb7c95eced874eae5bf0c9e96bf0c015346771344c5e5118ca4d4fa6fea02792d8ba
+EBUILD python-ldap-2.4.19-r1.ebuild 2432 BLAKE2B 3744a25dcfee201440c4022b099e0c0b8dacd1b013eeba0cf01ce7d2eac6315d85c6d1d47c7f8edf2cd0ca21f080b7ebc4f71d8167e7803a2aaaca55fe469676 SHA512 0f8c032c5348516c29b53c0a1d7a1a717eafc498f19247c871c358632e16c6c8ae1cb809f902ee85f9ea4fbf8138df33cfa7a9cbe1929618ecd85295d33874af
 EBUILD python-ldap-2.4.32.ebuild 2219 BLAKE2B 61e0715dcd6f88f78a6b06830e815ec57184e94ec9a19f5417c56f417b1ca8dd07e8e6fcab6640ca69e038aa7ad7e24164275c1869f0d026c6e03564bf0639f0 SHA512 245ac35b5d94121d5c5a8559f8a013882497dc4352b02182c4b1e5578c42a8d24a93f41e790bdcb3988f61458e034ff696197a8a799fc61fcb187654bd89ed14
-EBUILD python-ldap-3.1.0-r1.ebuild 2278 BLAKE2B 9ece417461fee8e1697163ce53dc763967905744def9779a84401792a2be94daad7f8ba2b2cdfff0bb2cca98415883a671f0fc9179af0403c3c263741d01d19a SHA512 365c72a9e3f290e20eb5ff9ae8b5c867041b6dad1f63b8e323ebf8bc9a39a4f1e6293a1d3c3f2eb3e5663b45f59ae6b49b221dc467c65faac0bb226f2cefc158
+EBUILD python-ldap-3.1.0-r1.ebuild 2279 BLAKE2B 042c7b6894037233ad82551e6977412bd37f68cef2cd73633bfe1b2d28ee8c5ae797be00ab032bc7ab7390738d9ae8a17ef1152ec034b8c02b6e65655dde17cb SHA512 d0228010b5cbcf12b7b63b95f9b1f943b8de1253ff19a96219914f09ccac1c107268edeeb1c5496c5978e085b3b7d4513a2b912145c068ffa49aa8a17dce6845
 EBUILD python-ldap-9999.ebuild 2283 BLAKE2B 3e4ee2edfc36a79c051624b8c1582cb03be6d9d4732b52fca0ae99fb4f412c172c6c8ae969deb5bad2580bc8a43e97513cf7c262fd8ed9631ce292be0e75225f SHA512 d4a0b50d09e825189a14d8a08672f034433dbca72ae703847371ffa36f1332fca1f906a439d23dff21bf6102ded65b31bd496ac78369e09fc23a008cc150ab3a
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
index 609affcc691e..6a0ae3bbc6d2 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
index fa6322458b30..a6fe2cbd1ac6 100644
--- a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index aef3bc66ce0a..d1fbb52849b6 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -4,6 +4,6 @@ DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
 EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
 EBUILD python-lzo-1.11.ebuild 742 BLAKE2B 1b175d164c58ac9cfd3612c673b7ae9058a8b65575561e64f377857fde69181200e4a83cc2d26043441ba372cbb771aca8b0e01a535471000c136241f5da2274 SHA512 e4c9dbf5ec6fc39d5d9c54a74313abdd86706b91ebf569ab74c2824ba1c0fe047dd1341b0475790a60f37fd30175ff25d68c1585824d78531c54d0974a6b376b
-EBUILD python-lzo-1.12-r1.ebuild 754 BLAKE2B 37f54135f8e7d8d56e8a9b86cc2c70d384db28b9a07ef9969fb367c5f82497bb04e12150643d9ab386678c3deef57280ea1bac0ec62f882ae2c5354bce018430 SHA512 8382d4aa948df44d1ba0b9fe89c98c15daaa4ed6951e47ab88184243ac5eb2e53937869d86426efe957041e32c9be2bff4a01b0f59c5dbeaa0ecd687b305e33d
+EBUILD python-lzo-1.12-r1.ebuild 752 BLAKE2B 3c1144aef629d45a267e583a00ca2dfa1a7529878026f59dc60a5592e4488cc38812c81ade93dcadfc974da3098ae4cfa5b594bc24daa5ff4624584230cb51c1 SHA512 bc10a73a5451440b294dd44960985ed68af8a15c13c45a098c78cca85b68af1df4cd3be008ea15752a5148c944ae53ccd0401d34dabe20964cf56f4a9098fe06
 EBUILD python-lzo-1.12.ebuild 746 BLAKE2B 8474c4bd1d1a0bc6034cd7f983a48db6b74b729ac23e0d23f4a9dc37d8834c6c13216bbc5ccf08b4dc93edc9a1bb31f7c1fa0cbc2aca01de86e923a5d6de3765 SHA512 a4798158a09428b77359f8a3a8298b1183a10750ae00fcd81904614d7100940b9e8b79c442671915d0bb5056670168bdc4a3a0f9feb67882c1f188cdd7fe06b1
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index ea2ed26e539c..ef22bd911221 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index dba4c0800e2d..5e66e2aab610 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,7 +1,7 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
 DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
-EBUILD python-sqlparse-0.2.3.ebuild 1349 BLAKE2B 751c2707d8f0a535676ef254ecca4cd15a7d09238a512057be92bbcec0a16b26bdd0caadcf9bffd779aae50614e0358308f727ab0ed3b3b9cf2629722d9d1d53 SHA512 9742663ecfc7c69e670608ae8e34984b38cfcad0c589271abc54e5700e5807d6de1f36df8f3371224e3c812915a90c5982c97ecdf212ee1d3c89dce10e0e2ae4
-EBUILD python-sqlparse-0.2.4.ebuild 1353 BLAKE2B cc873b7f263a17ff686f6b2a009a75127b71c367b8ff17efa11d6fe42c8d10ab87e32d1a1c5148c3e74c563f70a6f1e3fba63e504480c334c6466d15e39df7f6 SHA512 71a151706e709dc23fc45738a8cd10622a887b5b7a9ae72fb77afb818714c3b28ad49b2ff2fa4d091d331d5634b0e345edf409d0b2d39020fc185b000ff53bd0
+EBUILD python-sqlparse-0.2.3.ebuild 1350 BLAKE2B a212c2f3dcc1e4961a621595db02422c003d1034ceeb85282d9550ac6eca37a66f52e7e4c00989bf6dccda44359da5770f949151967ce873e8fdc1c233175671 SHA512 954078c88348c4bcbb1fd21b2ae64798f4e2b246f029e3ad42cee3269f271594e8c1c85903aa5b7b17b7816a3340168386db1fb06ed644bb055eae6dca89166f
+EBUILD python-sqlparse-0.2.4.ebuild 1354 BLAKE2B eabc79b1388c2482e759794bb87cd93e70b5ebce7daede25aa5626a429b40754d2dc7a5a0e0b1bcc64bb4814b9c93788a998e121106bfafa50b35a841bcb4d88 SHA512 7a039ec09e7c6443d0e1517103b6a491dca8465bea4efbdaa9f0fb1ea92eb1f22c7646a6bb2eb938d3d593f6d01e28b08570e0f27ebd57c1d2446bb3480929f1
 EBUILD python-sqlparse-0.3.0.ebuild 985 BLAKE2B c395b48396b7f57f3a728e22468d5361b35f4dca3771b191704086f1b20149944b80b4eb0f85b7c2e19007f2e7efb436bf17d7e0ba0e94bb54f10a3d16c97ee9 SHA512 bee0b03141050ef30e67a3291b735623eb73eb5703117aa0c16414fceb09a9c3c98bf656d8b7bb055feb5c03ee1b7236272b438709194bc4e2b7350e3773f77e
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
index 8184a0645c63..2a51bb0cf79d 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/andialbrecht/sqlparse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
index 335cfbf6ca40..3216f5eb6d67 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/andialbrecht/sqlparse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 97681ec9c3a4..9e3433d0cc0c 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,6 +1,6 @@
 AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b348bf4ccd1877c843864a71bd52b19d53ed3c98f0de0b690c2158b6ceffe10682ed79c64c829103a2e34fe14 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
-EBUILD python-systemd-233.ebuild 844 BLAKE2B fdf4b7b77918de340decd17ebf24b6f516fe43bd232bfc7419806d81dc7f63333109ddbd16ad1721f107ce439f76ea48ea5a665856cbab59f2addcd86a348f15 SHA512 97353e4dc664f54f4e27f304cbfcf520aa7f011392caf1ef3a8a18e7743bb7f7c6d6992b4719e043c473b41d93b0ec2367c0da67efe594e29ff2168f1ea9f946
+EBUILD python-systemd-233.ebuild 845 BLAKE2B 7dff827fec6a5878c180a014205ea2a517ce3746c5ac27f6b0d0e95a4783ac73082c40c1cf6abdf3481fee2d19aea841aaf8eb04d64a5379acf5b4b0bc19a8fb SHA512 6ffc6ba2fb7599f1b3565f0109c5f860de1d6c0741dd1c387969b95635e939a3b527161671ba98ae136b66ca3181670ab0b08dbcec56a8feffd5b4ba17d257a9
 EBUILD python-systemd-234.ebuild 981 BLAKE2B 790698d3ed8184fa0c9f576b649970e0b4d1f7e22fd03d68b65b6edcbaf5d1279e1fcbe5f3e7eafcd4dae9624c1be74fe4173fe571660cca4899f5f28f1a9f26 SHA512 eb06ed054d30f061dbc0612c1fd61b9b326a47afd27ff283014337e1f91bb242417b757b9b4f5f5786d6d90b03cc938ee2a40840587133737e91f37230d7a00e
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-233.ebuild b/dev-python/python-systemd/python-systemd-233.ebuild
index 209005857e56..40dde473138e 100644
--- a/dev-python/python-systemd/python-systemd-233.ebuild
+++ b/dev-python/python-systemd/python-systemd-233.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index c5c9a5d0b669..02753d3b676b 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -3,7 +3,7 @@ DIST python2-pythondialog-3.4.0.tar.gz 1487867 BLAKE2B 795af99391e7a3d5e9b065711
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 BLAKE2B ef78832972cc2417ecedc797cb95ea10b1fcca4ff1ab2f7db74a9afaefddeedfee8303f2f4b9ff7230f3d2eea305e359f3854112abaefa2a4adf4c801de7ffe0 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f
 DIST python3-pythondialog-3.4.0.tar.bz2 1415324 BLAKE2B 1135df25b988dfaacd45a68dd918409e001719f92436e9e88fcf1a66e9ba70f03fdef1b86ebb80ca6a1c02006353ed3f9df998a5bfaacb9505d6e8a96a37d5d9 SHA512 a810128459133c4e416f4b04b8dd98b2230f046b8762e6b29c4e02e1458fa96029d37137a71cc01aee292106867a6f30026941ed1f727b7e48cbe976d96d7ed4
 EBUILD pythondialog-3.3.0-r200.ebuild 961 BLAKE2B 2d684342f5b3ab054680c5d8b47275d60eac52c6f7dc98daf3698be83f0362d97a50e7ecf2fec6e30c665babcf2956a3d519513879ae0b41467f61c7c0060884 SHA512 d6354568e8954d4ba430df9da5c634a6e5ad7918f1fd34bde8b511b9ccc4e44f037b8f29f8fc94e7a574b4f0d1acef37bd88d8600a352e3365caa600c34ecf45
-EBUILD pythondialog-3.3.0.ebuild 884 BLAKE2B ad059227d7e17011b4388f94cc2234d04ff3b7e9a868da43a74a493b988c6a4087305603f0fcdbbe50a1742b81f46f2c962ad87429c3832141cd491538a9b12e SHA512 ae632e02ab5f5751332ba84236a62e6472dd45f82127649f47f790a9dba182e7c7842f25fe5ca0d5e1ca5986b0c2aa988fd3ab9775849e2f986b90bdf7eacda8
+EBUILD pythondialog-3.3.0.ebuild 885 BLAKE2B f60672dd1d57f1680c85533076c5d81b8323d3933bdbfd31d36ad70f5860a4cf32026ba3193632d02bf006a2b6a79013ba7a50cfccb64cdaa9bce3b5b9b4fed9 SHA512 b5dd1a6549662d7202fb9176a0e53888d7ca5abb764a93b86e4eee893a103b4fbe2122ec504f319e5c1ce5020eb1488cf64c13e327ad839dd9e424bb2598ec48
 EBUILD pythondialog-3.4.0-r200.ebuild 952 BLAKE2B 4146f6224137fe1bad5ec24e15d7719c4f55d7f9cca4b12958382651d69c7f4e958d5f5858f1f56d423e6878973bc68fefdb59e4fcde3b4cb84a62d942d80820 SHA512 bea775822f922e4ed3f6bf0863d67b7f0cd1a6c1c4d6f3de5d409ad7d9a10cbd3cde09dfeb6f571b08d8a362f96a23b990ff80686ad5a24e928591e1747e8dc3
 EBUILD pythondialog-3.4.0.ebuild 879 BLAKE2B 2112737b5b94b3e9ac314d3d5c7462c2a6d8f5d334d67e199a9fd32ec67d9afb42cb71aa14d7c9ebdc41f7dee2aead9fbedd804bd15d1f51648d261e5bd4b05b SHA512 11f89132719bbb5423d4b6915c9068bee0411891777bb652affbfd9d39f660f95ef26584ce5ac8c3d1bb7b521566004b2d7dbbc42216c35ef6d09453f5a7df48
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index 426bf910580b..ec5ff06e4cdc 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 58ca438e8c96..0050e62372ec 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,5 +1,3 @@
-DIST pytidylib-0.2.4.tar.gz 86650 BLAKE2B 15212651c83ebbec5b74418f37bfcd0366e9b6cdfc0820953e34ec3142871248df02618a51415a36b84ac8c2e5a12d996ff7301b5bf3a001fb42297df3a98202 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.2.4.ebuild 641 BLAKE2B 28a7e11fc3dca3e1256fc6dde2a765892886fcb03422c11b8e855339e5e4e579c42e55547d6fa162631b13e9c22add0712ef5a4519fe123a73230199091acd70 SHA512 0890b82d93fde78fdb9d15cb335b9b7367123cebd9c3b41a26760ecc9239952b5aff55004c6406855dc3ed7ca769c514355ad003df2d89f4dfa20e849eb47bef
 EBUILD pytidylib-0.3.2.ebuild 598 BLAKE2B 2cbd051ad72d46ca63b3da0f7fe36fabc5963529dc77a998ebc3cc45845980ca41f8cdec3dd640f67f88a8e68c876951a013e74745eed70c3508de2351394bfc SHA512 212bfceb2ce3999475daa815ced91a42b1a0acbab5ca1dd4b315939cec83fdffa87cb843b8b7fc3187bf78d1d6ca11ee77b5c9e53fad247669137a643c8d1e86
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
deleted file mode 100644
index 1c38785d28bd..000000000000
--- a/dev-python/pytidylib/pytidylib-0.2.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for HTML Tidy (tidylib)"
-HOMEPAGE="http://countergram.com/open-source/pytidylib https://github.com/countergram/pytidylib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/htmltidy"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest )"
-
-python_test() {
-	py.test -vv || die
-}
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index aeaa08f8bf97..0353c62a3fea 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -8,9 +8,9 @@ DIST pytz-2017.2.zip 502168 BLAKE2B a1e02967700d0624d2c48bcedde52b772471aefcb1dc
 DIST pytz-2018.4.tar.gz 308066 BLAKE2B 665cebc5b535aafc92a1858b718d22818810534d8680a82ef3a0b66e6092f24226c36eb74feb690e25578b4d6ab8288cc4825eb5fb793345e11b0e71c6041868 SHA512 8a15e64d0d1a4b75c1e92360b22c06a41a692fe54fc8bfcff8cfa671095232d87f7929240441cd4d46826cd13f21d348125509c899be5a0b19bc7a77fdcb43c1
 DIST pytz-2018.9.tar.gz 310705 BLAKE2B 38e4f403e299ca3c24e5cde66bc02ebb861abfb7be06bcb0556fa75f426a2d3e1ac42466ea2296ddf52d3ed0e0f6f2478733d9877d2b891b5f4787cd1e792d91 SHA512 c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159
 DIST pytz-2019.3.tar.gz 312286 BLAKE2B 8a81caf3ead284a66404fadeca4f17a603a4f0ab2404f9b73b2b06a209d0094a25549065aa14d254239d6d842804c6924bc7658a876517b170f535be71868ead SHA512 b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af
-EBUILD pytz-2016.3.ebuild 969 BLAKE2B f590c68787964b7b57a3723a549ecf6310af74522f9d27c523dab1808bf3ef45857143b5bf0ba3741cc970a0e6af96ecd44356eb9951dd5fd83243fac5cb4b93 SHA512 130eb6e6a3c9caee9ea56cc30dfcd4355d11e1833ee8041126d504bded239b63032a2569df7dfa35c32794da4137268a0bd39ce5d2501f095e9ab3e28fbb27ef
-EBUILD pytz-2017.2.ebuild 989 BLAKE2B a17a608d5df37bc334e051b5a2ce6651ca5fea7464108730dd4de901967ccc89eda845350e62ed87959f8bf9560fa458ca21c3ffdd6bc2c1d9e2d26d08965c6f SHA512 dc59c02754efb8090b17d6cdc95f4544d9989805eb4d4ba3fc4859c992b66a955755184517d16b16a41e8bfc2c4528241a424367a71c000c66ad46c9a0000fc5
-EBUILD pytz-2018.4.ebuild 995 BLAKE2B d21df2b0dd1df5932cf776c5fcb09e6dd7b492eeb75c9a76857a8092359d6449601916f5ce61b73653802db86f2ccffe87899881dae56d766ee09d460195b124 SHA512 d6239724306498128250c5243a9b08c4cba99e8dff5b85c76756279d6c61cfdcf07165776dc5cc5c770d2c228e9faca68293dc09bcbf0d1ba63c90a71df9151c
-EBUILD pytz-2018.9.ebuild 995 BLAKE2B d21df2b0dd1df5932cf776c5fcb09e6dd7b492eeb75c9a76857a8092359d6449601916f5ce61b73653802db86f2ccffe87899881dae56d766ee09d460195b124 SHA512 d6239724306498128250c5243a9b08c4cba99e8dff5b85c76756279d6c61cfdcf07165776dc5cc5c770d2c228e9faca68293dc09bcbf0d1ba63c90a71df9151c
+EBUILD pytz-2016.3.ebuild 970 BLAKE2B 555942af2a5248be6c038ea95411c5aeffe7ec2e4b94bd476cb79fd9ff603ea4b56de1f23a3a69df3a6aaa5c864564aeb5a601816f4a5d8ce8cf32532b760f16 SHA512 135aa81693d9d58db037499d51a04552c4d7e26ecda2210ad5cbc3906e7a96cab0a29ba2bd955c75ffb7e7a1dae16beddaa7c7e24e5b2bf9eecf619cb2ec8ba8
+EBUILD pytz-2017.2.ebuild 990 BLAKE2B 7178aebf209b43c0f9a2e7920e0b5d57022671bafb2398457bf9db3e22e7751c4ad834b2d80a01323640156ab4053132b8871f44d3214ae19b830c01eabb7bf5 SHA512 8dab7dd49e08375df4e42b1e263a36c3ad279fe4110d457ddff38a32968b6640fd895eca3e99692da58bda01292246aea3e117dc7717096a08cc0df0604710e3
+EBUILD pytz-2018.4.ebuild 996 BLAKE2B a28efd08874c9ea779df556a1b50ca900312d547faa842a356977b0eb5af370f745c34a811e4c3fe8dd078c72377f5e9902179f5c157467fcb09121629ada9ae SHA512 1b9be7092c4babeb4b455610d3c311d91efbc6a34b27520cae5c921c07bc8504b25662347eb7f94e3ca5c8ec8c441dc0fdac3386687a9b7907e36885af2ba5a8
+EBUILD pytz-2018.9.ebuild 996 BLAKE2B a28efd08874c9ea779df556a1b50ca900312d547faa842a356977b0eb5af370f745c34a811e4c3fe8dd078c72377f5e9902179f5c157467fcb09121629ada9ae SHA512 1b9be7092c4babeb4b455610d3c311d91efbc6a34b27520cae5c921c07bc8504b25662347eb7f94e3ca5c8ec8c441dc0fdac3386687a9b7907e36885af2ba5a8
 EBUILD pytz-2019.3.ebuild 1011 BLAKE2B c14b0033b17442a3f3707cc3fde27fb2ccd85e8c41169e61ddf3e6d3b7ec1d8f793c0ce4ea09169972032754aca24ec5a3f54bd9da3d6abca33d00dacd2f7489 SHA512 cc7007f0cb250502c1d7ad6b15a9ae938e252eb0e5ee5efcb5f29284e472caf19066e372543112b918962e2d1ace0047614e539a0733d9b55847599f2d86c8f9
 MISC metadata.xml 739 BLAKE2B d96611c8cdfc1d45fa86eabcbcc60ed1d3f7e7d2a358a2fc5cf54a64ac3427140299651263e0be1cc4d2f87750df81c4adac9512be75ab334d38f44a375238ea SHA512 b7c9e6ea1b5bd128f1c5ce0a77171d0b7cdbb6f8ffb186d92aa4167d2d84c60c28c647cae66ffc7532350bca13ab65aaab5eb441f68321fc786a14b90f8813e8
diff --git a/dev-python/pytz/pytz-2016.3.ebuild b/dev-python/pytz/pytz-2016.3.ebuild
index c4759de77933..7edfdedaff9f 100644
--- a/dev-python/pytz/pytz-2016.3.ebuild
+++ b/dev-python/pytz/pytz-2016.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index 7ad62430e50e..13db556664a8 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytz/pytz-2018.4.ebuild b/dev-python/pytz/pytz-2018.4.ebuild
index 10952615333c..d820c972d34f 100644
--- a/dev-python/pytz/pytz-2018.4.ebuild
+++ b/dev-python/pytz/pytz-2018.4.ebuild
@@ -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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytz/pytz-2018.9.ebuild b/dev-python/pytz/pytz-2018.9.ebuild
index 10952615333c..d820c972d34f 100644
--- a/dev-python/pytz/pytz-2018.9.ebuild
+++ b/dev-python/pytz/pytz-2018.9.ebuild
@@ -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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
index 01168dae7647..f8e1ed9ec52d 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,5 +1,5 @@
 AUX pyvorbis-1.4-python25.patch 1562 BLAKE2B 4735697a7f75f6ef825ae22769d226d69bd10aee71653bef0ce3b2573dad670105683259fece3225aa7625265a72b33a996520ec6c7b96d7f94b1c0a36e6b2a8 SHA512 9d8e6dfd5e72ccaa2cc4fe67941d44fd607824d94b8f9b62d69bda7abd05abe08f10492f2ddc8b2c11c11371417861f22af48411d51b9d81973dfd6e1af3f631
 AUX pyvorbisfile.c-1.4.patch 564 BLAKE2B 6efa9eaf588ec47227bdb3d90157c7a746818d79900de88135ba9c357098e7ad306454c0e1fe18f097e4b1eb87b68badf03f984d1626e39d756c467e14f732e3 SHA512 73426fc32dac932e548555eebbac3a2c2ca252f18882eb815d40da4238b3e0e544e993d395e2c0df04dcc6d2e7b9cdcb6f26417390d91c6ef11c24530dfa7ce1
 DIST pyvorbis-1.4.tar.gz 39045 BLAKE2B 57fe96085cfed822ee3277d59b6d8e0bb3c5b88a92c615da2159a23eab74b0ba30c693e1b3b41716c7eb4dcfbfe332956535845360a6c6b19df95c73f9634fba SHA512 c0b5ebb5d22f97b20f56a0b49e43675764fe057afa2d5de22eab9b8b73fb542186e7488cb0ba31b7af433cef1a88e815eb3e88a4609a2657ae5fba1017bdb89c
-EBUILD pyvorbis-1.4-r4.ebuild 928 BLAKE2B 4532c93405479c4b563bfdff373463b9d145a93ce756c0b1951ce8b651b4f90ff0c5c78d2d5c24989898d27e588c221a237e2a9217eaf704cd5cdfae5b0fda81 SHA512 3ffd77a3f88453a22b2c070f2f30d072a06bf82a18650983516ee5c68029b969bd952c207d26163a82e265a9ce3610deb0bc6e5a5e8f42ae8b6abad9b6d29c22
+EBUILD pyvorbis-1.4-r4.ebuild 929 BLAKE2B b20c565e2ebe81eb1c0dd0f7f6c6742993a63c958df3467838826dc6aa4295c9395e8b3bdbde05589b3496531d3760b0f9a5cece717c7545035ffda1100585ae SHA512 49f05c5de5d9c809dfec1040c29a7d5294706bf3489d4ede71bcd1003036ca78c7548187d12fcb8f751e118239c3a60c1a968b6b6566feecdec1c40eedc88b2b
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
index d387882039ca..c95cc8bf76f5 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 29d025760098..c797fefe6f84 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,7 +2,7 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
 DIST pyxattr-0.6.1.tar.gz 32105 BLAKE2B 0334d056ea652492fcc7958e0caf0ec438253e287c3f2ee663c0eb059fad5f01bba02963fc90035f84c129e19ee08e11bbc5573cebef6fd7ffe5c65adddc02ab SHA512 2c2defee81e2bd7e7e7f67d33676858f27494f12ba5c3d34bd548912a058cae562e9e9ed0dc5697892d1d55c29f2a5e10455260092b63faa54e40b841c42681d
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
-EBUILD pyxattr-0.6.0-r1.ebuild 1975 BLAKE2B 067e921cf25e1263bcbeb3a56602211029d292d7c60c539182f8081974d912b014e7f9e47064d8e351edc08dae54a29e029db5fbe386dcfcfac463837ec0f26f SHA512 cad8a2449f645be19b8bdfb5d1e9e93f9368bcd062ea077fe9063b3798cac162204adee9b95f0785629a73635500284c7cdde316f3a5943fce998fbef94ef4c9
+EBUILD pyxattr-0.6.0-r1.ebuild 1976 BLAKE2B 534ae09f3c1bf80073dcb1aef7cb73285031446f9c1c2542b2f39bfcac94d22ded63b37684de1025a209abe54a75b081dde80176a20c5a0f5a24e1cc5c612b6b SHA512 f0344d9b3fa9aa4ee143df46c8fadc98a6cb866da23c4013d29a25f32ebcc7375ab6603a8d6a875f6ed016e63801bcd7c9051b1e439f43bde0401b1f2c1d52e4
 EBUILD pyxattr-0.6.1-r1.ebuild 1806 BLAKE2B 8b5559928fe134a74beb9179ceb1d954eda20cee80a6f24769357a82426b915555be8902b4df6169d8b9814616464e202a459306526f19f7062b6b02a778462f SHA512 f2c6d7b2b5dd5cbc735a40419600caa4bc5227c7d4dbd3fbb4d76b268664e6517e4eaba933304f28c0af8719a517ae17bb3b0161d89e93a3890c0312730c9656
 EBUILD pyxattr-0.6.1.ebuild 1929 BLAKE2B 21350a0858aa75cef010dac1d2e3ba85320f033a1dccb7ca5f2c7d7f6f618bc9fdde841a090c1777f5a914daef0d0c1e1cf17299739e931c45838bc868595282 SHA512 8e4c6e310ab4a2e25e05e5681bc69da5b917d196adbd89003dc944cc4dafe642b1e09bb1d90eb8985962cd1c6b85cb7b4bf684344e91804b90f5a7862e4438f1
 EBUILD pyxattr-0.7.1.ebuild 837 BLAKE2B d5e768895845babe7ca336830284fbff39fe57f3fe0ed820f3b0d53b7dbaae64f700d04e5557d1276af0a63e7eea01e50e70185a1e47a12850c1dd9eebe2935e SHA512 3f2d6aea962339cda2b73d7e88e160d63be831174990ec9c73c4a48765879645ebf1de085644e2734227ce5966265b516a6934a24e909fe02ca2b83a60ec4c64
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index 238c5c22ec8c..24e49800a544 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index c98d3f90f6cb..fede8b368b9d 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,7 +1,3 @@
-AUX sec-patch-CVE-2014-1624.patch 1867 BLAKE2B 7345af45e863876b9c0f11c0dedb2dc124e53448c532bcf622f085e3a4c3040c9308352414e173c6adf74cb1c55efaac1824bb99fc8013f63dc8cfd3610989ea SHA512 f0ff5255108b7a5774d376a8892f1120f5056ec92fa543af7e5aabe3792e7ecd347ac78ff5c04ab36db35bba513a412f6aa06fe718933317a903264bd184b712
-DIST pyxdg-0.25.tar.gz 48935 BLAKE2B 8feffefff37da1e560040b36cc1ccb4ffdc57642b4de92f7a937303a02117ffe263a5dfc91bb6e85112ce60bc19509c21e7f8f859ef3ca5fca0e8c87a61cb128 SHA512 86cbf3a54fb8e79043db60dcdbb3fb10013ae25a900fa3592edc8a24bf3f440c19bc04626c7906293c785fcb56eab9d87d209b723b5baa872376ba1eb86758b6
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.25-r1.ebuild 755 BLAKE2B 9c4f3208b132af78d5419cad528abce48d8295b75e43238270d395e1431cd5938f1a33d75a7def8821444592073c2ff562f3929af415fd60624a278beb1e9b3c SHA512 da54e504545cc792935004f82a114bb517a6182adf0b393e17fe3a43a269e878c3fa83f23517afd7cc54b14df9ddd8ef3a9defde201fc36fbcaf62f872b5210e
 EBUILD pyxdg-0.26-r1.ebuild 778 BLAKE2B 643f87d407c216b5130b0ac2b8ddce6bb96b6b6d003e755d7f289c8c6549bb81cbe19044247986af7960f8acadfeb9dd473170242955641aafe77c880863ffe9 SHA512 e42a517f9ca920370a7189bc3495010a057e5fe4fcad378d163295c483b24399aa3df1a40cde05972008e97b3170d22647546dea92e32c1fe2700e5303acfe9e
-EBUILD pyxdg-0.26.ebuild 779 BLAKE2B bafb05527ca4ad8bfcb177674d035c18b76bd629d0cc8312869f76a40687288b5a13ce86abc76acf8ae8c765b68c02ed772581c0fe64878e1bd024f12a652037 SHA512 ee6098bb72fbebad4b91550c9dbce38dc237eff8412dddf2bae812cea62f777dc64e64e288e34f0de3e9cbade5b8ca15a65f1c2c73a63d16e55b08325e642366
 MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
diff --git a/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch b/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch
deleted file mode 100644
index d94c0a42bddb..000000000000
--- a/dev-python/pyxdg/files/sec-patch-CVE-2014-1624.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Improve security of get_runtime_dir(strict=False) 
-https://github.com/takluyver/pyxdg/commit/bd999c1c3fe7ee5f30ede2cf704cf03e400347b4
-diff --git a/xdg/BaseDirectory.py b/xdg/BaseDirectory.py
-index cececa3..a7c31b1 100644
---- a/xdg/BaseDirectory.py
-+++ b/xdg/BaseDirectory.py
-@@ -25,7 +25,7 @@
- Note: see the rox.Options module for a higher-level API for managing options.
- """
- 
--import os
-+import os, stat
- 
- _home = os.path.expanduser('~')
- xdg_data_home = os.environ.get('XDG_DATA_HOME') or \
-@@ -131,15 +131,30 @@ def get_runtime_dir(strict=True):
-         
-         import getpass
-         fallback = '/tmp/pyxdg-runtime-dir-fallback-' + getpass.getuser()
-+        create = False
-+
-         try:
--            os.mkdir(fallback, 0o700)
-+            # This must be a real directory, not a symlink, so attackers can't
-+            # point it elsewhere. So we use lstat to check it.
-+            st = os.lstat(fallback)
-         except OSError as e:
-             import errno
--            if e.errno == errno.EEXIST:
--                # Already exists - set 700 permissions again.
--                import stat
--                os.chmod(fallback, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR)
--            else: # pragma: no cover
-+            if e.errno == errno.ENOENT:
-+                create = True
-+            else:
-                 raise
--        
-+        else:
-+            # The fallback must be a directory
-+            if not stat.S_ISDIR(st.st_mode):
-+                os.unlink(fallback)
-+                create = True
-+            # Must be owned by the user and not accessible by anyone else
-+            elif (st.st_uid != os.getuid()) \
-+              or (st.st_mode & (stat.S_IRWXG | stat.S_IRWXO)):
-+                os.rmdir(fallback)
-+                create = True
-+
-+        if create:
-+            os.mkdir(fallback, 0o700)
-+
-         return fallback
-
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
deleted file mode 100644
index e86432e98a31..000000000000
--- a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
-SRC_URI="https://people.freedesktop.org/~takluyver/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
-	x11-themes/hicolor-icon-theme )"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-PATCHES=( "${FILESDIR}"/sec-patch-CVE-2014-1624.patch )
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pyxdg/pyxdg-0.26.ebuild b/dev-python/pyxdg/pyxdg-0.26.ebuild
deleted file mode 100644
index b7485e40e203..000000000000
--- a/dev-python/pyxdg/pyxdg-0.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-MY_P=${PN}-rel-${PV}
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
-# official mirror of the git repo
-SRC_URI="https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		x11-themes/hicolor-icon-theme
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	nosetests -v || die
-}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 7686d507dfde..b72bf1c38962 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -3,8 +3,10 @@ DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc576
 DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052abd88ea434137a4eb8a4c1e08f9ee1982a30df1934dadb615145f4af8fcff577d3d4e52058e7a8843aa8604 SHA512 93642286d0317e2fe970632c36d38ce6030f7cabcf971f28e3a1054f07390fcee5baaf7f167e7c9690dbd7b2adc61f5b7d75a218ace0abca34ff8815486cfdd7
 DIST PyYAML-5.1.2.tar.gz 265034 BLAKE2B a3f6fe4a0c0a24f8934b94545e7727fad26b397755416a8127bd52fd9ea5e8fea3c6452ddfbd91edfa2e8ca88522b1ae9061c9221f394c8fa4cbd1c2dc256f72 SHA512 b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
-EBUILD pyyaml-3.12.ebuild 1037 BLAKE2B 579acc114fd2d56b5e0bf024f554596f91515db4af2d01d32e31e5034a40889b79c97fc45eb64bf46bc1deea762963d9a5e5824a07961f70cf7aea16d4245369 SHA512 7772e1792d9557a6e469ef7de071860116ba93e91eb8450d9a07495d415074c837cb918b5e8e5d9b8f80037f0389f01eaeb644639fd94a9b6c6762d8526e30b6
-EBUILD pyyaml-3.13.ebuild 1041 BLAKE2B 020d5a3a7db094b836ac6b4a87ab0e0eac2c22e89b4bd84bb960de1bafb2da6592057a203cfa3e29fb239ea846f609665dcb8dc728cf7da681ac37d893d037df SHA512 998d63405ceebf274cefa9202e45c1bfb8ab45d81e1f2207374acb20ef807b4652ab1258d35ffad3424be857bc36e4f61aac012dddf9b37ae6346d32607d264c
+DIST PyYAML-5.3.tar.gz 268214 BLAKE2B 2017ec6d64744323c7e6f3bdcea77b249943ba93844de363ba5d2b14cf70cc5c06e8427d12515e1e60f8432a87a115df1033d959fc42851f61818d0bdc8cd7a2 SHA512 9124bf4d58ebe925f430fd6ed749e5a3311a54d536a035d39794c485843ddb80692fd7f7bac05797507128b933297ff730d967f49e7237c7c567086a83ee9e1f
+EBUILD pyyaml-3.12.ebuild 1038 BLAKE2B 24c55fde60111c5e55b37ff88443c03910d15dc18a0c79ac124e2be38d1560a184cbde65cdaff4881e554d9f637825e93d5c636d6e9ce749704f7a7ab459fa24 SHA512 20fce1f572cb9c16a6d456a9cae33d7489e99c39c73636355b5e0cff99132b19fd083625b07552559672718cc85ca2dc3ffda8900be88b1e923ba7e8a89b2961
+EBUILD pyyaml-3.13.ebuild 1042 BLAKE2B 8b199cbe733740a43ea2f14896aba490b35a9b3598bbe0261d3f7c6a599b041618b0c69834dc07282decbab583f00299814d13616e4efd4db5db0e6979df3989 SHA512 63d1df5910ea8c9cc9b8b43a3f8bc1ba1492fd4be069b0ee8f2cb0967cb00480e424dd0685d2f3bd8bd70f41bd481aa8c81dc03b8ff83bd431a4b299f8cd04d3
 EBUILD pyyaml-5.1.2.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
-EBUILD pyyaml-5.1.ebuild 1122 BLAKE2B 2b914fb30d1799b010585bec48823f77b483a435390fa8744e84f3827494770bcac23fb096d34b3bd84ceb408e76c6ff2a285ad6886b33e468ae9399d2236190 SHA512 59563081214821c8dbf3e11a63d2185f0ca0890785c19d45ff9faeeb79e7ad084a93a4dbb3680754a20089da35c773c2803c3c008fc480ee7b5f29b49703cc48
+EBUILD pyyaml-5.1.ebuild 1123 BLAKE2B c691fb9e289ba23fec8836ac225974bd3efe8d5e554467c88f7d8d0ea96cd42c4c9f5dad1cd6569582d0e756ba86e58621fb7036241f31a4befe84129e41ab1a SHA512 57b9f6dca4a6566b0ef7b2eabcd4ce6d64944b94bb095da8027250db135bebcf3be1e0c661efcb1c4666738b2cf6b13d487527c2eb554362f3d812856b7e5945
+EBUILD pyyaml-5.3.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index dccc41750660..2bb60c8bc1ef 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-3.13.ebuild b/dev-python/pyyaml/pyyaml-3.13.ebuild
index 87b82bac675e..6c60108bee1a 100644
--- a/dev-python/pyyaml/pyyaml-3.13.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index ca81b62bc1ce..62d85eb5388d 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
new file mode 100644
index 000000000000..b63569118b84
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-5.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_P="PyYAML-${PV}"
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
+SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}
+	libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# bug #659348
+	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
+)
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_test() {
+	YAML_TEST_VERBOSE=1 esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index e33600b2ecf2..302074bc0fde 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,6 @@
 AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
-EBUILD pyzmq-16.0.2.ebuild 1769 BLAKE2B c17a052f1873a15ce9dfeeff85f3cc1df49e39eb8fea26821fd04cdebf34d2879f0318b3ad16c2603f078be0b2fbf6ba0c1281198aafc4f21b4e1f67fc33f9ee SHA512 9ef86b6adb8fd2eec0733e76be3da99e6cad72dd9f3647f0e0882a4220702cd9ef1ed6b0d919e2f118fcde6a4988d25604b95b5ced691ded5f4924be8b8e4887
-EBUILD pyzmq-17.1.0.ebuild 1842 BLAKE2B 5544284ec6dbc4b104b33d92b8435c85f74bde623a5e059508f5dceaf33f95920f19b81a1a407d3a8bebf1abd1fa0ffed4557db51a5794256736208dc64fb42e SHA512 2894ea32204d9dbca93a31638ef223900ba821ba4223856cbf92936d597c446ffd787dae597aed5367041f548c55c9177214c99c8eaa182fb5002f4f4f1eabd5
+EBUILD pyzmq-16.0.2.ebuild 1547 BLAKE2B 74a351145907472b6746c22b8d8f6aac3f7a28de500618c131d00b58d8c0647708289eb99f3905d30d1d0109760837f95399ef72c839c7cb59601b1cfea2bf16 SHA512 7fdafdd04bb9cb150e14da28c08ec017a177f65afae67e306fdd6d3eda37bc101183b5e12d381efffed96e8eab2a9e105acfb7728a37bce3090d3fdc55a0ead5
+EBUILD pyzmq-17.1.0.ebuild 1620 BLAKE2B 5176058a5c46503ad9d56ddca0eb98d4ae19a4015081e5b59a3436cfa2672d27b09977a2a351e49e9be591fad384f49781bbd177e94704ad38b975d3b0b70301 SHA512 9e86bc1839d657fb3302bcbcee992178fd8861acc738960cb4a017b098a746fecb48686c2fa13e05d01f0da6b9c5ad8ea206671c9b5f1f2d7fc78a4964a107b9
 MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 914737e0cb2b..c6f982a73c26 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
@@ -22,13 +22,11 @@ RDEPEND="
 	>=net-libs/zeromq-4.1.2:=
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 	doc? (
@@ -53,7 +51,6 @@ python_compile_all() {
 
 python_compile() {
 	esetup.py cython --force
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index 90216948f4ff..e7d8b211d806 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
@@ -22,13 +22,11 @@ RDEPEND="
 	>=net-libs/zeromq-4.2.2-r2:=[drafts]
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 	doc? (
@@ -55,7 +53,6 @@ python_compile_all() {
 
 python_compile() {
 	esetup.py cython --force
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 82a82f0a2586..9b39b0d5daaa 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,5 +1,5 @@
 AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B 4fda5c9b1549c2433961ca4dc23f03b1022d314e60d93c23cfc7e73131d802b3696dae2dcde6892d13058f3499339c32696b0557a53ba275ee3d3e86bd389635 SHA512 a22eeb8f485a9ad6b0547bca19ec840fcd628a18dd34c589a5835e3d502553969bf8ef90f19e72dac33ad1c3e36fcae42cff19a010fdf2274bd25308c8a05d0c
+EBUILD pyzor-1.0.0-r1.ebuild 2016 BLAKE2B a11a7481c4a305edd7c88c3440f4dbea598f793c29700468fdbf091b8b7dbd88285e9460a1aff66947ab20d6a9814db8ce5cbdeb3c073c977ceb30b598077fe7 SHA512 888a56df98be4a11758d224ae0287cf9d88663009522389385e5ff7b4704ce31f1d79103f81dc7eaa5d995cb7666175ba224a8667e3b69181d2e33a3fad65188
 MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
index da62bba384ae..97c8955e5be8 100644
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/release-${MY_PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gdbm gevent pyzord redis test"
 # The test suite is py2-only
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 93cfa2a09cad..82558dad14d5 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,3 +1,3 @@
 DIST radon-1.4.2.tar.gz 1645389 BLAKE2B a379a552b5e31c106d2a870a16b3cbe7d70f3565b0964dac5139dd0e6e09c5d945001386de83017d05f4e5bc9f58cf481e9386caf2edac3f1df5a8b187ea0693 SHA512 0e440b36a7edf0ae8002ee27d00cd14a351261972407b4a960d9033712fc0f7f04c1541d7bcf1dc918f2abd46e1bd720f914f3fa3c101f36bf502bd1ce8cb7a1
-EBUILD radon-1.4.2.ebuild 1189 BLAKE2B 17ee2de550c6c43a7c0277155508121b9df7b26edee24947e7537291beaa2550f711eaf1e2a94321156bbc0c56eb7bd127f28e4d35cc990bfacd7ed7e5382aa5 SHA512 2563497e9f578b2d5e348fc73cb9f47502347e1bfb3634958d3c80c2a99a96afb03be2229fcf5f8139deb67415ab456eddf45c3dcb951905b8ff1d6dc2b81ae0
+EBUILD radon-1.4.2.ebuild 1179 BLAKE2B b8179ab3b120927791e257e2ea68f3052fc7bc6ff4280b97482e82bc5c1a4af789b1bad587b64544bf1bb9ff14c93fd59fdf2929bec61838a2bb728703d24458 SHA512 48b3cb047efae398ec8e042b899039d66e62ff864e1e1b60946df2e6c6bcf8c5160cacd519a321b68338d354803a1dddbfbf1b0a782ed95044929291ee927d69
 MISC metadata.xml 284 BLAKE2B 93c4d56ccedd9e190f11ff9efc0e8a9cd98b842c866296d72662ed89a77982e0262907e3c4e057c1a022a72c09bf4bcca752475489349adfd5ee76c2a563264c SHA512 d0c5d0f28e04d527461841465b2280b16622abc6f6fd784e9f1b2630fa794666fa3a88b9962520cf13fa4b9f2817acfe2645c18ecb3aae3f76b62fff198a7ac0
diff --git a/dev-python/radon/radon-1.4.2.ebuild b/dev-python/radon/radon-1.4.2.ebuild
index d1fa977708ba..aab7f431c0ec 100644
--- a/dev-python/radon/radon-1.4.2.ebuild
+++ b/dev-python/radon/radon-1.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index b4f0dc907b02..063fd4ab149e 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,3 +1,3 @@
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8.ebuild 1004 BLAKE2B f6fec62a90677301b47355910d04ecb1fe1979413733af1bb568aacc231de5ab1659a61efd4e28bf84eba3d5e335e7178a416ca38b6f8a53442fc79c02d8686a SHA512 b55324bd124c3c29af7565c0a146d20cad9e42a62ca36d73ae63d9b4919dbb1420d0b17995fbad071555565e77f729bdc12ffa4ca611b60742a0ad4e8a501519
+EBUILD raet-0.6.8.ebuild 908 BLAKE2B 3fc45741dc163e06dd450730feff0007ec21f88ae7dbb3c0dc653b93bcceea29b1d3aa7c34a572f0b28971dd7b8738693a22ae6b13610e978497c355b0ff2b6d SHA512 025be2d4a5b55ec054b60669c6ae02380b51fe3467670081502713fa36c81722720b760e49f7545137b826c969ab3b4a69919d307ea82a9817f23bbfdfbd7536
 MISC metadata.xml 489 BLAKE2B f5c03c42cb002c7d6c81692f7f98312ad51a06e306a33b63cd048cbb25d0ef1429e5322bc5eb08de2d3d5a179a100f61c5e73d7f874a43e009eb0bcad8013e26 SHA512 0987a39737bc4556adf615ced4c1550f69fd952d32f5208b91763da8d23021fa88c5bfebe0f12fa382fad2a4066f68fe372c637389543a936dfc818f1de5f621
diff --git a/dev-python/raet/raet-0.6.8.ebuild b/dev-python/raet/raet-0.6.8.ebuild
index e54be9d2ba46..c0717ce6d463 100644
--- a/dev-python/raet/raet-0.6.8.ebuild
+++ b/dev-python/raet/raet-0.6.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Reliable Asynchronous Event Transport Protocol"
@@ -17,8 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 	>=dev-python/libnacl-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/ioflo-1.5[${PYTHON_USEDEP}]
-	python_targets_python2_7? ( >=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2*')] )"
+	>=dev-python/ioflo-1.5[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/ramlfications/Manifest b/dev-python/ramlfications/Manifest
index 5682c7620292..4c28bc21f2f1 100644
--- a/dev-python/ramlfications/Manifest
+++ b/dev-python/ramlfications/Manifest
@@ -1,3 +1,3 @@
 DIST ramlfications-0.1.9_p20160718.tar.gz 1104645 BLAKE2B a33cb4529db10b92280c9ed6bc04e2d4c2d534cc4748ce219984f7fc4c7bc432ad51adc901ea021b64a3776402b159d38cbd34e2c2bca4b863f012026e2b3a0e SHA512 a21330cddb2d390744d7c13ee62edd701f74a83c16f87b897460e2353e265f4171e90e8b51bb0c17762a1f3494ddf8aeaa22c36f0aa093f936b9a51e2d75d1f5
-EBUILD ramlfications-0.1.9_p20160718.ebuild 1202 BLAKE2B 3f65f5bb7170933d5a1a928269d0b74e5c89e85b9ad4e5ef03efc4b91a7d1ea8430304459876cc29af345fb7221b2a6edec7d17d071d71532320a94bebeec835 SHA512 fd76de534aecc1dd84844980595d1534171449f6794224076e3cd364a6b43bc2e62f9ac4640232d81fd4398b8d98a0330ae7d885d0575b90ec248f9dccdf0be3
+EBUILD ramlfications-0.1.9_p20160718.ebuild 1192 BLAKE2B 8a3c00eb9eded08e4d11e2d27a4bdf449f007431a056a6bfe53fb663719c6382df0d2ee5656ca3a2d0315c9f1ce239f06b3217df583a1b01839938730d28b616 SHA512 b4517801f088e2206dd51b3ef72947eadf9f63135ecde40df750e6bcfab6cfd5000e3a30932d63f1d98d95713009d139813aab8f43ceb2029362701f514ce829
 MISC metadata.xml 692 BLAKE2B 08237e74ca499f2e424c9650e1d0cd553e802cb50bec23bce46a4a8351266fef545b62eedfab60277cc9621093f378f350466561b5ead509649534b088de14e4 SHA512 71b7a6b4e4ac31680ee35e60cc514a2378ea94d48476369aba0ab172e44084237c7a4a54ad7a18d063cc5e297fb89d05ea9d15b5db0140f4672332a4ef74315c
diff --git a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
index 1d489a02b63f..56171eb5b114 100644
--- a/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
+++ b/dev-python/ramlfications/ramlfications-0.1.9_p20160718.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 COMMIT="32a11cd7d75c4c5b3e3fc01c383314be298b0f9b"
 
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index ebd3f133be29..53417134342e 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.2-r1.ebuild 2926 BLAKE2B 36fd9a9f9050f90980c4404510d81d6c55ce4ba5fea94ff3323247a2f2062810bf0221c47fcdff1d7febf5dfe224d310d01a484cd7b4e9b0d91ca1d270b35f6e SHA512 e95b0d50573b3c5beb4e5a18a31808315e8e5f86807032b781c406c19b9cbfab3433abe756c1a3bd03e972f4a7e86894c52f35e1bb9db85e1a09d85a318fc993
-EBUILD rdflib-4.2.2.ebuild 2738 BLAKE2B d9d30ba77a826fc1f90e6f3fad749b9d610d1f1729fd6a9aa53d75bc6c35244213cccebe7a53eaa3af987e69177f083d585d661003832a017f1f65971485d299 SHA512 55abb2a4b0a466ab0ebec68a1db0d31731b8ead16ae37eb544cdec3929e922e796feee1f4851ff05a39de481b4c10cef028407a9c02328dea784ff7013291892
+EBUILD rdflib-4.2.2.ebuild 2739 BLAKE2B d348c421d5a1e424aeb1f772dd0967a2eec60eb990060ccb55effa23ec656ffd4b275bd54012c5293835b117176123ba761e300a856c0c5c372e671c996fca80 SHA512 41ba10ea7872faa6ef7881558bea587f0bb7caf4d47dd00c25fbf6a9dcf28768908dda4748a4365cbf9a2701bd1515d280f8a1df6c6e0d0f5915cbb12ec400df
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index a76252e0beca..ed7ae1aa7467 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 1bbba5675a39..c3c9cef2fd25 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
 DIST readme_renderer-17.2.tar.gz 14643 BLAKE2B a41c2b1b426f95f026092e6776587e68b09fbe314f148a02ba21edc17f4610f563718cb8469e3fc4baaa9c1c95ca501da205bec6abbf7f70171a1ee7e8710159 SHA512 2c25eb24b04b88fa8522ff0068e3a3a7b57b035641d0053ff93c295dde50cc6f21af9eeca1061eef794f52b0aff184f97c95b3c232f02b308e09682e50a6d40e
 DIST readme_renderer-24.0.tar.gz 24038 BLAKE2B f9c9dea1284cf8ac0a8280395916118fca13a4d7537a455e95436d1d7b818c11d197618dd22c3810790eacf8982d31378f3e22dc349e82fd6dbce84192c47b4f SHA512 202a7142ccca3f5bc4e6d92330f25284fcc4f3984ccdd886e4be2789518242ed659660db5a7c7224f838dc8f5ea9dd6e14c65746cf08a102431ddd77d62a434a
 EBUILD readme_renderer-17.2.ebuild 873 BLAKE2B 1bdab463393f19fb2dfa4404d0d6087a2d5f35fe726b51c8465bb9d200c5463755442136459cea211b3f0712d2d70ae3ee96fbb10a0cb4d64aea255a0d00befc SHA512 248c1c543c403ffe8c36fd95bee90774ad1b44baf0e0e79ddcad81ef90c6dc737fc340e72877df4e580685f2b5e70f562afa272865358cd3bf10653e56903732
-EBUILD readme_renderer-24.0-r1.ebuild 766 BLAKE2B f81065300cf79d350e32c67d710aa721f8c982871c84e9d8c4e271a93f9db17be059aababf7a21936a44ad7354e0485ad7b9fff5703b754e031233e4516c0706 SHA512 414637148262a86a7180efa572d54bf39db173e872fb60f32c7da274770f1dfe07aec89c63a159edb4d63c0cfcd76454eebc3cecb25d466ff0e2b170488f9c24
+EBUILD readme_renderer-24.0-r1.ebuild 764 BLAKE2B bc36d154809232d7be8a6f2705c726356d57c565b825ecc0235f249371f6b0535e203b85d0ddcbbc907cf7bf6221701897d2f7dcdcae9a78ecca2eac31b9b907 SHA512 7d2519cac86a48c14f10d439cbe056062d2e4bf59b38062c138697e492a7dee324f5ef6c5322d4ff51fc0b4f83f1a2a6af3f4c476cf3c9ca19d4ffaebb2f91c5
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
index 9b4c4f0b017a..98bdcfb59b48 100644
--- a/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-24.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 38187cac647b..fd304d7809dd 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -5,6 +5,6 @@ DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B
 EBUILD recommonmark-0.4.0.ebuild 540 BLAKE2B 2c177c57f2a22f87470711e1b326dabb010de096f66ef4518aaa033b56bb514f2ccd01a2b0e6b41251e8007d6fdd52eec13a42190bf3832427c9dd4c03d18777 SHA512 2ddc82b4e50c439eb5c3fee4478627c47d1be3485e1321c53a59d97ba8956f01676b91e3a39b4418bd71d5a3fb560e997527a6872f2d0470c747c3780d157235
 EBUILD recommonmark-0.5.0.ebuild 855 BLAKE2B 3975e0eb2d4db06fbca22b69f6378133c3f96dfc8ab647f939d06a61aa491bbc1374691b6fef963e6948cd8b9337c64cf2d8351bd530b92d584ff67e2c0152ac SHA512 d22648ebf733f1f606c1b1b049ba15ec5644d8e704ce3936848a85b1f8d24dd902407707180672df387756655663ebb226cf351a6e5d9a008d2f3208b0b102c4
 EBUILD recommonmark-0.5.0_pre20180907.ebuild 978 BLAKE2B 2af506510486d55bc9f7484f29f4655e9dc9f7341b86a07e261102981c2b8c744282aca3b14162a70aa0f87e218f507df1be0f1eca7cc048edda108be7c9183d SHA512 2b057f495d2c8ef8969f2277e7777b5132e07cc57b12aea0e62ff7fb4b503ce1ea10a53d2558623da512586363375ca5318e7561d4c4da907ced88d4fe74b935
-EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 958 BLAKE2B 8901756482f36dc9f16a358dde91289d680fef9cb5a5befc3f8cef1017fb4243f5db1b2f6e66bb14ee193709ed7f9f438f1cf1bf2abeb4f3a78c326301ca32e0 SHA512 4bfc7c29ef01ff9d5bcba37b04661edcfd55f076057be6490bef5bac7db151fd34906e44f515c76f0f2ee89301b1060eeea4a1b124a33ada6844e770b7e152d8
+EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 959 BLAKE2B 3e7de5fa657ed05dc01cfe126d44016e792aefd19cdd5c96940f9249c5982498968c20a2a0a1e0c9712da8050aa825463b89b37b542225b8e6549426088a2a09 SHA512 5be7b444c7e4ba6c2cab92f1d1bbe65893da1f02372fe1cc65cfcd904878aab353f492c897af62b9c0aaad057a26808e755eba792f0f64840062679bec8f93c3
 EBUILD recommonmark-0.5.0_pre20181012.ebuild 960 BLAKE2B 5ac25ec8ced21df3d1d04783feacd42d8ac5e3296745083c7820bc2b1eba5e4f2cd4594c86215d4222a46f7536706dddbab3fc4815c9ac978d689b22ea7a1051 SHA512 64b07cef5b08067a5cba98b3cf25e0cc0ae546bca060eff98bf8368be9337a0f8bf29c4d832c84d6f014d36fe619cc3ca24a31b003cf11c3e53efa4efb7ced40
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
index d12a9618367b..6c8adfc6c0a0 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/regendoc/Manifest b/dev-python/regendoc/Manifest
index 56610e01992c..38681d13ba44 100644
--- a/dev-python/regendoc/Manifest
+++ b/dev-python/regendoc/Manifest
@@ -1,5 +1,5 @@
 DIST regendoc-0.5.tar.gz 5651 BLAKE2B 5e9dbdf51ccbdfcb741a6e17efe8a90d4651e1aa41ebd3223ace901cb6e29b00916c5eb75deec8848dc3b9b5da7934231289d29f1cbe5dfa702f61ff900219d8 SHA512 4da72c278901d3bb7ec711337c12738903c3686c7b7b30f95842c3fe2b04b4d59f20fa7b4b1c2334e8c7036ec02d551a777a0eb094541316928eae1945708977
 DIST regendoc-0.6.1.tar.gz 5832 BLAKE2B ae3ea674f7c5762f1c53d05c021daf3ab6133efcf9194106eafa87031004aa8e9b53cd86cd9b2ac2b2d6829a38dd11fc2a62db0c4f00d7e1b32a8771bcff171a SHA512 bb6551e1e50fc540649e5856bbfa36d7c26aaa609b8361e4f0260246c6479870cdca97b95db6730a0a6763fea626d4d6267fda1593769f90416447a95f34a18c
-EBUILD regendoc-0.5.ebuild 716 BLAKE2B 1402f934bbe84276921ff8b2e8472209792828067da763edcfbaed898f66aacb792281840bb518891a963e726b37ee9cc93b8cb6d8207ede997dd607559162f1 SHA512 8eb25b4656e1d6be4a31d2b78b6b88489d81c610fb62d0e0597b760e77b51e17a7f40c41ee9ff9033df94a289f5a4ac9a6eab318f0f4988856a47284f47a9497
+EBUILD regendoc-0.5.ebuild 717 BLAKE2B abaa0b0f290cca9815387fdc4fb1ded383f32fa7f4aa341763474e9f26835915d428b11d29eb5cced3a7fae500589725c6f653726605acdc92f1cf630c5a668f SHA512 e3ed01cdef2b1d2766be489bb122acc988e1fde1fdae0c22205d3c649f6eec99e8b7b6a0eedef522fa3a488ae5279639fc3ce6b8d604f03a583c621c3f2f95de
 EBUILD regendoc-0.6.1.ebuild 855 BLAKE2B c439a0743f82f24b515430e1a89b0219a1bf793d6a8dc1b9fdc74957e9c4833b8be6f99285eba819f55d9e32f9870a15375931308902d012242c820d8e50cbfb SHA512 cf6f1df1e9ca83f5e0d4b5e4d2af28f3cc5ba48064d2d1762b4d3f6095d169291f5fb074575d8260515e4647e98acc027e8755a4cecf3d1aa13d6f33becd461f
 MISC metadata.xml 380 BLAKE2B 9255cca7329fef2ee19a090b29c4150f6c3d07ce4fc8d7da976308add0f1b5b39dc555e2f1b5ead6d4f2e7d6c269caa9a04c1d334738600ebbfffce4d02d7df0 SHA512 f7a80142633d3df1513dabfdbe8f2dea3236a668456bd449cfadda657103f4a4ac9c692145cfa47ff71f076e7f174b184d7a750f1d9aa065a1be80661f776776
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index a7eac1aff527..2e31b72782f3 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://pypi.org/project/RegenDoc/
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-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"
 SLOT="0"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 893983563498..d06d40c989b2 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,4 +1,4 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
-EBUILD rencode-1.0.5-r1.ebuild 500 BLAKE2B e68a32a660efe4e399a9c1a43fb5667d9756b4f1dcd51c22fa4ac54a4367f6bd2eec044065178d97a56812017924c78345029a55414da362897d13521511f72a SHA512 9151b68ae087622e7db91e73c97798f533ac2722832eb4bf608609a1727261a212e2595f7b5e0430f587a9b354ae9b741d0dd6ad261f5eae0fed2865b98678d7
-EBUILD rencode-1.0.5.ebuild 494 BLAKE2B b5d178c864317cc14db1a3e27e9a98dc638e7665b6a3c73ecefdd5863749cb3e84907a4d0bd49ec16fee81eea0fb777a9cd1eb110043d0dec81e3824105cb1bd SHA512 836106ea280e293bda8dc7a0c609319ddb6030cf54db519b93848582680266e8479059825ece9adebcc2611804e541bf687a092593b95c3db25ee37e83c15ee6
+EBUILD rencode-1.0.5-r1.ebuild 512 BLAKE2B e7a18311327fc216b9c1cc22e9eafac07a41d2863f3dc790cd0b53cd4c397f1fa8faae685f2804ef7a4dbe58971ad7e8eb2f9e6e94d9c87fe4758abc599a0b4c SHA512 30f4a86a2d230b7b85c87a0255f3ecea4e796d9ae1133667e6532d377edd04ef444bbd3bab3752dcf111c133eb86bcf0f5120ec6b6cc2ac6400ba6a7ea860d4b
+EBUILD rencode-1.0.5.ebuild 506 BLAKE2B 54676aaf35605eb5dbb61c99e052218b6e196a18d7badf022e2741ecc69d11e971b2953e4e377e2328f2ed423f313fd57297eb9cd1f1d84f57f403c30682c571 SHA512 60a924ca50683e48cc0b09299c00f9eb8c1b5319042a8c1ca9ac72ee4c06b75378a4b984513d9eb52cc9001ffb9442cd74bb55b64091b81df27f9250efb05da7
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5-r1.ebuild b/dev-python/rencode/rencode-1.0.5-r1.ebuild
index d1bbbec38a3c..c5ffc4b4aa5b 100644
--- a/dev-python/rencode/rencode-1.0.5-r1.ebuild
+++ b/dev-python/rencode/rencode-1.0.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/rencode/rencode-1.0.5.ebuild b/dev-python/rencode/rencode-1.0.5.ebuild
index e9aa630d0b76..10cc1d2f509c 100644
--- a/dev-python/rencode/rencode-1.0.5.ebuild
+++ b/dev-python/rencode/rencode-1.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 26acb74567c6..457ec335b2ea 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,7 @@
 DIST reno-2.11.2.tar.gz 74623 BLAKE2B 5c985a81fb6ef7926eadfd1b096f1a1358cb814100b75c6175b6507c2d9ce64f5a06799164a7593cc40f00695cf538c9a49bee1a4d0f78c115519d660681b315 SHA512 b2ef0d9112e327d3a581bfe9b4d6e47b7b4edaa3fe463716772438aab0dcee445d94aaa93bfc7036ead297206353ade73a34d148521ef5d25abe9ca5e655a13f
+DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
 EBUILD reno-2.11.2.ebuild 709 BLAKE2B aefc4d552fd0545c8478e49d36dda7af8166f98b653977c4cdbe927f422379d6238ba773c91cd075d71720169cb3ddcd3bd57702edfe78300daf252314f6f618 SHA512 b99f1ea5c1e44896760933afc00e0fbddc9a11f85f894c3c044dc7fc4dbdd5fde8e5ac930b3e168ccc6ea40dc0e4339e47f19b91961a5217f3af419b5c2ebbb2
+EBUILD reno-2.11.3.ebuild 647 BLAKE2B 2b957243f5f83325881255345fddf8b22d17e91179df139a2d1fc979cd2d780943a7f3ade3b0398269e827dc319242551ea055caf705814c1ab313e7f56f7bdb SHA512 56a3b9566071a3062cca9ed9b0204df015b193f4da46564aec0445c6fb217578bd42ebf1755ffa76942ff9e1d373d45abc270b84731a400f6ccdf4c7dc64c14f
 EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
new file mode 100644
index 000000000000..d0f96e1bc5e2
--- /dev/null
+++ b/dev-python/reno/reno-2.11.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 7926bbec661a..db1c448ff994 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,9 +1,6 @@
 AUX reportlab-3.5.13-disable-network-tests.patch 886 BLAKE2B fec5e11e9219e0ca320263539ca50016fa94829029b36922bf213544b827e736c6e060cd6946bc1584cf1b2b0a1a026b7df41c68d1081acba50956686663777b SHA512 561fd5f5a3cca662317fad3ae8262880b825765537fd2746042c92f290a0ced95ace7cd8d02316250f02843b4a27e0cf916bba6fb2efd4166cb19f3da6c7d6f2
 AUX reportlab-3.5.13-pillow-VERSION.patch 915 BLAKE2B 91f1177441882f055f0d9b1fb3c5eceb2acc0130e81e98ea0fc9ca1e9de332d438ecb223771e2c91a4b6d12d368f7974cdb3e1389a36be735c7fbeb9679214f9 SHA512 04d2c6a5f93f0fd00e903cc64ed71a03cdc898b3dbd94e8065712acff3b9f55c8e04fa78832ee90d91dbad129767a0357b59646f7284ff545236f5a4978b4ae3
-AUX reportlab-no-pip.patch 419 BLAKE2B c09e5ea741b04dbeb7791f713d9171995d99da73706201da9c14018b7a1789621ae53317ae8d170fc50fecf860b7b0c84c1016b24a505eef778ae6fc964fcf01 SHA512 1a5f4bced7be3c706b57c262dfd84fb539af42ae49541cf68d01963c8c79c96ad0a8389f36f486a485d258e9aa860c195e061c3c34070cfca3e64b52b6c89cd1
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
-EBUILD reportlab-3.3.0-r2.ebuild 1640 BLAKE2B 56ce615cf9df112a0bbc38c6177669d615de7ebbf941bb5308657233171c839570163e8eebebb1491abaf4be12931271031368eb40790274337d1c3ff3c57906 SHA512 11a8fe945c18ab2caaccae0fb5139109efb8d3eb450d278d0d6ac68ed2eb457dac12738d997693d399a6f0e1f6aa59400b0e724dbcc73734379a15bc957c63dc
-EBUILD reportlab-3.5.13-r1.ebuild 1512 BLAKE2B 3c16e3d9e51ad6f06262757295a2aeaffa0af7ddfe3f7439ba89f034c55caa226afc6f809ab0dd06b5497662a12f1759ace2114bf11b348616bc44facce68735 SHA512 1da526e05e20657ec6a8964b7e4acab2ba9f387c010bcf6662b960e6ad2c386c88ea934a58afff8e1064cdd44b054d292e06074c63bf2943b248d686ab5ddb05
+EBUILD reportlab-3.5.13-r1.ebuild 1508 BLAKE2B 3ec312200b9ee652d79ee8e1380be040b8cb2da1874b4286cdcbe0c78b495894e76b3894d7309d58fe3854652afdcb387780efe23301a851222ae8bdbc58a2c2 SHA512 9eb2e70d66dc8c0aad29b0d14dfe27bfcc2d1b4a5a98e130feb08081719ce4054881c83721ce29cc4bd3e43eea4429ec4c1e7f1b3862b87b915f2078a7985c37
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
deleted file mode 100644
index 332878e24dcf..000000000000
--- a/dev-python/reportlab/files/reportlab-no-pip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -538,7 +538,7 @@
-                 ],
-             
-             #this probably only works for setuptools, but distutils seems to ignore it
--            install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
-+            install_requires=['pillow>=2.4.0'],
-             )
-         print()
-         print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild b/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
deleted file mode 100644
index b090a00fc797..000000000000
--- a/dev-python/reportlab/reportlab-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} ) # Tests crash with pypy
-
-inherit distutils-r1 flag-o-matic prefix
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="http://www.reportlab.com/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	<dev-python/pillow-6[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
-	media-libs/libart_lgpl
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-2.2[${PYTHON_USEDEP}]
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/reportlab-no-pip.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	sed -i \
-		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
-		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
-		src/reportlab/rl_config.py || die
-
-	eprefixify setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	pushd tests > /dev/null || die
-	"${PYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( demos/. tools/pythonpoint/demos )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index 02ff2d6238d0..d9dc2336fce3 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/requests-credssp/Manifest b/dev-python/requests-credssp/Manifest
index 98e1245e9342..b542b6a88b2d 100644
--- a/dev-python/requests-credssp/Manifest
+++ b/dev-python/requests-credssp/Manifest
@@ -1,3 +1,3 @@
 DIST requests-credssp-1.0.2.tar.gz 21813 BLAKE2B 4626b31e9933e7fe5abdcba59834bedbc14afdd32b21d90124bbb458407213ba8cb92e98394f980f43aacd61de6c0e56e835cf47489ea55338a3dcdd171099e4 SHA512 8a076fc53eee73e24b08f6283b02a48519b9df076222b2e37c145c1d4c1756c29ccc41f0016c5a8ee7f5f7bf76c95fa158016f2cddd42b45a5ab2182939ffae0
-EBUILD requests-credssp-1.0.2.ebuild 705 BLAKE2B d8eaa9d79b99ee6c7d488c0103c47db322055a5149b19bb52807b7e888c5ee92100d8d6c104c1eaf81fc45cb21220cec4f3c49b24f05e4cd81cd7cfa888f956a SHA512 78663e912a3464bba58bfad99f4cb56123a2a61b2efb54af16a520ccb8414e642c93e74128eea3a80f306743108684c8d3a4a47304676d187d9ca7f87f650647
+EBUILD requests-credssp-1.0.2.ebuild 695 BLAKE2B 1770332943b565e513fa694a5b832f29266e8ec7b3ba031a61f74b12c1d2f25eaae0eefe64ebc7b66180b93928a570263fda7e9869553bdbd6abc06112a8750c SHA512 70d91801f8c5cbbdef5f729400aa614726c1b5d78afe848fa2e305a12ad33ebc8d3c1b29b6393ee47e3eecd07695e7c96cc616ab55cc8c9a979d012a2ad6a1bd
 MISC metadata.xml 325 BLAKE2B 29ae1049a0331156fbe1f955fe60417f1d9c5a9b78d0248dd919077c9a6938843faa37f6a56fc50d60d5193f6f3593d2845ef5f371f4bea5d69bc03a9111977c SHA512 738d9d27265c68d240b23837c3c527f60067e1ca70630ed610845a3b2796905f236d90fb3b812958dfd202d3c91e958a9976dd3395a9ceda59ad06d6f1a67893
diff --git a/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
index 076c56e5cede..9d23c06de361 100644
--- a/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
+++ b/dev-python/requests-credssp/requests-credssp-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="HTTPS CredSSP authentication with the requests library"
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 54ff22adb51f..17a171ae77a8 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,5 +1,5 @@
 DIST requests-ntlm-1.0.0.tar.gz 7786 BLAKE2B ed223722c3ef6d0434e62016c97f82214ec3908e82deb96e3aeb0b77b7b799418d0bd9de23276c418547e13bcfa43ca351a8b59de637305fa04d8460aeb01227 SHA512 62c8dcb674240944b8347b4d82802977755bdc871bf37c8054c6cd7d11421c32bb92d7d0765d60c4bc219e769176b709ef3bdc7355eb8c71f3745e0895c9f30a
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
-EBUILD requests-ntlm-1.0.0.ebuild 536 BLAKE2B 1bbebe44ff3980105734936c3518679f410e01e183fc3f64fc4b384886eff7566f42e7d0e3d7442e91321ef68cf27f0a280b9ac74a7907a305470776d7ef7b62 SHA512 f3f506b908eb9eb1ba3ef614ff5df6b41ff070fc688f85b3d241b79e5e7a8b222ed4cc328f621350ab60ba7a7bf55361ffcd1addc57408b5c6957e33a5b0c1cb
-EBUILD requests-ntlm-1.1.0.ebuild 571 BLAKE2B 0002e17dec852177d56f2427b9de5007257bc51981b7400dafc83a94b63b4da92971311cdb522775e0b9e6bcd9ddd3cef27cb348d9a4b5f0be14d954603e071d SHA512 d1a71114212966d3aa60c669846499e71e46c1a821826c0802cb77f7e61e5493724ad6159d0a550bf0618081c60d64904fc578b61fe5d4629a71c5fe6e45da86
+EBUILD requests-ntlm-1.0.0.ebuild 526 BLAKE2B 4a3c19fda92194d80214310472b12a6052fd08c4550d70950a0b6f67dd5304acec0a7ae10a6499f11afa86d64a13a290699121d954bd99636928d05ef991239c SHA512 9caa0a3c59be3c207c0e4fbb538bd8c4875a6462bdca4a464e89db9d8b28d74abe5f951e2a9d817fe2df5b787bd8fcc8ab2a284377e95dbe49c5f007132274b5
+EBUILD requests-ntlm-1.1.0.ebuild 561 BLAKE2B 3ab2eec2d00ed65ed13f0974d641b5fffaffe57ca9ed3a229ebbd949269450888ac9ac553c49e9aab9eac56a88b866d2c4b00765ff2d9388155effcaaddbbacb SHA512 d70cb54da3d6cd3097909cc13254c5dd2e50f8c4203aeee8ce99d62bf4087b18b079e44e917892b81902010ae457274c949e91323bead317f67458ff0d85edb9
 MISC metadata.xml 429 BLAKE2B e6f1e928cec0f1fdf663d132370e26df8fcd5169e8d36db83f5fdfdb63aba79ba479547237b982d33db81e65b0c2bff182cbb316c5e9208e0bd018e89931e6dc SHA512 ccb4016446f637c44fcba7446a7d3e3f0521164e76b6f7f5a52873fac8f14728100b67d853e7b96589c1f46f2ecbabcf67c33101a2c43e71f0d8fb2f8fe2f70c
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
index b66f32d44818..ad31142955d7 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
index c6aa33a7def9..0a6f44069371 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 323c0c405916..e96ade06ca9d 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST requests-oauthlib-0.7.0.tar.gz 40641 BLAKE2B 3c8e498652df706223dc74404185c14c8f131e0578b1bd2671986507e9f09f7328af7193b0779615499240f67cf6a0c395c103afa63bd6d7c674f2672f64a471 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2
 DIST requests-oauthlib-1.3.0.tar.gz 45449 BLAKE2B b7d0df59eefe801e09329bde8604d09fe0f45eac146172c5ae5f1a77df59229a89c70d78a97fca0f7b546a015e66d6d9dd4ac3efdd4de0100f77f2427106e197 SHA512 0eebd209dad892567de7d37f1482b5c7523eced3a73a68054674b29447d090c885b2388fd6f2db26436f14098833051c8888ace8b137889a4012e010efb0e86b
-EBUILD requests-oauthlib-0.7.0.ebuild 818 BLAKE2B d5ba305f5cac202b92e304b62326af3e94a5cd7aeb85a0a19c05726b109db1c84485efcb310c1e9ff2014f831c068efd89057d4bab2a866097d0855f3016a701 SHA512 439857e4999adee1f1bad7abe9edb253139d13fd26f2b2f8a3893d107de406779737803175b0bf7876730399bbf462607b068c897fc1bec82d76352311c94e12
-EBUILD requests-oauthlib-1.3.0.ebuild 864 BLAKE2B 633eb5062a67b06c756a6d1b031a72960bc3e70f86cd9a193ba63777e0cd7eccd27d58c27e441e35b9469df8692c3bbeeadcb0ef6e52bd5f6088ba4241588c58 SHA512 60aceacf83515627817085b43ff7113a28f8bd900264cba567555d592952911c6e391d693d10dbc84124c539d3fc2918a941fecf4174cd698ee7e86f1ce8b98e
+EBUILD requests-oauthlib-0.7.0.ebuild 808 BLAKE2B ab109e3c34bd639abdbb52466ffe5825297004bc40654ead9727a0c44996c313feb4187de2e7c45d464661a35b4548269120582603de2110fe09f194588c1253 SHA512 36ce9993ba55c6bc9fcd3370b560a3eb3a7cbecac1707819196e79b6692d5e33bdb83669ca011372e5cc4a7f655cdbf8c53f6d394a30512516656735ad5189c9
+EBUILD requests-oauthlib-1.3.0.ebuild 854 BLAKE2B 2ac502a1b03c6b2a8b4fedbcf3b758309e81809a0f0eaef0ac2d2ed64ea50a058cacb063ba71d3537c248920b53b41ba4f9dbcc7e75da4c7013b1b2703c74e1e SHA512 b53044dbc38fd3acc30f68725ba2ac1bba7af809000457afc0cd0bd387536a0339ca3a84b2aec05189d6be7338db54dcf4f70d3f3dc0171a56497be18bf013a0
 MISC metadata.xml 331 BLAKE2B 7b904925adb6f8e39c1d1000e87c287ce5dbfa7a6e70544ab599b5ca8d254e70976d444149ee2727b4186d97326e662bcdacabc674f7bcc0e0193b2807e4c053 SHA512 871f44e56ecb16ea43e5702c30a43d24f911ae1b83fb2a5ba3ca4ab45b3676ee7d4841fc343f336c0249b0165777659bd393160728cb20e3484eee4854919d1f
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
index 32a0617facc5..b193543a9fe1 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
index 94b74433be64..754769b8f0a1 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 68a53d8465ed..e8157c01a46a 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,6 @@
 AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
-EBUILD requests-2.21.0-r1.ebuild 1423 BLAKE2B f408cf2c277bbc63ee44f04f553656dcafd741ecbb573a7c51bda6596334943825ee4ed9bb66a052c3d363777c4e4f603eaa50fc085343cafd2b7af5e1f9581e SHA512 32cc49f324cf562117c33a60ac913177ecd5c74570ebcf3aa62ff12c2dfe3ba43e21b8fd078ffd93a4df521b032c5b036cc22fdaf2156ffb061ad7b6f238b585
+EBUILD requests-2.21.0-r1.ebuild 1424 BLAKE2B bfa096c5f523924543070a8f000318f57884deb297aa55796bf1d53acaf778e20d96138cda8deea9eb321272e11490c0cf28b9dcee7115f6e835d9067cc754a4 SHA512 76b59f87f7941979a7dfe6054648bd5e948a2521f9053b38a2c2a8f792dd18147a54e0d6b18f0fbae08a4474d296969390bf7e954418dcdf199d1e47b3a7706f
 EBUILD requests-2.22.0.ebuild 1871 BLAKE2B a15133d80012d22b6337168f77c6f8ccb811f51ce45221cec9c88dfc4494e8d6acd41b668297a78bd36125249b6e8596fea0a36b609588aa9087a4e3c1bdc95f SHA512 e816a679c4d05823e5a12755ad97944e9190dbc6f489b61c038862fd7c764ef44dcf35c21e5fa9bf66765d959fa76695e9b717eeee8afd4c6271dd929ad776b3
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index 544df2c4244d..a40f2c3e542b 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P: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 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 75ad020c119f..11ab0e03a127 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -3,7 +3,7 @@ AUX responses-0.10.7-tests.patch 383 BLAKE2B 3bca7b4ad5380fd13e29be1409d070d8ea1
 DIST responses-0.10.7.tar.gz 22666 BLAKE2B 9f6d8ee0cc36ebb94bf6ac4284b474d30754af339f623a8a899061392321ba48a1f2d21593fb5bf2e6fac7c65ca6c252b6b7a1072e5548f91db489633aa3b686 SHA512 dcdbac1555090309b17eec1c02887eea5080321ff359afc42e6b558954caec2ab757e6009ae539e6e4d002cd06f2289d909a28ae583e6fa062a5df89c301e1ff
 DIST responses-0.6.0.tar.gz 14073 BLAKE2B 27d4a4a380a9154ded1030278213c0cd87308a488199c277050fa2a0a1dad87a61086094bc35279ff9c4201d06c59613bd1b0dbd18b4d83b8321341f6f1c4bb0 SHA512 32d41be5850f0040a4f2ad82a057d6ef73f0f83f7d3c250fa223d5614470b0b8b58790667af76ecc6b0b7e8e2a0a069c46c7913e983730c968c603e2716dec0b
 DIST responses-0.9.0.tar.gz 19766 BLAKE2B bd98c24d6458f33f7b8ad68edb3d0fc595a7d7b31889ff8270e1add13d537d80d67c3628ea6630674e8d49837f9d3933f680b366b4a7fab10048640a50129c48 SHA512 e5312587845cc9a3a938fa5d052ac1f04950d2eea5d83192c54affe079ee6593f3e249a24a8b43b1985c9fdc9131bfb477b93ca8a75d0386ed33cd56cc37d5ff
-EBUILD responses-0.10.7.ebuild 870 BLAKE2B 223bdcb31e59eafdaf5abfcd0a7c4f48e394f2785f087ea75a0484b4a7abc30699e0edc3a483ad3ec8aad1923b7aff2112ceae8de664e25c97fa856ad422576b SHA512 2fa669ae3dc7801a547215eccffe4b25c73a9e566e0bcd4dc3085fbef5aaf73f3eac072f3c3c56bcc0a1326763d5483e24321361098458c02025b3b305fee21c
-EBUILD responses-0.6.0.ebuild 786 BLAKE2B b13e0ff41c82b432e92d03cd0ec73ac630cb7e27b9f7305037ffc65e938dea314ab055721150257df9453d7c8487f0542ba0e6f42297268699efa5af23e9ae22 SHA512 cadf90fca9bf2bc79ba69e87552fe88f8c2a83c092b9183ac70e334c1652368d9bdc9a0f7538da8a6d69f04a072a363962a6960f1dea250394cef7fb4c0a7adb
-EBUILD responses-0.9.0.ebuild 853 BLAKE2B 3ae05df44771d1262dc17af4bb4e90b4db5c529b80a93f0e49d9460dd887da709628a63b0680ec6cd09bc3ee4b370432de4fa8cc55c9feebddc16f9e1ea23f17 SHA512 3dbb225b20f9e0a3c37ce35b39620fb8be49d81b45af22e1aab6f6049c42cc2bc195fb0993776951744e5350c753d7f52d4a4260977b6b46c3977952335da9ce
+EBUILD responses-0.10.7.ebuild 864 BLAKE2B 87ab9285cdf876e41c5553806848491089e71fc78fc80ee2c8308568435947db3ee6f22cdb967c36e908f0bf283783c72f33788c4c69bfa1a1607d8bb7ae7f53 SHA512 9a715444471ef376ddd2e1d8cff921445fd302a5425dec99455a5b0ead234ea8a344dcf40eb79584c8d8778b1789b5c56f291a55baff417caa79bf57e5c160e4
+EBUILD responses-0.6.0.ebuild 780 BLAKE2B 6a421329c888fec3dfc64c824d70ef0611ad383171f4051ed31d4fc9f1b813e30af5ac1329c44d45e6bccfd839fdec6e84475d34231ddbdf33a4fd42c1411a12 SHA512 2fd60258e7372c0148733c077479c80b5e2696d5900ccbcddd1eb63d7e1f698716f2ea98d4e76a1119ecca234454f355dfba8c2bfbe3b7eb8120a07f9012883c
+EBUILD responses-0.9.0.ebuild 847 BLAKE2B a26f55b5996fa10e2e338b13f18162f357d3c0e21c20610b404baebed9fb60d237c88836677fb3b96f33b616e69b593d7426598bc5efa667ceb89db54fdefa51 SHA512 697d9c350cd65f419ca9bd04549736f5280ee7988e8ed0e4e832162aca15f52ede82d64f47f74af3933bdf4d6437d526e333eeda050a89d504110f085c7c378e
 MISC metadata.xml 438 BLAKE2B 9a2c389d84feb9087edaad524953e8a439dc914f293a1f5dc9a15f36101965ece4e28ab5f57b193dd30a2134b17e96feb218c898fd1164dd0c94234b54689a1f SHA512 efdf808423b4e47a6888b09d08b563f36a13867d355476ec10e7f247e6841bf682cb35c4432a011458d496dae79acb1ad4a38e03d3895a53e666edc3c9d4fca1
diff --git a/dev-python/responses/responses-0.10.7.ebuild b/dev-python/responses/responses-0.10.7.ebuild
index 460a11b9e026..f781f4d9d74a 100644
--- a/dev-python/responses/responses-0.10.7.ebuild
+++ b/dev-python/responses/responses-0.10.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/responses-0.6.0.ebuild b/dev-python/responses/responses-0.6.0.ebuild
index ebd96e53d16f..6fe4e2b545f3 100644
--- a/dev-python/responses/responses-0.6.0.ebuild
+++ b/dev-python/responses/responses-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/responses/responses-0.9.0.ebuild b/dev-python/responses/responses-0.9.0.ebuild
index 26a732bdfdc8..54e0807ea717 100644
--- a/dev-python/responses/responses-0.9.0.ebuild
+++ b/dev-python/responses/responses-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index 7262262158b0..829713400352 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
 DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
-EBUILD retrying-1.3.3.ebuild 551 BLAKE2B 24fcd2799899825f3d918903185342c201c5288d7ba654ad18286b9cc5ba8f821e46729f502ccf50b3ea662f7362fe4eac8c250eb1cff7b4253d6638d14741b4 SHA512 727bdcacf9c7867ca0db1778ac34032909411f8a29cee202c24e5f3db4ff5ddc6a07b872c77542b343b62cbcc49b497955019b7479985813aa54830a8d2f6414
+EBUILD retrying-1.3.3.ebuild 552 BLAKE2B 5a635dde71b5481adcd67653e44d76be965a61e21bb6260c152905fa14b322b22193d4b1a047d08852d73a016ec725f968658b850f34e5fdd8c24d315f5d78f4 SHA512 3ad118f8edd062a85a3f737c59d46c9063e5af094dcf3a7033925c0cb766fda106ba9deaffbfbe66536e5921c0bfcd1b56f3f2023847fbd2a92b2debdbdbb0eb
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index cf1180660daf..d41889087766 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index be308121e481..69a9f120d136 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -3,9 +3,9 @@ DIST rfc3986-0.4.1.tar.gz 22354 BLAKE2B db2a7edefa89fd3780721904c5e1b623d34dea5e
 DIST rfc3986-1.1.0.tar.gz 39381 BLAKE2B cb890ae46c1428ddca1aed4a49660e2620659e7af64dbdb22c2514323ede374c28bbbd8401a5b4db257ba47e617ad7e8ae486f751fd4a7580808c68ff289ec13 SHA512 5e43ca7df586011900d2f01edfb20388598f77218e5a63904557bec0f1d0cb0a35f4980014de9c943ecc43a5a7ab3f7b815fbcfc9318e494c24a14fed2d1fac6
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.3.2.tar.gz 44225 BLAKE2B f4cc72ed3c2dcc7132527cd33fd6b9f0136f789fdb229cc33b02bf2dd596b2f762e3e4cf8af63f239408b55cdf056cf54315a0a9cdf734a4203fad24b00ce594 SHA512 c086c55295d80ccf33dbfeff06059303119e7a407bfc405b7f75ec30413221ec58d3061d75fd3ca696b7acf9b1be1dfcc785e01280bf659a53be43ab1f300b15
-EBUILD rfc3986-0.3.1.ebuild 702 BLAKE2B 894dc64618f9ae2832add6866a27445d51017c4d4450719ec07cff99c9fa79973bff888d866e1a7d60e4ac1271eab8e379bb6135e30b6f7c9ca104d5b7efe6a1 SHA512 218d0e0222d7da3a03c38e6ef2e7736bd567179def5a72bfdd9a4084a65464a3a83b51bd094e20c60d44aebb52257fd88ac607c6153e591b62c007f07856a9dd
-EBUILD rfc3986-0.4.1.ebuild 708 BLAKE2B 54fddd4fcfd90c3ddfdc8b32c8477882127d5f3382ce1fa2fd76a3a801cf89d6d178a45003bfbc980380ce10455e1607c99c9b30ef9f25ef0744cbaf5e493d10 SHA512 6c63c8947ac62bfd31ba902b51cc95b71e5fc5ee5360cb308ad9ab006c6038a742022253d01ad44ad94d6525a54623b7c5bf3fc299bf39e3798099618499ebdc
-EBUILD rfc3986-1.1.0.ebuild 708 BLAKE2B 6f4022e150a77b35cd5b72f2cc33cbefbfe05c622b7abb955c554bd4e95a61b50fc641f59f67b28e9d043eadd3cb223747d4895d68f0d5a3440af26ad98999b4 SHA512 ef7c2d0f0653390412e181c6fe5f7adc0f13075216d3f31eac5926df91b521e0902bcc638660b1d14a8bafb31f58bf32cb12b32b3c2113d70ff41bfd71ea0e6f
-EBUILD rfc3986-1.2.0.ebuild 707 BLAKE2B 8c8e0a720c127ca7b8f20c8f8871ea2b1730768c40c9e09063d5749947b18b7c5fc3ecb9dc9ed3ccc4004473a79c50fc52a1d981a6df83999b264bb0166167a8 SHA512 b0c698367311309e39398b6b81c8c746b4eb0a612cab92b766da6c6a0c6de2db4b3cfff285a5b0e0ff5982c67ffa05166c9f11b3602cafcde3e03904c71393d5
+EBUILD rfc3986-0.3.1.ebuild 703 BLAKE2B 1b335f9cbe31d15a67828ea61a876bc2073da5bb065c51f4ce52c376746b31e8aef13ce5ce476cbeef14ae5cc3833d6fee2f406fcd756db1e6f59aeeaddfb098 SHA512 9814fb309b11810b0f1f35aa995da0a3c8adfa284c34fc601aeba7dc21bb96541f3c6e4a079d1a0d1e1d8e001c7f52582846fb207f9e9f854511cd2b487cf28a
+EBUILD rfc3986-0.4.1.ebuild 709 BLAKE2B aa1e4a55d70a55b4056b770a683d9b3ae2d63b46037d8e1995a67d366187deef5bc024756c74ed61e47691cd411f84031554078fe587478841d1b9b4e54d9174 SHA512 d8f65806a5b26ab173e1e15eea8e78a19e373c27ad9aaeaa320a2aa434d2b0e43aaea1c17f02e4544470e23395f1574d6bfb223ab2bcb7dc92572ef99625bbe2
+EBUILD rfc3986-1.1.0.ebuild 709 BLAKE2B 3fbbe01707e0cd7a4e86a1d6c89c1c8657b2787ba117d1146c585b549f1d293fee436451eddd118f4212c3de43f0a827169765410582c9551398b0b9749a6b7d SHA512 899b04badc2ca4a95d09fcff3ff4fa0a50027677059142a5a76fc3162fb7e5fc9b14da78bd61127bfa48560f7d75116c13ab4f8104a68adb317266f87f7074e1
+EBUILD rfc3986-1.2.0.ebuild 708 BLAKE2B 89c382ddaaa519b831b4b6845c178c2a3fdde0c1c55ec9c77d108f5d92c95e18f79b83530588ce29df06e6dd9db1b45b166ad36188e1ae6785eb5a0abeb3982d SHA512 dff81a16fcb9ce3828c9ff22b70f14bd02ff3d4b11bea5255e29076d4ddde8d61acb041f39e20e979194939b8db54e972fbacb00f94c05a4f9fc9da377546ba5
 EBUILD rfc3986-1.3.2.ebuild 766 BLAKE2B ae24a2378b5aa7a455610cd3dbc6b58de941ece794d63cb0066c19ccdef8eeee868902731a1bfb38bfc7534649ad0c3e4ff294d76c9a91193f5a81229a3799cb SHA512 a8d5a07a9ad578137ca0c9517f62f354a5d8ff52691a49e4047ac587c9e33d1ebf6d89a4d423a2c66b32741be48f88749dfb354df71fe396e057551abffe9c78
 MISC metadata.xml 700 BLAKE2B bf4cbacbfd88c790e881e675d53493d4b382c9985bdfb8cfef2d4669be476b4d601600ba58759dd6015f12749d4062729595ec1b20df8a613cdb363e357f8bd5 SHA512 490e0897620a846047424f9a2219f0ad08330ef69f7dc7b6dc91cd8d79f5c0d41ce7faeb9162b836c55331e05f3307c89900da821e73b5b3ed61e88030af775a
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
index ca64352e03de..088d955a84bd 100644
--- a/dev-python/rfc3986/rfc3986-0.3.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3986/rfc3986-0.4.1.ebuild b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
index dcd350dd993c..420981dad9d7 100644
--- a/dev-python/rfc3986/rfc3986-0.4.1.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3986/rfc3986-1.1.0.ebuild b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
index 38294fcc58f5..ead27766cb0a 100644
--- a/dev-python/rfc3986/rfc3986-1.1.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3986/rfc3986-1.2.0.ebuild b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
index 1832ccf30d97..5b17adced43a 100644
--- a/dev-python/rfc3986/rfc3986-1.2.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index ff4d5295712c..00ac0b246752 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,7 @@
 DIST rpyc-3.4.4.tar.gz 56199 BLAKE2B f56ef53a55d25335708c6750282c8e3d94492405f80e5cc03bcde879f8afbae70ec02cabe6d92bb62413dc92025ef42945e62802c7adb083b880fad31ebeff0d SHA512 0a176b05df28d92e67cb45372b46260611c1bc89f997c5a6760a760dff8792d5bb93505fdeccbd25c5ae7b04cf7aeeb7fd8964d4f124b00e50fbd3d55d7ba7b1
 DIST rpyc-4.0.2.tar.gz 53877 BLAKE2B 91b2b8da44df91258f1355886019fe70fd2029141c025c3e71d1d2996ac9eaaec2ee4344149192a02ef8835adcf6f3cfad5cdc33f102577ec4ff8e955f0a0d19 SHA512 91fd1e5a65bdb5a5d8c424bc0c8cb0688ae76ae644278855cd7c22f9af47d7a6da3a80f7383643c2161521633425b6a2486960aefbe2e02864f93d53568bca2d
+DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
 EBUILD rpyc-3.4.4.ebuild 470 BLAKE2B af15b16f8e6c6b8daa15470b2d9612dc5e8154c5bb294717646e4dc49a05798fe81a2db2feed5152b0aa7ddca10ea77090628667cacb8252672509f9b8ab4265 SHA512 ded6d0f7d198b03d25c2c8010c34acc9c95f058b937314b1c34ba41700d277931e6ee60df19125d7e371db8380e357b1121c6565e9ff36b167964f85998ee45e
 EBUILD rpyc-4.0.2.ebuild 494 BLAKE2B 1cf781a9c81bd87384c1dc521ba5027747375c9d7b7548634e37770ed5040f67aece0ff0d8fcc72c260d6d32d55131846c592cc641db3a322c67a21bb54e5f44 SHA512 d5b43eeea7c7dc227832a8441e0e9d5fbd631b3b2b4cc0203cd5aa24a048c2b5d596abf75b97ece60f4faba8f3b14e921fe82110751e517da6a13c6e49edb985
-MISC metadata.xml 518 BLAKE2B 023033edd4ab41716a110c97b8b21d60ee9635a3b411401c3e436b69ae0fc1241a2dd5c34dfe98b3a7e32b8351534011f533bb15443205c5ac0740d2ef89d44a SHA512 4ae598f55ddf591e0d75a9cfba54948b3ff78825377c8085ca22ad56184f18c44ef94947dbe53d207996f7bcb708454f417a74a72bbdfe22d76410acdad2f584
+EBUILD rpyc-4.1.4.ebuild 527 BLAKE2B af030126546b3936488ad6f172629bcc6199aecbca0eaaf828e7e5eced86804d6d6ac3007f54a40efd8e371a91d264513c86ab89f2a78e5c5a57e19818961f32 SHA512 f20d95c5750866e639503606bec03e79f9ffa97b3bdb2515228e832e32e02bd51f1db9216c554df2e09d013d77541e4c144c28a195a8731c4371d76207d1e40f
+MISC metadata.xml 574 BLAKE2B ead9bdd410d397cf08ee0784fa4456456f4afc05010ffef4650d233d79cc45839b89b3a2e5c0abdb228bb6158bc4c6bdff1d4619328248721356947c4088f7cc SHA512 9c85e540edff3956f574a22a981983c91c75545c9fb41c6293081d9099d89360c0028e96d73ab15fdd396501891984970bfd6b4bef76b084d48ef909b796cf1a
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index d916084a65ec..621efbf726de 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -13,5 +13,6 @@
 	<upstream>
 		<remote-id type="sourceforge">rpyc</remote-id>
 		<remote-id type="pypi">rpyc</remote-id>
+		<remote-id type="github">tomerfiliba/rpyc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/rpyc/rpyc-4.1.4.ebuild b/dev-python/rpyc/rpyc-4.1.4.ebuild
new file mode 100644
index 000000000000..6c4f56156595
--- /dev/null
+++ b/dev-python/rpyc/rpyc-4.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index cbb41f3b780e..f77c01cdcc07 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,5 @@
 DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
 DIST rq-1.0.tar.gz 45516 BLAKE2B 10af545640c757671d2da4691d06b03fe0b61c82351824a51f8f382bb0e7380312d6902ceff86bb5fbfe06ac3bedca3275394063e6576db33e78d20610083527 SHA512 eb3040c5c312123ff99158d504f5fea8377c382a1067d923db29a9087e7e0f7d5214ca1ab1df190d3e9872d6d00917c2435730c121dee1a4c410e65d2875d918
 EBUILD rq-0.13.0.ebuild 507 BLAKE2B 72c9ac1a0aa35a4b3666a7e827ce0ebc684925549f77cfe3d0922337e370d66276288d059bdfd3e1d26620f1a15cbf8d71ecb77eb1a18455d116241dbf4a292e SHA512 d94ba297ca69c382e8ceea15dbbe627734afecad31d16400056ff7e17cd1e8df32b0f78e12e4e4a0fee9713f9efbbbac9b4aeede0a7382823a86fef8effcec67
-EBUILD rq-1.0.ebuild 508 BLAKE2B cf52e0fc30b0d71248b0e8ab51fe67aa6c4e6f045039342b176ec1ad3bf1d74133c6b74772c70a68b32813e02956f14dbd8f63830f3b7f7ffdef88c6bad3d9d7 SHA512 04ca95083982f3bba4306a0b91cb5613d6beec12787bb0b78960fb0f72cd8b06e5e953872179f822aed884beacaba7f46a5d41932356884f279aac8dd4e7be00
+EBUILD rq-1.0.ebuild 518 BLAKE2B 32abaca03e65304cb4cba5ea1c369908a5ad30c22ee2358812867e9092d467d955aec53dae86cda947d553b3322538763d607e2a14569cdec33c63cebf249603 SHA512 4330b11fa2c4699d3c16b8a76b92c268cb0e577df59df285d443af41db853da37e63e467c9b93dd0bd05e0ae9fa027196bbc0ac49b283cf7ecb9d465a9d3c53d
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/rq-1.0.ebuild b/dev-python/rq/rq-1.0.ebuild
index 1bef41becc10..d58d830b9b07 100644
--- a/dev-python/rq/rq-1.0.ebuild
+++ b/dev-python/rq/rq-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index a0ca9370042e..6ed49514682a 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-1.11.ebuild 1507 BLAKE2B 836c2cec916ea90336f2f29efd03615096ec083350992dc10ee9ef51f44b26d4d89aba15c0a62afe1c30d4c6f02a4c767f95c5d4cdded084c8210f71c5597ed2 SHA512 2d2f851ff616744505adcca7360d1a06b415b31883d4db4733d9419a9dd78f6f10ba48fa008df559e95e3dd2e8eeedecdf81b765ce879c45334a52d7b18b088d
-EBUILD rst-linker-1.9-r1.ebuild 1392 BLAKE2B 93a7299bf9e555d90e5259deb63c2512d91ec35fb65f0b010b0b24d75c586c9950b98f27ef3a247e9e568dd2877b37a8f2a29de1c01d86d9cacc4e927b70fb90 SHA512 0ed604d076a9a14fefe7eb681ad1dbaca08c462d05a8e76d22dcd0858b16b10bb8b0b03424cddb701e9bf88aedc8d9bb70ae5e50a0791cc98913b1b301ab414b
+EBUILD rst-linker-1.11.ebuild 1512 BLAKE2B 735a9a154ce666a764bb4bc64be003d350b541b76142e75d42719c1a79a167bf5a03d315f62c667de18f279ffb8c8f9af5beca025cf78b3c7445a6dcc703426e SHA512 8b562b332ea5408a8e72c4605a8e884b373bfa86675d63ca48d279f50c945042daf23e28fc8a51efb987bfb825f966742d7124996081bff77317c0e151703948
+EBUILD rst-linker-1.9-r1.ebuild 1393 BLAKE2B 589e22666f63f41d7990a5e62ed1a9fe7ae1fa3ae3aea24549131cc964dba041c7b0ca1c3a51ccf67e996316046b5cf723ffbc56db6de23c2b9f533ada3389ff SHA512 d77b083e47a9966f7578a07ac69b76d1b850b56ee323cdc824a343b987dfa822e902cf65f1a586009aaea3180a678475caae72b490069d4c97b3a5a1bdb28ab9
 EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index 2859cd77e70f..0a17f3b351d4 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="${PN/-/.}"
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
index 31da635e50f3..fa1c10e2d9ba 100644
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
index de39844598da..026021ab9180 100644
--- a/dev-python/rst2pdf/Manifest
+++ b/dev-python/rst2pdf/Manifest
@@ -1,4 +1,4 @@
 AUX rst2pdf-0.93-fix-logging.patch 771 BLAKE2B e1f6a6933af771a4d12c584d13176387bc077ae450a3224c708d96344196700813aae79683b726acef432060872d636a14a9b6c4a273d30b68f2e1fa088d43cf SHA512 798a4cc03ddc6bf892ac8388b96d7facfe4054c2a1f648a4d05314bfbb8bf1ba261feea0930388688b183c12b1f561b3753fa2488854651005faf9bfa98f531d
 DIST rst2pdf-0.93.tar.gz 1216483 BLAKE2B 478b5e704a2c8a85474e728472807909f70e24ade78f2aba986308919e6716c4b0d576556b3509a358f36be03508f837e3b680a16b8c01e2ee51e522931d9237 SHA512 dfdc6adeb06f4ef3d5fc52b91be1939e9cab25a1979685512f9a05e3da1ee65b84e47478613148401175a06fbfdccf5494918de6281419a0981987d398e836ee
-EBUILD rst2pdf-0.93-r3.ebuild 1569 BLAKE2B 3350af9760c8131bd2b8c2aac32eb14d0e4756d1db848b29ae7a1306fe6ca91b41bb4ed001bde59bf975082f25e700c4d54d38d0e0c91d2ab60f5ad81e31827d SHA512 e684c94d5794d3545116b78b0529ce634b486dccdc70df0548ecb42427b2e098ee22ad2377517a2a72937389e8f862abfa039477ba567b6562c2ed502548458c
+EBUILD rst2pdf-0.93-r3.ebuild 1570 BLAKE2B eba4470e20e9e1c412ad65198265c5a23962d05d8f0ea0ff432877ba72e876b542cde0a8f0a30d800c180bd0f9ff15dfa9e8902138cd67bb7266c9d370a5d615 SHA512 39a32004032eac11c23895f9d9c1de51caf4a815e7f207616d6a63fe0d3c2951c7c3e6fc6dc36e9e307491fcc4924b7a224188c152f57c904a2286e3c4618b45
 MISC metadata.xml 306 BLAKE2B 17096c9bcbc010a31235e12f8307bca80e3a1fd73ab488b79fa0a431652b3eed5a4acb4436f57640ce259d053f4aa9adb84cf488104fa935455db1074278f22e SHA512 5f9c3ae1a900fe722d811e47ed1ca544f308720604a407d6d4a8ada256c12c94c0af903d13b7f443750c1027904075f785372fe1f917ac1901a1c45acdbe30b7
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
index 9610d05084a4..9814b42ee357 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/s3fs/Manifest b/dev-python/s3fs/Manifest
index 67e75cdd1398..68d048c18968 100644
--- a/dev-python/s3fs/Manifest
+++ b/dev-python/s3fs/Manifest
@@ -1,5 +1,5 @@
 DIST s3fs-0.1.2.tar.gz 24574 BLAKE2B 2b62202d8ceec078ca93c6da895a81648c83e0fbd764dbcf4cb1a0ce2c2a8a7cd16a3cc5162d095ec1272b52c9da743d8c8d21f5b351e6a4f3d63cbd77d9b43c SHA512 52be23ccb2dd8c63675287895d00fda94adf010ac878ca12e5c8eefa25c7076c000b53bb4d2bb7886550cdd0d226cdf51aeee12f2ad7bac46537f190ba72ec2f
 DIST s3fs-0.1.5.tar.gz 27215 BLAKE2B 84f059eafe14a4faf8945c355763d31a49f38c3ae6cb05170dbff0e7ad435f9ea79617fc538d237b565d20a0b11603ea44d9e71339fd40c1ad16ad0af903bbd5 SHA512 5285da6d82de1e68c4cb0fad5a93eeb59fdffba663691d79cafd1b428b60e17fa21e0ff3a50df701cad7f351017cdc538954b0516782e5ddcf6c3d5910f71144
-EBUILD s3fs-0.1.2.ebuild 660 BLAKE2B aded55328b77e679c03423bcb5a14fb142645930765e530dacdc2d998c40aa388bfd4b40f2ecc2c4515f3ab50f0216eba92bf2da73600e3d30fba3f9fdb1a000 SHA512 8860fee364f06e7d21322d3d8bb78e036585523c77c7e9413c93489d0ca994f4010ee4ee1d9f8582c98d686e4169a946ead1f17f6433afe51ef7db5bd2d403b3
-EBUILD s3fs-0.1.5.ebuild 663 BLAKE2B cb959efdb66d326034fd7d9782e200ad25cdb1e3874aad03123564a53ded91788c5d452b9b37660c7eebf6ab0a0035e80fd7eb7bcc989c624da04e05ba3b2e17 SHA512 dd07798346f19c0cd4267438e108ce3cc50e96d35fcf76a849f10dee70459bac3f1ad37392e51d6d421f20272620f98d6519fb57b02f67477d3dd87a155a790f
+EBUILD s3fs-0.1.2.ebuild 654 BLAKE2B 8c422d6b94d101f5636218331efa82468b14816defa06bce7f66e4278f8c7481e7b02f02a066351ff1c1fffe92e0c2e60f8f0265f099de95aeee1e8c7e1c3fd3 SHA512 a346458e5263a103a691877892d9a481bef5d58288a9a1b4c8f31678dab2fb3450fb7df07ed3422746097b1d3932d64e5a9b0ec5ad2e559efd85195bd98b7cc9
+EBUILD s3fs-0.1.5.ebuild 659 BLAKE2B 87e2fd184266b4ea2c9bc310603e7b8deffeb8e044cd8cd59308885f761e8592e565054788d57d0e8e753687dddcd032ff42e7ec6b25cf2d1dfc22897af078e6 SHA512 c1c253ee6931e1040d9a80672a0d70ea7ae01cee7cc5ae93b40fa58ac0f10f6d73091590d48959596c4c2841fc40dd3003e98e117583e2d306d2fb6349b0de97
 MISC metadata.xml 519 BLAKE2B c4ab17bb17c687ac00bf13ae441685f6484334dc588f65138dc616f7cd8a49debe0eac5ec11c2d7485eb48855238ffcb25612d687b75ca52d58a921b311e455d SHA512 f8c6696ea3f62243be9f39ea56dafe0bdf137b49aaa3ac2bd793301c043645d2ce63c6cd7cc1a476a8f554317ce518f501ce0775f89f8bebb66e3d3d806f4926
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
index 26601563c46b..e27ace35e94a 100644
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3fs/s3fs-0.1.5.ebuild b/dev-python/s3fs/s3fs-0.1.5.ebuild
index 379772cc916d..67bad6d489d7 100644
--- a/dev-python/s3fs/s3fs-0.1.5.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index ae6726a133e3..c8d90289c5c7 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -3,8 +3,8 @@ DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
 DIST s3transfer-0.2.1.tar.gz 119635 BLAKE2B f8978afb2ca367238392974dc98c0a2547cf95c42f0dcce627694dda5d34ff07c92db1b838ea4cbb111db921ac9f0ab2bee81eeca99827d0731cf77ea111d70e SHA512 1494436fa74ba6eee26e96fb0d448062acddf4c4179e56baaa47d62785218d9e91c5fb50b6641e488d0c84cbaab53bd552b4277bb873cd170904074e6509b0e9
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
-EBUILD s3transfer-0.1.13-r1.ebuild 961 BLAKE2B bbb17004346e4a32e2991202038059ebb77e85487655110829fd572a8cb812d8d0d694082394ea4021dd9d0e9591c443367a2ceb2eebdd4e14f146beedf21e26 SHA512 e11703abd6191d9fbeac0baa62a4733ebcbd4a532703bc86f0c088bee2636b157c15a724bb97066e52f84108956a14760bcd9c57f0c6beedd1dab17b9dba3da4
-EBUILD s3transfer-0.2.0.ebuild 905 BLAKE2B 0534a7e6a9cfea8a1d7a57c8f57becccf390b19acd0b8b63abf98b066f1fc0c0e080ffe547510a53cac5c862962de85c1ed6e239e8cdf2f8248e386bf70eabc2 SHA512 f8ad66c4eff56167e14811384f8a6464c59360c9703b906d250fc9b31a817836475f1df0ef75a833ff9ba8ae3036161d7482fb6383ae355b06d3fcdda39e8ec2
-EBUILD s3transfer-0.2.1.ebuild 907 BLAKE2B b3798be9de3ed367a0062307dab68df9fc307ab6f2fa95b7c8497e60b05bbeb0b0f86e5efbf452fbb3230723687da3de322e335aae1b14a2cf69182a3965754d SHA512 408d5d9ab839dda6f51a3be15f6bfdaff44d27c7efc3da0b65d1197dcabaabf14800bb07f2647d3aefe42072af9c403859399b3c02afcbc6b4fe457331e0abcf
-EBUILD s3transfer-0.3.1.ebuild 1023 BLAKE2B cc1715c4899ba5ce1020f39bf68e53f62bb834946b70cf27df9c9eaa6a632f6112ef304eb6bc29ebc75c5cbd22c7a075a973ff7dbc461d2d65b45e23738826c1 SHA512 8483e1aafe28fce3590a1684e3191e87c8c8572b104a729cd41736f330fe4c82c587983c9e7815fb16b459c66351795c62150c3f4729b5206897aa341ec7d745
+EBUILD s3transfer-0.1.13-r1.ebuild 951 BLAKE2B 432ae3693eed8c87e67798bd53de76768dbdf62093f85d5be6a3799b49df47dddfcbd4bc71d52d10fd02ca52ea2b652669d7254f8492f3cbbcdb194f8e761f4c SHA512 aaac2ecf1c421872558f024e6ef655104cc5ebdd5f51c13314fc120225048d48112adcc57d46adae4cb837f9c3ef61f96f5de0d485360ac4a0c15aaa5236c674
+EBUILD s3transfer-0.2.0.ebuild 895 BLAKE2B 019b69cc2aab9b4293f4c9262bb789fdb73bb08982e3fe06781707458a2716a3a38069156ccb9c6a9cbd307090e415ebe4ad286620464dac91842d183a67c124 SHA512 aa3e38634bc9146cfffd5e7018206af733b5a5685e9f15e679515b823b215890979bab01a9e9d7ed0864c4c66dd2e23758e9cf4b7d317a119dfdc3bcaf6e4b18
+EBUILD s3transfer-0.2.1.ebuild 897 BLAKE2B 851c461fe8afd5c641709989d9a976fbe52da7c05902fa056631130fb601398f4c67ae0b2103b991449e96146b1d5302adc17f475aa01df909b1ac23d2519aab SHA512 f2d4e554b51f60e0dd5d077cacb9f00acac39a08539efda984cc7677ead2aa392b93f243d41228fd424e1a09f4dbb2c2ed6ba5ae10da4c106427b9c7dd27e005
+EBUILD s3transfer-0.3.1.ebuild 1013 BLAKE2B 075e18ccd4ccd8335c354d7e948f3d594fb22a086a9770f62899d85f8e1231478b3ace1a7c5a35e0a6eb4ec2dbf3385dffbc6344ee218f0b39581d8f8e21b1d6 SHA512 3b1bc463053b26e24662e3222060e42a3ef38bc63bc3df33ae0ec26f6a1b7043e92151c137f3edfb3a411de0bc9b00e01d0e208dbb0f7872c5fc797f1a7c2d82
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
index 4d559303f474..0d4a941a9884 100644
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index 6e6dec8bf7da..b6ed7f314dc5 100644
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
index 91f0527fc86d..5665584c83a6 100644
--- a/dev-python/s3transfer/s3transfer-0.2.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="An Amazon S3 Transfer Manager"
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 66e665d4201d..08b3fc79d87c 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 401f249adfbf..94324c8e3f39 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,4 +1,4 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
 EBUILD scandir-1.10.0-r1.ebuild 686 BLAKE2B d07e95bddd29e9ee488a981cfbeb57e32b2632ca43aa6bdc5dba34a5bcbb8e2c6d6e00e0ca447f146f12247b31e14fd0affb8139d633cb45e40e6472df4e3094 SHA512 a124d6449ba708d80a35238e52a1decc1610c0d650514e94665f65ebb3f6f473ed621ae2c9e570e26764a6de96bebd8f93a901e6c34967c4ccbb4cfb0776e834
-EBUILD scandir-1.10.0.ebuild 667 BLAKE2B b96214368368b92f5fe3b83bb52f7ee05cf77ec2400357a70e6b322ff5189a237a5c1e75968837f23833cdc1007ab5fe6ab813db6c766145cccee05f5f6c7aad SHA512 ac2c550d988c96fbd5d5dd932619dde5101e4088d36da86f22cd93a4ca2ffce9c8493c39a5b94a815f09db866550a15bb99b1f9c784e215028c59ae0b13e4b53
+EBUILD scandir-1.10.0.ebuild 668 BLAKE2B a29f7c326fe4a507bfcd023768b16a35693f2e84d2ff8aea4bec36d5ce4ebf8f810447174d952effc4dc15206741b7385a476a27f11713d8b6104aaf19c760c3 SHA512 58444e6b87120eb8faffa2a08f1beedba97fc8da1604212a0955afefe94d048b3eafab135f9195c8d8de1aa6ad3cb6e2d7e84fa78ce5c1751f64102436b10dee
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0.ebuild b/dev-python/scandir/scandir-1.10.0.ebuild
index 764b48c5ec39..b34536d9b065 100644
--- a/dev-python/scandir/scandir-1.10.0.ebuild
+++ b/dev-python/scandir/scandir-1.10.0.ebuild
@@ -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 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index f3339d297586..417006b8a2ec 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,5 +1,7 @@
 DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
 DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad
+DIST serpent-1.30.tar.gz 24046 BLAKE2B 8a803c9a47ffc9432eb6a48f78d5eb295ad477eef0c24a21c886aaca2cf4e63decf6b1f00d5f71528d867ecbe5789de0c2d19777d651d612f7378f3587a34ab8 SHA512 7ed44f21c9c3079f3423636bb833c49e3eebc89fa4cb6947b01f7cb6cf0161f7a0bf7e8508cef61d9a5475900e3c49d1e72e38cc24614ee99cac449e8b28b975
 EBUILD serpent-1.19.ebuild 598 BLAKE2B 267348b0f05ce61cb443a0bd0aa423f308cf729c8346bf0091759989c7e4d2a62add603b766fed82aeabab6e1a78b11f327cdbd550877821d945f2d88230269c SHA512 84206ec8d1da6cc7811bdb013efa6a8cdad442e26e9fffa4c4b0f42a270eb5469398ac1616a4c9297801cfd855c9824510b4eac09950353ba05933740910e705
 EBUILD serpent-1.28.ebuild 533 BLAKE2B 288b02f08ffae3a805f92f3f3dcaed3f3c6318d614753241061f2b6f7269b86ad3f889816be84b03846c568dd6a9862569b4c240969a49a12a5fe1ccbf8974cb SHA512 75ff7b48cfd69f42acf62b8ca2665e167c000507cc6c412ac0718bae60a407a50dc0bb951afcf0b81770bbfa715cb85e7b93adca240c9b178efad6d331bdfddc
+EBUILD serpent-1.30.ebuild 477 BLAKE2B ee0d7b6da6f77dd87dd44ca84fc1d1175875dd5a0c5e5c73301cd92f670b7d01c1373aa70aed9a80f4bcaebdeccd01798f0c474a9a051e59acf1f7da36b139e9 SHA512 5368687c28731dea3e5c5782d972bbb309577a22383450d1ecd41ca0879819b44f1997eff29f51912304f5ec9f7df6a4b72ce7ebefab8494351ead960e1ae8be
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.30.ebuild b/dev-python/serpent/serpent-1.30.ebuild
new file mode 100644
index 000000000000..7c02d82fdea2
--- /dev/null
+++ b/dev-python/serpent/serpent-1.30.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+distutils_enable_tests setup.py
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 7e8737e30453..5b7e2bbb3ae5 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -4,7 +4,7 @@ DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
 EBUILD service_identity-14.0.0.ebuild 1177 BLAKE2B daa2f1ad55727b05477d68db3612429d200d22dfc51747cf896124e59bf2cbe2c2d9b3adff748b95962016ab1062570ef29af630a57a6a5ced076ae1d42b6c48 SHA512 ec584370e306e0157e25c3e6912bd7063ecd5a95041c5d3e1cd7345df99b1bb9943c21de130b36cd1fe7403684a8b4f8969793ded5518a4cbd6045c8758e0bbd
-EBUILD service_identity-16.0.0.ebuild 1169 BLAKE2B dc22221d2eb2267c26cab543c2656dcf449ac395efdd29b337ae267274f4307eb2bd02c09623f51be7796f704fe16fc51b5afb3cd732f609b6b3d9fb4fa72a95 SHA512 f150fcb4de8dbbb220a427fc55422bf9a0143c129e335e8939c02044fd984fb9d3f7c1492205cc28cb1d1ba77434219dd22c993996654e97b1352f0f7d52944b
+EBUILD service_identity-16.0.0.ebuild 1170 BLAKE2B 5b76ac4a371590b2de894bac64d117c87648ede075eb25fc08f5849da5e693d66b0300220140f28aaaa862f0799c61be7dc7e07b7f532e47dd70d482f7e0a598 SHA512 5639f1bbaf0032f9a2d1e707e3c46d1f2b90af4e08e40b2e48c73103fa27ec2caa9e3b05be974178aa126a37483a5565384d2208852305f8c4c15b0a45b838e4
 EBUILD service_identity-17.0.0-r1.ebuild 1252 BLAKE2B e3abd5d96ba0c1dc3a8070d9416da58dbb6e1585c3e6f9b9227daf57746afad604a6abb9160f93e0bcd989fd8e349df04f5db09da6a5b70da5fb0ea981dba298 SHA512 b15fed2694253b5e2d43a0b07a42d13ebfcf5a37acf9ac3c747f042043b3e10054c66d8cfa6469a8978699406004852b6d5008271442ee02d9d524ac7ada5459
 EBUILD service_identity-17.0.0.ebuild 1247 BLAKE2B bad11e134bab2c5246ba0ce5f2d0e47143cf06972f570fa5045f7fa533b7d5a86708cf6f4b30f25f429eaa0ea49fe31de3f855ae9f91043215f3bd61bb6a1ad2 SHA512 03b3ee881961fd2b4a83a80dc1866aa6bd7d1a8fa0b6b9d1326ee8e8d4a4f7041f345b82b12166f43c46671b48267881695bf0999cdc28405e3b7cd4b01df433
 EBUILD service_identity-18.1.0.ebuild 871 BLAKE2B 3a51d1055e89dcf4ec6f74f52c07fd7e4db0c8875e20f2bc073906d082ed9b91536fcbbfc742c03eefb831a2e86b77a6a0bb39bea14b1b3bc9f77db05b005ed2 SHA512 fa5420331a5c48a9295cd47865cd7e09b2ee9eff8353f78ffb4e1e9b11a98b392f04559d24eb2b2638efdd7047843af56a5e9e3d7ec57345acec7de015aa8bae
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
index 524902aaf3aa..123eb891786c 100644
--- a/dev-python/service_identity/service_identity-16.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-16.0.0.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 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 150d31b26a96..171408a8662d 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,6 +1,6 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
 DIST setproctitle-1.1.8.tar.gz 23208 BLAKE2B b77fdabe04b274e0dba2555b195267f57f1e52b82c523b1a690b5583eecc8ded90a35452f1c6ac15b5b082acc1c76dba973089bd9c11b4244a397f7fb1263168 SHA512 9d0ab8e65afd7e1ac019ea47995498dae1f82d8aebb333dfc4c953e745441cb9a8db942ad8417522d1f9a805bc50ad680f3a37cb4cbbd4214d261d4fed600b20
 EBUILD setproctitle-1.1.10-r1.ebuild 1264 BLAKE2B 70bf203df084090dc77878270c371455dcca24d0d6b31cf20d7d8116c65c0df1762bf61ff729fb38edb737e0bfa30f3e9bb03121947e692d378b1edf8cff6691 SHA512 63c9d1a1f8bed7a65d48b50e27d2987e31c91436f7cf15c3fb68c02a5525252958209c968ef2dc6087c00f8a4e5990676d40d4d484b23851812d06c3ee43ed9d
-EBUILD setproctitle-1.1.10.ebuild 1253 BLAKE2B 18006b44dee8ab95f93c70dcfe5ed5823ac97caf55969b5d775678c51f43fa8daf0762768e32c14afe98be34cd54bc058382f563cfb5b79aead09871d878fd6d SHA512 99ee3462ef7dd3b84de1c2a2cfdcc243360d962145bf4042c833c9adcd9ced1c1b53375f33077c3b0f51cda9ec2c2c4d61d247a109d49ca5cdf72c6f7842dba6
-EBUILD setproctitle-1.1.8.ebuild 1526 BLAKE2B e1ae0823575c8465b73d74d4b7c1939cc24830535085b174ac2bf373191daceab4dc0b142b6c8b8b4c4ca89477a783d03a5f5678dc3f7464ffd2b7fe22279b2f SHA512 f0729a7ae4e0e66f8d60de7e552113533eff4431a8737b54b69331b607b80e6c52eecbe66409f23e95f2bb13420cbd4c5b21bf550138f08eb6f10c79cfac952b
+EBUILD setproctitle-1.1.10.ebuild 1254 BLAKE2B 765dbbd7607e693cfbbe14246914d5b7e23c56c52d017c2bab2b7fa4760576e2a8e6fab4952d8aa2904f5a4e3c93adcab9b2e9c5c45523dc26eb7606a7aa8fad SHA512 d929fcb308eb2a8a671fffd364212d3f155d975c3b29b7b0e90834667a9e6f909eba162571023e257273d9050778ca576f0e7f785bc6cfd00dde382087dffc9f
+EBUILD setproctitle-1.1.8.ebuild 1527 BLAKE2B 0e3c0e1fdd0b426c8df773f18dc516ebefcbd3368bde42fd44adc7f1bb9f5316b3f96d981f2bc50e2c7863696c36cb6d980e0612fc75e91fdeb322a6332eae56 SHA512 bbc00e5934d70aae8820694a4b02f668799c3e2dce8f46fde73403da2c7571062f2008915e9093e922ac846723a0dd561fec182299cb51c7bd238260cab4d0e0
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10.ebuild b/dev-python/setproctitle/setproctitle-1.1.10.ebuild
index 44bd7e73fbf2..0c482ce7ff5b 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10.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 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
index b418e4d83775..934461370648 100644
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 54bb75bf6a24..8fa609e900ea 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2.ebuild 676 BLAKE2B 3b11e1797b71ea45b3443912ba190812e7c77aa6ac2b0f662c39a8d2b3dfeceb778d7c8d2ee4f947095bfe6b70afb14d295e93b6a6e573bdeea28ae4612a000c SHA512 cd5791446d7c5894f941aa57e32dfb5a1dbbcbda16d977930d96179516cd6363f8f622259f8dc5fa7eeb09a0272fb71247f898bf1ce68b569f428a46ff479e67
+EBUILD setuptools-git-1.2.ebuild 677 BLAKE2B 80c916b62d952a4f62d49e2f74df3120aa873aaa96b37f58d76d5227f7eef5138af21465f327dc521f9c251dcf6eae1c01d4b6963a4eee2bfdc2f45933ed92d3 SHA512 83be5dc5670736f1221b79d4d63aae9601178bf65d84f50740dcc22bc5352ffcad075a8c0aeb14b60dd464b330bc459392d4c7ec98a73114fb68849063111bab
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index ae4ccb58199d..8009cbdfdc0e 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 5ce7d938e28d..cc1973381bf3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,7 +4,7 @@ DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
 DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645
 DIST setuptools-45.1.0.zip 859771 BLAKE2B 585ff16f57709c4e8c74fe51442a21e052be9de20e2d8c619ebb7435764297bde9223f1a1660b4101b33241d0d6c308f3ccf7cd2404caa3652334a6d314eb53f SHA512 0f08a9b3fad131a99c44d3cdced21b533a30b5f8fd25d4ce21263f14ca6ed6a6789969b67757ea67c62b9cc189155b08c886c3706ce9f2fd30bd5537e1a4a7e1
-EBUILD setuptools-40.6.3.ebuild 2085 BLAKE2B afc2dc6270cdfee0e067ad34dac83b0284434ed79329cbb704191388485d4c5c5752e1f546d59e06477041f5ae92fb1b9c34786542deb4a90c7b563c084aa437 SHA512 33ac468d760f3a211b5fa60f3d7104f8ac22a90c94236aa686ca5d41d91229eae1022df90d2d92622fba184dd9d19ef2b3914a07a861dee0f41fe3f3a26aba96
+EBUILD setuptools-40.6.3.ebuild 2086 BLAKE2B de81a3ee0ec3ab13d9ea2a6dad956d8d425b26079d2a3d191eecf92be7bd7da3c5aad393eda7d9e217a63744c5f020de661c77794336b59ae4c4ef7851bc187d SHA512 312f8a26d4d82363903515ea1366ef8b2484c4a3c11d6bde8c0ac01c407bc3414d92d7d664ff676819b190128a5ae3162b1eea5a1d576a9473cc4ac38b2b26ba
 EBUILD setuptools-42.0.2.ebuild 2214 BLAKE2B 68e0af2f4b69c7b353fb788f00266c839ef74841b2b4770f386ba1d71359e959e93b5dc84221290ad869a4ee79080772ce3cc02799ad122a715538a0c9ac91cd SHA512 5575e21c05fb85c9ab95e1f3f2e8827ae7f0d7074a49abe981adfca1873aeb5bf2fc95fc30019ce553c0805409263707c5cc7ae43d4397aeb7d49e97ed489451
 EBUILD setuptools-44.0.0.ebuild 2223 BLAKE2B cc143e093bfc793aceff351f68b58fd3edb4597a28379f9347d43cd96eb7c55c3b0cf841c56391c3cd92968ab344552cd5806626ca4378d89d55b0588bec59a1 SHA512 8a3ef21926e9ecf6f78f4e56ff4c5b436121dce97046bbc66cef9c244403f5373b8f97e0c686959cc715edb2e2a72c5e7dc0bf0a4ddaa275e27e9248315dd9b9
 EBUILD setuptools-45.0.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index 94be23de816e..cda3f2830f26 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 43f5f8a68ba2..0af91c81f481 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -4,9 +4,9 @@ DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
 DIST setuptools_scm-3.4.2.tar.gz 45512 BLAKE2B 4c44b85f36c4b3c5279e17e95fa54916e09a6fe7db359bc366d803796ed975c7cf8d643c5a648f25d822bd6a461c83fc08e987f2a240b15df53f27ac18558031 SHA512 bdfe0e1d3952be9f55b9d7a00a8623f58fc3fb81d78baafd80cf0bec43dd89cc6df6de547012d3b4bfcdfc709895b6cc7534adb631990470a015eb1199a99bbf
 DIST setuptools_scm-3.4.3.tar.gz 45549 BLAKE2B 89d6438d8edc5efe2a2c435a85f0bf513fbd1af7fee6630ff8b2e542733d8af8f080ac746c949ee45cf97a46077150cdd842ea5252159aedb183f7f562922bb1 SHA512 455344ac7dda5c0ac79bdb26bef020cafc116fe59b979601351c78d26806e6e610774979f74762c113926e8b022e7b58513f25010ef7b92e5104fc1b2d552d4e
-EBUILD setuptools_scm-1.15.6-r1.ebuild 1360 BLAKE2B 7018579392a1c34971b2699ce6a518e08411bc5aeb08dccd4db0a1ad75f20bacd4f66a94d361fead49ced2d8af4670dcf8e88fabce1613920c136b49a9c4e043 SHA512 d72323b9f2d3a111925ae5d05b9ef3bbc101e702598381376ff828041384677746545f520d34fc0b9686590ccfc5f8da5c6535333014e4f1bff64115afc2c2d2
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1361 BLAKE2B 4dc0cbeded29fcfefeb35907a9b521b08ac86098d6d76a2c9cc7f6b11a0d6489d9d28f8970a4daaf9d5afffa5c132f7c4763ee65ccf45fe9197b77203caa3f78 SHA512 2080ab20a2054a40d35056f7b635793c013dffb195cde5fe3f9423fd4a97bafe65f9e32ce5e34a7db01078f2ae0eb2b992a5fe78c6906a521dc0ae6a017d7fca
 EBUILD setuptools_scm-1.15.7.ebuild 1484 BLAKE2B 5f8186e980579a7d151033144574b50a80aa151ac9b86d56c95133cc7114da61eee74ebb02cf190033afb07a48d5e43abbd38c5d8b83a43c5e0ad5ceff780dc2 SHA512 d6f6491bb7d85aad75ad4387cf5de04b9e7a3fdb1f1296f438aa95c81bde946e574bd102183509724f8cf2afc33f87ad668fd63327efc6bae4cd5756ed36435b
-EBUILD setuptools_scm-3.2.0.ebuild 1287 BLAKE2B 570ee5970d4c19082a8c1dc048488a715e36a290a712c6495ccbf0f9b84c2439893d23832e6fdaaa4b03655b994d934eff556d2cf379abbdc9dd80ad4f02ef06 SHA512 e5a12f836c0b7c29aa123a7116f025cb4149e585d4d92a2e0de0572d842ea85acd3633682585172e3100c7d556873c755370c5c72fad9fa1f1ad7e7bd8cf9cdc
+EBUILD setuptools_scm-3.2.0.ebuild 1288 BLAKE2B 2f42bf2144b45a5dab3032e1d34bbcda38c3f91bd99dbae2d02ee2494548b1d35c836e1c1c28790c42ddc206535b891213b92d6f81310aaf2a33e10a0dff3076 SHA512 8032f383b785ceaaccf4679c0a598535381a83d551a783dd5b7c3389d061d9dc193e63d1c2df6d845023b787e31d29ddf3dbb7a311f31f66402cc88171a6759e
 EBUILD setuptools_scm-3.3.1.ebuild 1438 BLAKE2B 0c731ce4b9337cfdc2668d3b024191f39fe2d41c27e319390711049eda48e410d31252df9940613b8fc7232313c659beea92b1e67942b79ec7a26f9ea67992c3 SHA512 8d71d8c57765e2ba7eb748ed8d5fd29cd7695216b39929639ef3dd8df6fab62036e7466551f4ab2c9901cdfcddfcf2c74515f425126b3f91b2faa696055128a9
 EBUILD setuptools_scm-3.4.2.ebuild 1095 BLAKE2B bd6fd2761f7bcee78b563822ee62860a2bfd0e79c32ec2a63c9579482f5e612a7fe02964a4d55556ad70e2768926c31e9c0f63339b7cbfaf7f79dc5097006332 SHA512 8e91c5e55e85bc03b4c6f8ccd1268b349a2d0c8a32d5f236a18fae24f0e4ee01e3e8a1b395e5957674ab0b91b94c569e56820bb614b838d15479125bfb29ac28
 EBUILD setuptools_scm-3.4.3.ebuild 1095 BLAKE2B bd6fd2761f7bcee78b563822ee62860a2bfd0e79c32ec2a63c9579482f5e612a7fe02964a4d55556ad70e2768926c31e9c0f63339b7cbfaf7f79dc5097006332 SHA512 8e91c5e55e85bc03b4c6f8ccd1268b349a2d0c8a32d5f236a18fae24f0e4ee01e3e8a1b395e5957674ab0b91b94c569e56820bb614b838d15479125bfb29ac28
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index 0a41121910b7..eb3c67431c86 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="git mercurial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 910dcbad9edf..6d941bf40e4a 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.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-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index b2bd1c9184a0..c57a99bf5096 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 608 BLAKE2B 042d69ab4945ff7e7c2ea1133c8fcbb5031c4e83485dfab74697d01626cdaeaa8ff2fd8e879ed4cf062ca1d8619b209638c06fb8958cefb89d03ba77857402eb SHA512 9d0d94bd56a0c13d628f7b87f3f21bbb7d04101e94d3285622ee797bc58bfd3d22604b01b46fe24144c57b0e85f7284826be65a64e4a6ee17b827da0319b21fe
+EBUILD simplegeneric-0.8.1-r1.ebuild 609 BLAKE2B 1075ca48f0e8bdfaed44801dd9a3f69a48a18550a04f0e7b96fd5ddfd7e6e3b6ef0cb770b013dc6837f26321515bd930e737cf6fec3ad189615f7fd96c0a645f SHA512 008ee58ef522b793ee37dee9df812aaef82840e51ff12769a78e1855ab29336c825d6586a0c621126700693235baf1d52e2b0f8b18a621a5a40d5ea0f2bdfd63
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 9743a6f4da10..ab988d24e1f2 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index c36db251da17..791eb069f630 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,11 +1,5 @@
-DIST simplejson-3.13.2.tar.gz 79735 BLAKE2B 5feb87611451054ad8e856e55a4a6bca50470f7f72692de9ce5abddf9eb214e29505124634d4d5a4f825366afe9a97614c66cbe14a73a4e57a5f2f62cac876e8 SHA512 ea29bc615de7fd0eb2a98f5dbeea74ee49b6fed6602396e77baf4480c86f975eff7fd868ac44f62a1c2f3721d4fa5b807b74109e5e28810df70dbad758110f41
-DIST simplejson-3.14.0.tar.gz 80112 BLAKE2B 5866adeba886b4b4f526d4d7fb7ac65f12fa8cfe593a0ac40419c6f04e2f6b776adea49fdee861be54047666b7275bf229db7f7815515a9273878bf0eb68c5f5 SHA512 a81b20a75840566d5985803f35c56ee6957a433f0a9a6fc2f0fb2d46f978925cff0edc2f2c06fe85e7155c8301fbadc962152671c29310c6306f63afede75f98
-DIST simplejson-3.15.0.tar.gz 80963 BLAKE2B affa7da859bc2b2426389d881b53abdd086a2f7082decc9f8968859f54354d50747eb6f1cb8c4cc0151ef1e2cb8ecfb8aabd9f2151eaff2f39c4d08b9430f432 SHA512 601d575a5b8be66a33df28f27292ed12e5aeec39c74aa5a5108d82890dfb45a086e7a3a5072e012031209465c5c518909b4c1fb261fc055e6b9b1523a6bc39b4
 DIST simplejson-3.16.0.tar.gz 81203 BLAKE2B 84b465cad6d78814b13ecf5e75b09cc63a9aaaa12b1412567feabdfa02f9c0e83bbcf8191425c517cea38f6bfccbd691442fae4322957dc6ead6565d23393d6b SHA512 c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
-EBUILD simplejson-3.13.2.ebuild 841 BLAKE2B 8e9b3598a91754c54309678352cef6dddf9c26c7eafaa65f52279328d7d19846c59d9432a1ee77385b076ddaf9510fdd66347e1a6f155adef1e480a27b01e001 SHA512 cf62e0ae57d913a1b4049f9b1c433873ace5de1f26b4a8bcf708f3efa119f4fcb198df5816cd303b539527ffd7995d6f87b6f94faa2cdf8d5796554090c496d1
-EBUILD simplejson-3.14.0.ebuild 845 BLAKE2B 507a53ac1a2155d39bef2955b9df21b9456d864c498c24569428722693345cb81f9663ec8d12a23cab4012a239cb05edfac084b8a1a102033377b3319d22518b SHA512 c9c79842cc382aa4124eff61e6f704d6e0b64c539508126cb34898ba754ccfb6be13896556975af2645f2ab78295efd08361015cafca91f57d768cd986ed4999
-EBUILD simplejson-3.15.0.ebuild 855 BLAKE2B 4384e149f57083e4918bacfec2c32513ffbc2ad860270f0465da959db98c8ce436e944b2635d4a69048ca4f8a58db9995281a6e95ee66a1b88caf20aea344096 SHA512 bc1d940322afef606f064c512a97cce225e2e361ff56a528ac4fa84b7c799adb7f44fd130d93fcf79f1d4e24f948a21bcdcb02e3026b2a9234a5da62d91c40f1
 EBUILD simplejson-3.16.0.ebuild 845 BLAKE2B 73ac5530b7e9364a49d4cb9f67917ebce4da28450918af73bfd772073b712250fe3035ae9e77253fb0e9b1b9eef3d8f7287a1c0a99a256740713cb737466fa07 SHA512 97f8fc7a91f89aefb7f26ad90f83d91b0e82441464477f0d714f4d1f123f48974c289d5a8809a7353ecafc72f7fc3a1d7db587238ddd78c6760e8f08e3e3995e
-EBUILD simplejson-3.17.0.ebuild 832 BLAKE2B 1eac43ebf4ca9fe10d5b64fb021f15749f19611de99105a9f69fc86a20449d19bfe1c3833ad7d9ba4111b00e548ba2f9819aeb633a279ae4fb7fbfb7c52c9d73 SHA512 90b065034b9cf8eb1069ef915bb84547475ead9fc7783537d11cf58d5801508dd06c779ef5f866b35982cd6f8a0229aa459d3989b5fdd3fe967a942a07e4e640
+EBUILD simplejson-3.17.0.ebuild 825 BLAKE2B f28477727224efd0d0ceb74150df8e56266ad90d2790db3ba1575922cf950516b1c2de67cfbb6a538d2bdc0d61aa4157ae041c084d4b09e231df397ac23dcd92 SHA512 f4a6a81afea5808f4153afbb4e4669d0e69973ea07b71493c23fce224994e06d1d4e56b818f9ceeef2130fd18be911eae005d2220fd7f8435117e8b2ced4bc40
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
deleted file mode 100644
index 2da13f8ca024..000000000000
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst CHANGES.txt )
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simplejson/simplejson-3.14.0.ebuild b/dev-python/simplejson/simplejson-3.14.0.ebuild
deleted file mode 100644
index cb34981e5891..000000000000
--- a/dev-python/simplejson/simplejson-3.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst CHANGES.txt )
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simplejson/simplejson-3.15.0.ebuild b/dev-python/simplejson/simplejson-3.15.0.ebuild
deleted file mode 100644
index 499aae6059da..000000000000
--- a/dev-python/simplejson/simplejson-3.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst CHANGES.txt )
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS}
-		append-cflags -fno-strict-aliasing
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simplejson/simplejson-3.17.0.ebuild b/dev-python/simplejson/simplejson-3.17.0.ebuild
index 899060345897..81d43f54c62c 100644
--- a/dev-python/simplejson/simplejson-3.17.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
index 75bef84f6f13..83faf7b084f8 100644
--- a/dev-python/singledispatch/Manifest
+++ b/dev-python/singledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST singledispatch-3.4.0.3.tar.gz 9529 BLAKE2B 51e948c1a60adac7db3b97931becad4c699277b7c6af2e211e160fd6ec8fdf0501a3a2b40780b9bf7a2a5c62d08d905c7058c5a771018f9ec78a60688e3b03b5 SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf
-EBUILD singledispatch-3.4.0.3.ebuild 633 BLAKE2B 104d8062be6efd07d6b756e1b083aed505458cfa1dfb3f18973a5c6bcf1fde5958673093f2ae131e02d236b708cf5bb5a07c1444cc3091743783b8c3620faaaf SHA512 d53e9305735f71b41b3a51f288a53ae0b77f56f745b1793cee4e4b7134dde0eed8cea5ace00fddfbf31dc3ddb450de1d2bd23a7cfe69b8a6f867bc5bca1bd368
+EBUILD singledispatch-3.4.0.3.ebuild 634 BLAKE2B dd0a45b2ea301961a14f94abc0e6e52595f4f3154d6a79b5733d2dd72ab1d0f04f092c630b7bf3f90ccee2f8d52d1e6df66c12253e24fc1c0bc97bde6eb20081 SHA512 31a41cc4b19dbcea9318a4b3b396d6fae2099ab36a2b91504bf1119609f18e4db870ac1defbe89b053c92ffd68f4c657045859b6aaec7ee8faf749925b5863a3
 MISC metadata.xml 463 BLAKE2B b72d957aeb11979138c6d0bb9b7181de4bc7a899f7fa5ea5f91c58b447a0643b6c94263af24d1fea434752a0fd1178f1d388ea5d4e0e1f043ddd9b93b4c60947 SHA512 5375100b85310a816ee67ed7ccd23b7e17e3bc35e483166673c7cbd3a49b82166e9a4f4df0effb7b5f0bf1529fec26f3f8fcc692677ae7849d2d7501cc326950
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index dc5dc22fab34..754fe5ccb074 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 3c5ea86af08d..d4ece68b5443 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,9 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.19.tar.gz 1058422 BLAKE2B 9c27e636a55699e8bf9c9caba9227e3ff9c8476dfd86d4bb8b0b53c9db95d28441d1ac03a0d20a71468d39e5f21066475018cff93b96281b3904f6a619304f92 SHA512 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d
 DIST sip-4.19.20.tar.gz 1050009 BLAKE2B 2ee7ecfbb2fa2c1a6a7ec57ab91113cd0c93fa5be4f5a05b8edb568e0d26e1d248a504e95cfd1485bdf156680e7e076c26f354e05bef45d7a37e9f79f7f0a0aa SHA512 d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44
-EBUILD sip-4.19.17.ebuild 2375 BLAKE2B 385500583860ba528d43c2a663e3934dc9109315ef78b9813d760a9effd46dbbe15b31fc5eaa2f0e98e69f17d4913f1ec1cb0ecc04a16943faa8a66bba6b89e9 SHA512 4c98e2048ae74f5ed10e0d83c3d13c7eed4030c251b3db27492af4075c37b0a11ddba37bf4c52c782686c38c060fd7f8079a59903eaf09889105c9cfea60c13e
-EBUILD sip-4.19.19.ebuild 2380 BLAKE2B 9c2ce5da73c9463f28a85c53c5b4348469509f22b7fb2ffb3e903d2e6854354c39ee404758babd76702ff8b490d9cf7f703cd7542c9be601929d6029dbe5cdb3 SHA512 b74a3fd0ad0a840bc8dcc445289aec28ded48985fd8a1d11f3e8ab163d65bb06b95787870212228443cbfa755d90eedead0aa6baf410d8c67174b4d7da195712
+DIST sip-4.19.21.tar.gz 1050654 BLAKE2B 2da54bd5d6b8a1653f74272634514817d3efde90d83a67a8e68a1a9d094d24c5199ab9b7deeb2c33a32dc3008778747a2f39e0047f6d6e034f440be36c457072 SHA512 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60
+EBUILD sip-4.19.17.ebuild 2376 BLAKE2B d27a7a14e2cb975008683583f6d3535eb80e52202d751d9f6ddec45742bb0c695500322b2abe3ce5ff85be319d55b7e4fa9a75dd8fa1c2a24f3e65baf472db29 SHA512 d8c0f913233c5dd88e30156b6445fe839b783071f79b2e8022c04c23b0e5e753763472f3696ead1d8a8d59ce4ab3be61f22829df85617b16550498042027511b
+EBUILD sip-4.19.19.ebuild 2379 BLAKE2B a5fe6207583ba7860dad96b75ef0a5a01738a6458dcf7712d2d553c71c46a3fd44044cc1428c674e401c6c170ea1dee40611661bb1cc0ffddc7b4b570557521c SHA512 b6d5ce1166c1d5ed83cf9195bc5883623273fc29b5fd303fa14cedea9fa7330a27a7f1a34ad1e2de3a7aa8ac408391f4368e67e73abd7ca08b89521aeee36203
 EBUILD sip-4.19.20.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
+EBUILD sip-4.19.21.ebuild 2385 BLAKE2B daea4934c6dbcbdbc5f94388ae35b19a6fcef6c14b70b33eea484f2c8ce3e2f5768e031d9d511549504a5cc7b752d43611ed21079a3782bba10379f6a69e7d36 SHA512 0d3a27628f23a5758590a2a4e821cd18084c9ab46f6c5d7f56b2940b600dda34c79ebc1bb638c89bddfa87ad5557bec9210592868126864663807407ae8bf403
 MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index 50fb73dc27dc..d5fe18b33934 100644
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ b/dev-python/sip/sip-4.19.17.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.19.ebuild b/dev-python/sip/sip-4.19.19.ebuild
index 5d7a76a0304b..84d9e60fd106 100644
--- a/dev-python/sip/sip-4.19.19.ebuild
+++ b/dev-python/sip/sip-4.19.19.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sip/sip-4.19.21.ebuild b/dev-python/sip/sip-4.19.21.ebuild
new file mode 100644
index 000000000000..320cc98ec4f1
--- /dev/null
+++ b/dev-python/sip/sip-4.19.21.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+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 || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		if ! python_is_python3; then
+			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		fi
+
+		local incdir=$(python_get_includedir)
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sysroot="${ESYSROOT}/usr"
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="${incdir#${SYSROOT}}"
+			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/six/Manifest b/dev-python/six/Manifest
index f2e7ad57cfd6..ab60a69a4883 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -2,7 +2,7 @@ AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb
 DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 DIST six-1.13.0.tar.gz 33726 BLAKE2B 9910a72eea4adc030710b67252d01fd74ce4205bd4e0ccf662bb2bce8837853cf341c765e4f9ba2db3aaeca050dd2b1ccabefacf5c71383dad1d275326313ef6 SHA512 55eb8e23e529cb0d2ab9e7c85868e695f36c8235e914b1548eb4b9fd561e4237266bf1839457f15a9513d57a343cbf8ab809d6187499300791fd9356854fcb00
 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
-EBUILD six-1.12.0.ebuild 1076 BLAKE2B b2bb88413cfab571026d7154338dec8e2f168673ce5648391c094ec4065c86994420f79f43777f4428cf77a5e7d6fa905ea954e9d9113dccdc898fdec3e502c4 SHA512 9d3f4460cc9724bcb25a15c08d842fb7756b9e9469984934da105efb906681dd00da57995f4e3e2364bdbbd86c701cc3803f1bdf0d565d08057748680dbeaf7b
+EBUILD six-1.12.0.ebuild 1077 BLAKE2B b9f55350fa8a7c250a6d31293a7ba36638e7f4c95c560a47ad2f0cc5ae3fc590da13e739f924e3e8269340e462cd0954ca825dfb3b8599b91b8f00832112a40f SHA512 3cdd27d6648823c666870ceb9827a692b4af56384544194f4567b452924b367263f934dab2b1754d8e5445cd6b427e6335af5a9dd3fdc352ddc118f436f7fd63
 EBUILD six-1.13.0.ebuild 965 BLAKE2B b17cced2a16ca0172e4895df375638e24f22d920c191eb4af89680f522da2e09eb6ffe03cbc007a8f065c86a1133f2afb2212a4d0f618e97019802455a483269 SHA512 79178727a2f1b4dfa42d90f6cbb53693a8ee176550956638339cf723447710ff3017fee46a214832f029151ee45f2a4ac67d90a4fb3cb22a0ddf4411f1e04c93
 EBUILD six-1.14.0.ebuild 689 BLAKE2B 4335b911f57b5c84894f26e97e329919d82d17cccd7547a646f603b2fb56beb304c8019388a62ae700bdc55ebbc78422cd8309dec992b69fccf53835b9aed812 SHA512 76e1a6398ee5dcc1971a6d101860a83d4c14af2ced60b34602fc2e1753ec7429fefab944a36f7cd2dbed74de7943461f94ec30f24bb9a939ed769bc0a102aaa2
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
index 00e6f60420f7..14e8298f9cad 100644
--- a/dev-python/six/six-1.12.0.ebuild
+++ b/dev-python/six/six-1.12.0.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 ~x64-cygwin ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index aa50c287bf66..c38b2da760aa 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-0.9.0.tar.gz 22082 BLAKE2B a0c7e5957a4ea829a3f7855ac5d05660ac2bc6ed8e58a50b805a4c07899ce5022d5bbc0329604dd2296dace3e6e6165cb108be8014c4c834629f830af14a4562 SHA512 704e1c67b1f3e1303578cc26d4af8296a11b5f5013e8e8d933d3096e588911b801ddfb162d0e35a49c00256032824386d77e4f38d58704cd57baf21586b40e03
-EBUILD smmap-0.9.0.ebuild 695 BLAKE2B fb3fe3eddd73f71c440ee7bd822d826f2739b8559f55e04f8583ff2345cb411f919c4bc18e72a18a1e0ad362cd28e8cee8bd1ecda0b7854f02277d5650291d02 SHA512 20cb959db20ad1bd61067395446ef0fc394574e2adbd986725ff79ce03c744db5ca21cdfeb34525a77a35a66e4dd854ae09fff2359e660c5ad4e99177ed0a60f
+EBUILD smmap-0.9.0.ebuild 685 BLAKE2B 95c1df4d7f2ec6f61c5276b9044f638b980a22095ee13e584f1a5cd5543b1584a2e4feac04a09144a1e445772d4248df657abb893175583a6af2eb49274be5f8 SHA512 33f270b3ed764e36cba31b04f395b47e70116b1872f54b1f33efadc15a86982098ed90f5e21dd0945eab17eff0b879c6ff8a4d9b3f5545b21ba8d1cb8693a3d7
 MISC metadata.xml 371 BLAKE2B 3e42cbd127ee25fe4e316797aed0977eab484119096a606b517fa8d57d2ecbeebd4c4b51570dbda7771d1b9bf6bca368b5fc97379f08e2c1ea51121628d109d1 SHA512 9f6f41b53acf58ff0b7ed064469b5b66820f6c173b657ce59d9501d78f87ff2667b84bd0be275f6aa2d06752d875c5aba83105f5414b2b50a86fce9008685f3c
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
index 44edec321ab1..6e5b48410c1c 100644
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index a5ecf862059f..c6ffee7f4367 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,8 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 DIST snakeoil-0.8.5.tar.gz 296311 BLAKE2B d88b3f5fe299511343676ffad5a1f1efd10078f50d029b74feea66f6b6f65897e2d4dac2e96f65e0cbaae0942c5b9867fce868adf12be746c9c4ebf6f6a7f52f SHA512 d25cbc105d5c881d8e99d5c2970d524914838917a4a716d8f7269a85af0d9a067b9bb9c26a37b9eb49239f97360938bece1a1ebe87aba04340b0fe528f44dc4b
-EBUILD snakeoil-0.7.5.ebuild 984 BLAKE2B b480540e185705f812b51c48de0fbedc68bf9c89f4ba7c5a595de9c60391021fee3963acc5d578c8bb3971a5a4b2a93f3de5efa387148aaae953829205a091c2 SHA512 a30f8fc467c1d28c8dc5382d30d9166b67b121bff6f391fa6ca9ac4af26d30721ce7626cd28e2cea3e62210e582ca313e21df915a18c8d123db40d41e135850b
+DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679
+EBUILD snakeoil-0.7.5.ebuild 985 BLAKE2B 40934f0dfb896cae019ed94c98a6ae9f2a321284969d4bdfea200514fbaaf0337cfc9e1240317e6cc95229f04937290777ba0572c11350944bb6acf23b3bf4dd SHA512 8f9e466d849edce6bab3f574cfdcadd8d56a6f68391d5c348d253ab87bd36d5a3225fce449e03e870991eb5dca833ffade08fc323a9811151afcc2bb71bf514e
 EBUILD snakeoil-0.8.5.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
+EBUILD snakeoil-0.8.7.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
 EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 MISC metadata.xml 499 BLAKE2B 57da127293cb2cfacc6370aabd140a115946f20a8e4c69e84d0b2158941fe3096eb42c12793445ee126e9123928db3156c589146aaedb9480f5538d9a40b90f6 SHA512 09070bdbb1b135b9daf96c0e342d036522e993a4b400169ad69005004ef093b6209a3c26d056e01cef435c7896f402fa6039ed0301fad4745e0ac3874a1340ac
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index b47ad42ca036..739493a9ebf2 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-0.8.7.ebuild b/dev-python/snakeoil/snakeoil-0.8.7.ebuild
new file mode 100644
index 000000000000..424cd085a42c
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index f3bb58f408d4..aa653053798d 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 510 BLAKE2B ed698b788c6d3b48f5fda0354dee3d04b3d77c6cfbbe8442a29261339d0e02d5371e1b97d1b355b8ebb70dc198d8f7c6226b19db5f8c08dbd4e1d72cc7978988 SHA512 3b051f337f7a1977e3d251de8f4b8e8ba69b1a426f586018c106a9e7862004932ec00f2484b4b3ced6ceb92130890a3792f8e5fb575e8878c195134b077d504a
-EBUILD snowballstemmer-1.2.1.ebuild 557 BLAKE2B bacc3461c7fcbc4acf1d177a9ed9d3574bafb01c7550f4f36228f8e76555424537ffbf18eb229384e7d989e243afb44228862c506abb55f4147cbe730c3ddf69 SHA512 6d1e96d4e84c4614421e79be286daeac9ce301cdd8d63fcd73284b3eb6edbdd69c8de122561dac79e3ccac01d5962a8a9d36e38853a55bef810a1f59ea674d65
+EBUILD snowballstemmer-1.2.0.ebuild 511 BLAKE2B 1ee6823166797c602a38491df5ea1ae1c77e46a151aba01d79b12a128d407fdae7a8951e674327a4ab28159b343ec5012dd8c94518d1bf5f729ee701acda8762 SHA512 0ee3aaa414e050eba19466966faa500aa9c9c142c3c411a57bf38b175567f2a5800ed315fa1c6286e308535bfeef0aa81457199f5ba43761e8182f99ab597f8c
+EBUILD snowballstemmer-1.2.1.ebuild 558 BLAKE2B b514d1d2919894b2bb90ad1e94a82ae1d91a961acb517ad985dd5e2b68a7bae7836ce27b68222a307ea710c28b9d6b7c0d1fea4324efd3c51605cb45b7987b8c SHA512 227bd30920de9c8cd739a522d63cc0033a43438f30145a43bacab887b41669b109c971e79a7ef5d5b49f8550aad8107cf677be2527f9030434272e267c784d48
 MISC metadata.xml 416 BLAKE2B 0030a77ed97805fd6a4ede1f713188010f6941ecaee137d1d9e37c2e8c8c687c1971b3f5c38769815c950efebf6c5284d92ee930855c535743d03e010b42ec1e SHA512 6a0bb6e150616b856977ae455af4c954fa871f1b0d675c73c079ba22867db2870210c91a63d4d83d3ffe672d49a90666dc988e5cd778a0486864aa41a497635c
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index 56b106af1059..e4b5d2362d1b 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
index fda5f81e7627..2bd337444839 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild
@@ -14,5 +14,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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-solaris"
 IUSE=""
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index b69e99269c2f..f23f08453993 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,3 @@
 DIST SOAPpy-0.12.22.zip 172855 BLAKE2B 119232713da3474c58c925a2652f5739f70903ce8204a3f999bc511df9387cfc33d9d812ea3735d04b37e7ce45d6c0f5a5a11c79849406c2d60fa6ca91afe61d SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b
-EBUILD soappy-0.12.22.ebuild 1012 BLAKE2B cd0ea5e9952752cf1492a7f7ca5922ee68ee92cb7721928362d8f77b4a05829a1ccfc7667e08d46a247a7ecffecab4820724b458f7346fd77c872fe98dd8aebe SHA512 3f4021e8d2c6f87190ede134b299152f18141ce127e9aa72a33d1d4b7006c080d8bda2d2a80b70dc6775658ccc4c3b51fded93d0e915ae1a64fadb214bbf5d7d
+EBUILD soappy-0.12.22.ebuild 1013 BLAKE2B 297e9c4399563b938c572c0f73faa16d4aefe62397252e1332eebdab006fb454a67b4a4c310d49e2317674627336855dd4c8d1911cacb93920903824bf0991b2 SHA512 6e6f6f28c97b6bbedd1ec1889ad30916b837bfb95e91d4e359a1f30dad67f1c1c49031a1c04fc1cdd33ed50163b83338aa8ca326d8af6bce0f6bb88933f6d4d2
 MISC metadata.xml 363 BLAKE2B ef3fe590c0ee03d9316b5f70d2c4eef13be725830b11d2c5071c3678efe724b4572a52cf967844c5b194064ea464e40d6f4faec5fef804e07bf98ef9bc695711 SHA512 09455c1710a40712fec6cbe5680091f3186d755fbcc2c64ae4fe4c9dd50bcbcab681a2e9aefd6390c12c775b76bc76aa7a04a78a8ac23b281efc908d14285742
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index 54de9d02416f..090192781ef2 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="examples ssl"
 
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 6212126b2b51..edd04c359752 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,5 @@
 DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
 DIST sortedcontainers-1.5.7.tar.gz 11970881 BLAKE2B 0ffdc19a9be82481e71a7ef59391166e19c44d7fc4eac7696d153cac707fdc4beb84a36039e3f1e194c43dc9e956eaae5dfd909f24ef12db4ea99c8548475cab SHA512 a9f2ba152c47eddfda6ad8ef7ecfbfa5d51b17afb4042b0b1e6d8b3dbc6caf6f8281af415dfcf1e356aaf80aa3212865ba926fe0d6e08961c8fbbc68adb34108
 EBUILD sortedcontainers-1.5.7.ebuild 596 BLAKE2B a4fc973ee9b1b4adbb2147b9654a54500a229b06196038c657c8452bc2a91b67caebaee9c60bcc9fc94029de98c64831b85deb1cf2078204331626a87ec2bd25 SHA512 50660da8b57a9cee9bfb4eb8e33fbfb284432a881ca7b1545dc2727a9af247cd0310fcfa3a9fd2d18a863cc9707d9a77deeb46a8078b3a790dc368e3cdb5bbd6
-EBUILD sortedcontainers-2.1.0.ebuild 797 BLAKE2B 452ad4f72e80bea98fd54f5e2f9686f8c9c6849517e05ede4ed3e59eb3cbdeafb51c90af5049df012f226ef5c2c48d6ff7121dd2c28cd3c61cd515012c53c687 SHA512 f4768a74ee1c089049ca89a233031ec415a6af36d53f787881151873fae4d02248b9af5dca2d59271bdc580f41b46b2355609a30c8b7ba8f7fc233f4ceb754fa
+EBUILD sortedcontainers-2.1.0.ebuild 804 BLAKE2B 0a4e958e46170a6d176d90a465a57eafcdbe3458af6818b6d4929fb265f04bf6dff38c8f684a822fde0899215f51dfe9b25590a00133e8036198cc47ede8782b SHA512 4bee19359bc5330b98335a323e60d731423be7e87f39ea1b64d65e517a8bc1d23d815f5609dba82297cc25721616d63e2ac378e9c5dadef3feda393da75fef00
 MISC metadata.xml 528 BLAKE2B 24ac135145b3465465b8ad8eb90b92a2265bf1209451f042ef5e6822088efb05278932ea2e94e5817bf5889bd6653726b5435ed88c633f609184c9e4fb43ef04 SHA512 a5783cd12e4f0e372da9b4256ab4d7cbf42727e773342d110126f5509611a335d95b949aff706658508d6bd37e633635af0f32b72f514661eae68a79072e5531
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
index 344bf6d619a4..3c8aafa7a999 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index c6cad3f2e18c..87bcfd565024 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-1.9.5.tar.gz 99119 BLAKE2B adf2f068ca536583557dff5b86fbb8020de8139c346ab124c8f78d91d2c0db49553cc9b8580a4e8af0fb74e19a8f8b6e5459b654a900034d76a677e60ea0fece SHA512 38cf37c7080ec6054291a076eb4b152bbf5267b9fed25f933a340345cd7807f14f4a5300707090fd233382e96841f6a33305876cf02740c96dd6aa9d2af06868
-EBUILD soupsieve-1.9.5.ebuild 897 BLAKE2B 51577ae407be745c42263275b116cee39eaab09f5620a832fc1aad6aa175946e1a18b6e019947999f813c2e911e0bd4d8f44d6ebe53190098a62d9c68527f12e SHA512 2e896efe656a22bfd51734092766c55da07a43fb74dc591ec663eb3e3b7b56fd91e025e0b91b05c3f4c07d33bfb4e96d773c97df0d38ee22542cf39bb0d6b20e
+EBUILD soupsieve-1.9.5.ebuild 890 BLAKE2B 4ae2327083bbf585f8e3723bc24bc37937c55f2a451e6fc20a3c3b3e23819eb26208d797ff862011d08236cf5925d9bf3ed817ac537d30c109223d194f618ce4 SHA512 80d71479d69be220425493b5260277a480d1dde696fd5db18edd2836c0f7a9ba7cf68746b67c7fb7143e9ea6c3c113307f0ce13765da315130dd3b9e19aa348e
 MISC metadata.xml 374 BLAKE2B 14941be3b61b2a2c4cdbd3f488d5ee9043a01d2b5d216947d41cc96822a80a34f435ba0bbaaede5ec6bfa21e01e3f7a6ab09d2b79bdc58b843b7da794ed92d25 SHA512 22a17406eaebb4e49a1a78d0edb8c155a8416fd92c21fbfd277ec74f54b65c55de1d08c046c979f1e3a3742900d853d5c820032e22e5e61e4624f2b1bd0c5b45
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index 78ee602f0a1d..01309b36d9ea 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 87737049afbb..cd2b17987e1e 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 DIST SPARQLWrapper-1.8.4.tar.gz 56757 BLAKE2B 1d181a4269d4d2eadfd860e014f31f9134b500d4df437ab548804166821c574cfaedbe011c6b24328a40296da88378205b45839d225ada2b4afc6ffe28360f2a SHA512 301fce7f58b369009a13988a11d782fce6362d73472811a07dc4d962062097b48470c573f5bd1dc337532db467e75936f9e89fcc64dde91930077ce4a1657179
-EBUILD sparql-wrapper-1.8.0.ebuild 610 BLAKE2B e9c6061f6fb3ad1a5b9d3cb8b12cc095b5b967ac1d78bf22dcde5696b1bdfdb62c5dc79fe2f484c90226a231e40207cc627ebfb83a222a7cd37339f869863d2b SHA512 266d4cb22956fbdc95c173a30b522f92d145596473c5702d4510346ac16f4ef28cf71e23d7476d12e3167bdb7c3dfe3beaa175315dfcee97cea8ed0e8d37b354
+EBUILD sparql-wrapper-1.8.0.ebuild 611 BLAKE2B a3b8e07f5780303e16cefe57aa1183469893df4ed7f09dca77064fe88eba5a7cc9a78486abfe00c8b29a721ebf2ba64986f2b86c8b099c663b6d8694efebf8d5 SHA512 aa88a01ab7b44d5668b43402faffecb121bd68c44eb1e0a589c02899c1bbd14b5098b7c093ef723f511739182f2c7d55208a70be151dbfb7fd249edcaa1d5f6a
 EBUILD sparql-wrapper-1.8.4.ebuild 620 BLAKE2B 2fdf8956b4679820c3bd3b7dc76213199276afa9f7312f892065e48324a9c330915ab99fc6b9c7282bde60c4181e52693cf2c1b52ae035c72111fa80080ba06a SHA512 139f32edb4b7fc0d1f4fd4ce9941a2624b62beeee48578f93e0ceaafa359917b36c80eb9edf5d2a58b9f7108773f4e9e33940fc82b2cb2a4f3ed64610d186a49
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index e7f02e5d63f6..97a22e66c8d1 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
index 711e8f461f95..e98b8220e1c0 100644
--- a/dev-python/sphinx-better-theme/Manifest
+++ b/dev-python/sphinx-better-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-better-theme-0.1.5.tar.gz 7276 BLAKE2B 3fa32181bc567b7db614990be56ff382368564ef5698a306f07cc42d7b5d56f085ab40fec5143e85935dda63766b005e89d0310744f2e4d36de3f274a214db39 SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c
-EBUILD sphinx-better-theme-0.1.5.ebuild 560 BLAKE2B b74bec5ec0a65ccd9dfc7bc603f1712fcb45b6dee845a17bd752dbf755efaedb3328861f2ec2aed5c7326c3f3e08c96982359a2eac476dad758574bb6c542ec6 SHA512 24ec000001c845be7408f0bf9ff195219e52fbc8db2cfd3346eed9be8f33e3e7c69c40e939d040afbe1ade6f9544065fb0cc9bc828885e430819171e5149b431
+EBUILD sphinx-better-theme-0.1.5.ebuild 561 BLAKE2B 845bc2c3d971d56b3a11bd81db182a0448558c4f6488045eeae193c72386e8c7038f69106e16fb625747ca2a1706acf2a513b5e755e0700a29438a6ba22b8603 SHA512 0511aa0ecbc26e1fa4c985f51d12c2859797990321a3752946a5ec18cac96466fc32d53c819052af94559122c54f00849bd1f69695bab8e83af56537d109a1dc
 MISC metadata.xml 400 BLAKE2B 4adbe1723956764f4f2a24de5c5a3ea0329ae619821cdd4c9e2e85712eb67510ec1aa3513a6bf0cfe3d1b8251835f0ae795a6a87648314358045efcf7a075ee0 SHA512 7f8d3408daa82c2cb5576757172ed26d05c3bbdcd0dc6d1c474a60683d13f3ad4839fcb71521c30d2ccb0dc126c9fd2f676ee758830cbaf39c13c88bd7a6484f
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index f1a32af8eab2..b481f9d4f435 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -15,5 +15,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index 8cd9311e9411..0b8a95104257 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -3,5 +3,5 @@ DIST sphinx-bootstrap-theme-0.6.0.tar.gz 1232454 BLAKE2B 90fed63a388f71f1d74cc31
 DIST sphinx-bootstrap-theme-0.6.5.tar.gz 1232943 BLAKE2B 76cd6f70cd485c552e9a76c559c8687129851fa40e03e206bdafc5fc0f948ed53d07ea8196908d2c17af1718eb721aaeb4fd1d65313e12a069a7186008a4f222 SHA512 30ef77364aa4c830000f1a2ee7f663740670124a6f433ed59af05ed408a59cb35643b66e3fea391edcb811cbd9ae3713eb174c76bf00bbad9801910935159bbe
 EBUILD sphinx-bootstrap-theme-0.4.9.ebuild 524 BLAKE2B 77ac2d304d567214873702e982aa7c2c037c26d41009578ffb24a9b23f47ba89be51676f613cdb23ab4c1bace320ac1cfa41e0d1437dd54f35a3d71b4eed4a0d SHA512 dfcaae140fc726c86e33b3cfe2d98611a9272f67fda4ee010f622f09af0749fbbc1dbb639ba49c9a4f030d5d9d9f1fbe61eb3d6831d5fb95380ab077dcd4bdd2
 EBUILD sphinx-bootstrap-theme-0.6.0.ebuild 528 BLAKE2B 1f00339eea19494d665d5839159072b12e909d721527c3e2a27015ee971be316b552321cc883d34b92ac79632cc35cabed3a0249764d80a86616433153ed7a51 SHA512 fd62db60422939ad18dae9412c30c17280ec4a512b1a239de11d19f88f05dfff4146ec09fef58f0c6ef6dc7ac38a5c41c7811426395282eb0068530fe76c9ab4
-EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 544 BLAKE2B 6c82bd4fea1f78a0093d4afc8519978dfb595e5cd8dd85a8d2811badfe5387a59b5b8424f6c9665b57d9567a8d003fa060bac2431a71baf4b9c262c77d3f3cfb SHA512 042cd20bd633491852ba472f66b46b38d41532e642998ca2c0c2677b7fdb203c91b81d33fa05974b0044977cde1c00f799856785c8dfa8715c88aae35c9f5c2f
+EBUILD sphinx-bootstrap-theme-0.6.5.ebuild 545 BLAKE2B ac3f6662445241c88c7b5b46bdd7f5415cbc71b2618f9c8d8a2c2329969e27c41ea99a9533f48da6c83099af697458fc5ba6e3c8a781205de2196cdaf45080ba SHA512 77328359982552941f6e61261f8cd7786f23688504fb8b0fb72cfd58c4e03c9e60c3a6c72ae41fa90e6fa909ebd9c499415600591914bbc0c35f48f24f6ce723
 MISC metadata.xml 495 BLAKE2B f1850c5403281533f2edf707dd9db4c1e339e56f4e5677d9189c51376b892f79c084bc987c0b1f28ae2fd09030daf5f249cb42681e8f22787df3b31c422b649f SHA512 c6011ce51a2c8f73d33eb80eb3adfcda50911dc535a1c6f18862eeec7c601245aa76acfdf7a9f6f80f4aed2793ad5ac244ae2e0a893723106a36539cd7d0651b
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
index 4018f562c67c..eb0c963cd768 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.ebuild
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
new file mode 100644
index 000000000000..1c7d9c39164a
--- /dev/null
+++ b/dev-python/sphinx-epytext/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
+EBUILD sphinx-epytext-0.0.4.ebuild 583 BLAKE2B 23e1a45f4bd0c1c648bb659d1969f49d7159905076166ac23590c41ae44c32e38dbfde2098c48ecf706a3dde10ba161a249fdef69c7b23f33167af628413ccf3 SHA512 4b138e7e71b8f92bda1a2cb681d20e58b7c25e975d682855ef338ddee610d397ae18e7efae25552c305eb653a54103d97e84b6edb5879c31b24d031d77a688cd
+MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/sphinx-epytext/metadata.xml
index ff5bc95069a0..d5d444b49e5e 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/sphinx-epytext/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">pypy/pypy</remote-id>
+		<remote-id type="pypi">sphinx-epytext</remote-id>
+		<remote-id type="github">jayvdb/sphinx-epytext</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
new file mode 100644
index 000000000000..48596d30f526
--- /dev/null
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx epytext extension"
+HOMEPAGE="https://pypi.org/project/sphinx-epytext/ https://github.com/jayvdb/sphinx-epytext"
+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"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index d9fe4ba8306e..8e428e1b3063 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,4 +1,4 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 570 BLAKE2B 250069067912158958d3e9a657400aa5a21f3a3ee0e01464aba4e9168f9d4879386a21bf026761f7a4c51e65040b8c27ebcab425b54cc07a2abb064119cad158 SHA512 38fea52cdbff4477c09cd8e73348b37a227ceb5c6c5f807759682f8aac74357bbd75372ef3685beba41f0c77109c4b0061665152be0911e8abca17ad4463616c
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 551 BLAKE2B 942b32d95d0401d76ecc260e516af018f0f7c5419dd2683d4b4fe121c532b0eec7b0d1a85a1b551110543cd68ce7034efebd85d56946cd7b775a48930ab4fac6 SHA512 f54d409ae38ddfc6af9ac74ebd626c2d9b430183c5b3d3bef3c6e571f7a40652de93e70de3600844f930e00206970d6adf4c36ae1e1f58a241e1fa6a3f45ce51
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 552 BLAKE2B 68c5e69502cc763431ebd2348378aa7bd7c010d2bb57d9cef05218d68c13fd8bd1b99a6ea31d13228641a8ee4825c5db0aeaf50aa2e2e4c89af670f849edeec1 SHA512 2edaf207518815e0310ad881d288b6ca68d9a0d66d5d8f3e7873758756da6cc3f467ca670163e2b6cde2c7bf9b6b6c4f15d3a7f9c8e10186ab21ed752226e04a
 MISC metadata.xml 515 BLAKE2B c980e1ccb62fea64efb6bf54ed6c07acbb8241b2b65d0ba6043fb32908c12654f61e173898a452e6c56b9010744db626d1dac82bad68a09cff64866817015c90 SHA512 d22018d48a247400a976347285d69a3030b75505bcab3ee4e66a4eac419b2171f26dd483c0653e4725a60671ae165d5de4d9d3e2c058cfadfe277a26d4dd714a
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index a03dfb376ffb..fc61a8c3e431 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index b86f0f45b8bc..b68b4142cdb0 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,5 @@
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
-EBUILD sphinx-1.7.5-r1.ebuild 3273 BLAKE2B bdf717574fff248aa76ec64819308b4219a474b78f11d8d8d669cec4e192cfaef35f6f6655f169fda9ad31dae7b826cdb47a4e0bd7361fc7bfba435449a4b5be SHA512 07882ab73becdb686a8b60a143cf3206cb042fd5e3cd639e0b6eb90e67f20d0e849666fc45bb78fc84e98be11f1664dc420f368ecc8e388dd21251432b5aa075
-EBUILD sphinx-2.0.1.ebuild 3468 BLAKE2B 605ec0abaeb47ba72beee736df6fe07c33898c87344403296abd7bd5c286914d3073e6e4a6407ae4016d74d4b336356787805ce733cddfb42c535a1ba29a15d1 SHA512 3d6c49d1178b9ca0b1024aebc9cd2fb6f2e300bbb590cbf61b4fcc908528a2e37643bb514755832bac12186b18e2c91e30d290ce1a75f90e83940667dbe2eed2
+EBUILD sphinx-1.7.5-r1.ebuild 3274 BLAKE2B 8cb9e111804cf3ccb4119214e6e6636769bd231fcfe9ffeed590b02a93b441e7c63eafb1e70e69125833b63ee1414243844e9ea7e87f814f33c469b40f71d736 SHA512 d7ffb502c0f57d5c8efcbb10948ae1c9ae9d2f5a3d4a19c3432e9bf9aaac97e4b905918038f1f0735d0412dbfbc00171a59242ecd1cd8d7e435f1b4f839fa921
+EBUILD sphinx-2.0.1.ebuild 3467 BLAKE2B 61fb0825223ffab632bf664e94fb6c5c691c4efc059d5a26894ddddb506f2a004dc1f1c8c99275672ebab1b5f967e3f5483fb93179878bd008f8b5148181c53e SHA512 d9520a9d024a010757b134519ff59d4e62ac801bca21535430118a5654147ad80acacb7c7a051399f87de9aa4fb7127c56390d95cc10fa1c4d924bfd75bd8f53
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index e3a92af2e35f..acb0ed9348c4 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex net test"
 
 # Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinx/sphinx-2.0.1.ebuild b/dev-python/sphinx/sphinx-2.0.1.ebuild
index 4e6524ab61f8..e87b2916746a 100644
--- a/dev-python/sphinx/sphinx-2.0.1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 
 # Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index f05c2fa5f60f..958ed41f585d 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
-EBUILD sphinx_rtd_theme-0.1.9.ebuild 523 BLAKE2B a642d19120b596546476fc7f3e0f40624af77b7f9a806cdd73553b76b5599dc7a67af9e6e9ea5a7bbe775b7a3824277050c1faa42a86b474124b6b486ba12a6d SHA512 e204e68f2e04c979cc1098a80a3c3e142896f13d148fc760e760ab500eb5daf4cbfd7c176ef4cfb9f1e988d898f7136d5fc1c1e7c183d0ad2398400bec0e77b8
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 543 BLAKE2B b1c550a181052815a2ecdc3bd89ff7a98e2040f31c5db2aa213369fdba3444750d5c33c1be5582214b614ffe7cb44046d322fd2f8b8e28839a5cdce69bdcfa66 SHA512 71937cb211d0342ca71e3465eb0cb03b12a6f67b82a7d381988d741da6ea2eecebb0633b8fffa658889a52284a6f1fd8677a4d55e2068a660b0f1a580028b37a
+EBUILD sphinx_rtd_theme-0.1.9.ebuild 524 BLAKE2B 67c008a5ba00bbee28670d8d756d8be2d3cbd4618fb8ef4cc7abb9a01af8ef6b991b57a7818caa9ed088357a65c06ec76958ca5850116dbad9a3ccb4f3f451a0 SHA512 08013c1d70b1cc224a4d96f678af321121f91dced1fd82863e9779c33f80e9f4309be7061d570966d1c392dac70e245f2f15ae5235ab6b5a5bc71b9f3340f130
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 544 BLAKE2B 2a6d86a232ffe105e778bad9d9d518b9ab602597da45453121ba30eb090cfc20c6c57c0d2bd924b9f067d5b688019efe584fd933340552b2cb75b9f5baf168f6 SHA512 6ff663ce5d21f963c94b708b05b4812d8f65a5a725a7da2dce7ad06e6c70622e08f1d155f7eae7efcddfca21d413e5b99c2c67ecf134ff61e78ddbbcd1b50c44
 MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index c0163c7baf8e..b097f22d89e8 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index b5b096675207..3f6a9a210878 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index 42d5ccde2237..d3a973239a73 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
-EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 734 BLAKE2B 857c7285bb061839a1f840ed73747369d486f4557519741662b153bf2a9c0ec6c3697e0c764e91213bcfd6c7cd742cc6dca7c7d9752a508407423d20a62abb72 SHA512 6adedc29e8647012cb1245c0cec1b8f3cc17ffad17f17d3103465eb4890f24cda4c0df399323c2a0ae1f3e19afbd441647b9d9b581df7b97dd350f176b5afc97
+EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 733 BLAKE2B 53bbc4890f32274ea468d9adca73bce6d4f6357f4f0e2b35fe6e26edeac6c7bad013b89dec54a1ccb682e3a3b9591641aa1cb65c3d2089a42d72796398353e1d SHA512 0556ac7df5bc63f00a3d20b6c5e08a993abe18a387e0cf2411efa1b12715a5076b7070227f262a293ece3cbcea617d6803b87fd6dd67804a9e4af1d6437ad120
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
index 6bc2febfc222..c3c409d04600 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index e124be38f33f..959b6c5ee51e 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,7 +1,7 @@
 DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 919 BLAKE2B 6585aeeeec9a24c889ffeef5e06bd0c564f19060ae1348de49046108894ab808042f20443ec0cf5aa513c5ef6a1222fabe1515af0c83600271e59775c7d0798d SHA512 f7a19c97e35131c616db4edb2aed80bdd8fdd7c6bcec3362183c814e1bf0544d3a3cc7efe41c4c652bf999ce3c979c9ca907bc42860123edeee53725e25c3e66
-EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1330 BLAKE2B b5aa6ee74946a8c51a53b55a1f13e310f2634b51aba81e989be4282b4eff5e74413c11323029defb5b8eea2391efab12288869016cba88f95bf303444d38af13 SHA512 5f28ffb061e6d75068f99ed3c5699bc66a5443c82b69c61a9393ef20a201c341d8073bdb9164bbc7008edd45f886dd9f1c8c0e08454d3be1c5e0e13cd9811a9a
-EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 670 BLAKE2B cb00ac9da32f0304a8fe293d9b815030a4ecd5328202525947f7e7ff6a4fe4b9f1fffc7633bba14cc1e85e014998dc040979f4199296235cfd3773051e8e3e5a SHA512 33e75e8ce4fa07eec1cb381baae25ac9e55f8cc050439a656c2db24e869eb28400bc87f21b2365f38531d7fe66efd870377fbe730ac44b9c793fade20558614b
+EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 909 BLAKE2B 5a26b005193c31dfeba6857c574a36f1a04cc9547e59abda942285f34968626aabd2c13149886255b6babd54a24780ab168f07489a9da9cde796dec7e68c4f87 SHA512 fa33c848d73d802df7d3ffce63528085fb4409ae6d04740b48a8d895ac4b15dcd08e8f846408edaba6cf5337baf8ec27dcf3de60778e798fcd3d503adfefc0ef
+EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1320 BLAKE2B ca7468a14990cdf2fc8b07f4a460859d4d98790fe49f100746e7b64f3af1eeb90c2545b4b6ca0cd32106ab0b1bf9916d839e13204c35c40b1e603dc1e1675a7c SHA512 27c5840d236ac77b3fd8a6b75a654a5faefd02ff19bba8fb4d637cb18684cb0940bdbdc00e439ad5faa9c5cd3baeb48075e90d48bc0eae366a03309bf5108b21
+EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 660 BLAKE2B d79ba86a023deda75cc902bf1aeef06a529a343e5959528b93c60a64cb1749471572154a0a73356e55cdb4fc972486636644ddb8ebed7d0c06b5c79f7db76fea SHA512 c1674c57a8773a88ee8dfb97eba82db32a9a2d316f01daeb35c8002ea7f2255fa31e17cd62db1a8a67876577bef04532637b8d6a80b02347f173d3569fc6aec6
 EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1177 BLAKE2B 47e6a9f127caee1dfcf88d233433780752cfdd97246d86231ab68eb9fe35b13ef055084d031bc12a845f0da320dd4a384b0052366ee12c57f1b5d7918d2333af SHA512 d9c799abbfe972c37c769f440cf956464eb54d669d58b0cbad56408d3f914c05de0634c9c27d854d96bcbf5c8db1080beeeb69ab9c20708c936bc7c134685e5e
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
index 4cdb47c395ea..e2f7a4c438d5 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
index d51e11c62681..e2449197687a 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
index cdb5a0e6e8e5..8375f8282c8e 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index ee7f5b785c86..82df316418bc 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
-EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 736 BLAKE2B ec3db65b768365ddaae7e8057c60df6b395a3aa6d400e5e45fa9c71842ff059304c8cc6ddc7d6ff8127e71ef3c6b475fc4750d02807a261ca34177b0e98a65ac SHA512 28e47121a51e9d34cfb40f81d5da98b0ba270d32d67b854651a7b224ce89d250fdb8129df4cdc662eae9cefc1a17f5d40f924a2ccb914c91a7157bdb790c0cd6
+EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 735 BLAKE2B ce6a294f93b5d1c103b637a5a0959eab1dee09b0b1e0334bb94942f06ecaed6d7e054f69bc41fe44bf32d9d51b82cb81a9a528900e525746f29773aabec14ca9 SHA512 d2c74b77343b73691e089a800aa215e50d63c839600985dc32deb0c6515f738e169c3334577360e360bc161237926d89343936d550aff0b09f94b81d22198a02
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
index 8ad6c5320e2d..64f610892278 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index d83d2f9ba599..7a7e3256caaa 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
-EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 733 BLAKE2B 504e4afffde78ec8f6aab06c53c9610d1f58dc4f9c08f4e107efaccfbd6007fb1511df20d1b21e3e02a869ccd853a294e102e658c68691f6aef023cedfcde61f SHA512 c48c0159754c8a19dff820f5dc042cf58fb06e662511c0de44ed88e71d5edab01d7dcfa68c54bd3ec782d8f9b6cb469c8da2d1e32534643869f6de11deff6dc1
+EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 732 BLAKE2B 53517f78f8b7097800f578d877ae6f309178b64e8dbf8ed9d690b4868dc7ee26406e4d611b55548497450c260532b80dc4cf2d73a14956ba4e3175b884870d40 SHA512 43ff316f0772a148fe25314b0af6b197f96555fbc6994b9ceac5a997f7c7f6e8e5e76bb8e9a9be99a24e80c232fdaf77b37ee257e58de610888a528cb1569fbc
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
index 53a92621b62f..30a1b31d4e56 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 82081ad7ff14..2c9fb763fda9 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,4 +1,4 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1387 BLAKE2B e374a6c1b9423d471fceba627ed3f7f45cef63b8716b2813a7de3d362fdd84bfda4083d668ef3cd9240bb2337359ebe8c0bf8e58cc0612605f71f4c3ece827cc SHA512 32a100c36f928a44ecce3652fcb80e4f1f00571f282c2b881f9a9108a1e208a0dfe509d163ceaba7a3b3d64d7cc11bb9f3e53243e5866c73da579346b80699ce
+EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1388 BLAKE2B 0388e8256030bfdc8d000b3b27b3f3e619b8a66d59330a0c7b19b3c6e3b8a1a75e4920f4407a52cd0b4c34c85ceeb2211e8555396f1cf90c6e899fc2cebe1fa0 SHA512 cf3fe9e998b81b973e5932729be5d47aba03c7a662ec83c2f8b8a567a00bc5af4ab6de28195873c609bb796da97a78715fe96f8b8193c575afbc2589c4b1ebb9
 EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1563 BLAKE2B 5ea3c7bb7b50829bd8aee149cc415b16bc57857bba94d01aee27f663d9e0e6fe017d189ced974048b82ba2de07363e211fd240095a1d31263415b8cd0d29e21a SHA512 352f9e791c0520447cdb47388a070db355b0e83441e0bcaa1bc4951d7d7e894e042e0fa721ca2c2e61a2d179cf8d81a5e5545ec099621cafdd85f7fcfb81218d
 MISC metadata.xml 329 BLAKE2B 6c548d2fa97bf0724181e8afbdcf74b9a6a0fc429d9541db316d5a416ad356508685884a5feda0fbeeb2cc931afa8f5e8ca7c8123f0f687386694c9f3c224d9f SHA512 16db67eafefac64ab7b17d99e0520c1c6f58cfd929274e9f82af85aa4842278ebe29fda98ad824c673b3bc56fe8c5cf469260fec9ec2c977ca11d51b8343a2bd
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index c4d9c3705cd8..91cb7c25822e 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index ab45c33cd123..01eb59532140 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 754 BLAKE2B 48b77ab06cea30c6a5943ddb3d5b813b6a04f9358b44c94cd55144b1d59ad7a3ba7e29c69ee4dc6897f48bd5a070ad807ff97d15be2da23e52d93ae7c6cf60fa SHA512 0b76dc872020d31577792826573c73e607ef04de9a525a68c401436cac7787554a20d6681ef91f2299eb71b108ede24a97590fa5dbe88859da326fd32e082bc0
+EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 753 BLAKE2B ec8b71a1da80a827d70cd181dfb445d6f25b8493b7c086cd85f6db602712543c9632a733d0219b67b354c66b467356ece9a94f5a1e44461448cf1a58ed603e41 SHA512 cccab973f1233cdd1d11a57e4ccd175b251bf0d1717c8b0d7b5c31f580dee6e3c62acdca34d1ba4da6247bd7e8805c32889f088b4f8fa989b9a72f8c7faa0890
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
index 1ec0d3a96988..8824725e831a 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 43c230a52562..7764e7d4e1ca 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
-EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 735 BLAKE2B 4dd47997a30ef3ab13d94537306a831b751bbe4ed6c98ea40fff3f50d63915492e16bd033c9d045606d6776b87b5d2c63eba1de1b9a1083f712b1b376d3c6d5a SHA512 a81e5fbf7fb56928ac7afacc206bb4e47ebfb25ec3d82ec87a1604996b2034896b7e28eb36d440041ed58b991bd99d3374bd61d76a705d82207bd2f5ecc97ff2
+EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 734 BLAKE2B 5506c77d410f8ce9c2834b4b96935fe57dd79a1f08bf64f2ee9096d82124b7a40d906544f63c261c6906683179fc1ccd81bb54f7061034a9f1885640de6f4f9e SHA512 c419cb9b056a79be305ad2ef1c5d8cc5e5ff62dd0cbfb44679e23c9191cd3ef94d231708cee82b6a357c8b0c9e8aac014d22e985ee5390a308c6bc3e78690452
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
index 05f0d7463aeb..9abca49452c9 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 89a5894a69d7..5e6aa5fb81cb 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
-EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 748 BLAKE2B 7b598be56e21f47910f3975be02c665f42305b662632f5fcb20a9e4a94575c7bc3b038fe57b25cb33ccdaffec3a1e204bfdc9e0dd7a474b3808bcbd57f11e951 SHA512 d4ef7021c028a22c8ffc0f8882457c6104e580d9276a398d1c2cb451749ecbf1165c66b18ba0417f0edaa96deb82fb45d9d99a93146b5a06f85628ee4e4d7bcb
+EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 747 BLAKE2B 88ac9526187f0a79b3b17eb4ff8dbf3e3286544a65a0ec6f6b0e0d19046150bfd41d3b14a52be96df985e4d1113b008fe78adc5f5792dc8214ac489ef63782ac SHA512 b6863ac587c8b434509a2b86e19c6442467343b30912201651b03fb257871aa89e7cac06283df0fecab89278e85170db4f941f1cbf7d5a7bb467637061bb666e
 MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
index 8a7e01514738..094b1df36c11 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 7f07d4e65cda..4a4e99737cc2 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1172 BLAKE2B ed9b847bd4cdff2ecabf8a458b4ee3098a40afc76d4471bf0be59ff147885540c01fd97fcbb4c0344bf6b153588c03fcd38291f9413d44a73e017077dc370ebe SHA512 53b4b46715e362afd0cddb160fbebe170374bcbe15ebd75108338fdb32ae7929aeacf41c13b24f26a7627d212f4e032f15a70430a57a03ffc16d2dfe8aa7f019
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1173 BLAKE2B fdc2281d10bb9e9e2b53abcdb72d5bd49cf4158107c6cab465e9a29f7df2a4ee7d73d34d40171cb94179e49348958685672f38a7f99aa6890d71f058f81f59db SHA512 884c830bbafd1a06db3b4daf13f4ce2f435a38099b12e2fc1de35fc4b56cf0546a32c7028a712be90f37256e09330cd2d37ca7aa4c6468af50d6167bd3eda909
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index 809d6ffa3faa..92d0b151a426 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 6d97aa08dded..e6caf9b65ee7 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -3,9 +3,9 @@ DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 BLAKE2B 1b13890aa38861cbcb6ff57b116
 DIST sqlalchemy-migrate-0.12.0.tar.gz 128499 BLAKE2B 352b34f0c9490019748183dfd9c4b7e0064fece007de9ea46da88bcb7187b55ae3b502b45c919aac0d89586e4b9a19955be2df3ef81dc8b8328a0e9da7177e46 SHA512 bbab28a67afadfeb33a0a3c303c7e623de051923fef7c30b1896cb2f34fe325036c3730d93ad5f88ffb35aff25de22e1c770dff68dedd6acfbc4027e127857fb
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880bd92ad6f771cf6b08ce4472cd2c0361658f449cfecdac2c8d5b12b1df8a00940dbdf714ee7d82cd9fb7f429187ec899eb19a SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
-EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1396 BLAKE2B 5a299df0d3fe4ed8d5aaff5a11d8f2332df80a86d2d7349a55b324c8e0e98abbf967e096e37c31586c6b48e1aeb52a7f0228a5b992eaa5b37efd98d059522921 SHA512 285b61e407f29a7e9db09bb6820a2c95acaf625b1a6dd534ef7f24c5cf77ed331d2294b16403ebc13b05c72e16865a4fcb5b0b6d73c3aa454dab54f63a702c5d
-EBUILD sqlalchemy-migrate-0.11.0.ebuild 1589 BLAKE2B 6b7cf6681cea4e77db358ad02cab65f97d7926894887481defd64361fbb8bbbdefeb3fe887b187ac2125b249d69ceb71201169b5383c35082c959813b787f0c0 SHA512 e7d93ce3a7b29030e61b5baf0287f168c133500051686060ada011ba23b30a71c28f4fe02851906dbc91df518fd17c4a4ccb8f9e1fc20a9cc40adae7d539af1e
-EBUILD sqlalchemy-migrate-0.12.0.ebuild 1374 BLAKE2B a784f9928b506f1cb29885b671711b89ce192821172c5ebcbeda340f2342028c0dc3e996aceb0d77fa95ab56a0b56ab55e4e6b950f1fd59935584bc2a1d1303a SHA512 9c8dbaef670778aa14d0798f1b644d6a4eb3259e6097eca7cbcf4c199b9298757ecfa4a24faed5e0ffe704533782ae35b8e2e902519bc92503c4acc3c07926d3
+EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1397 BLAKE2B 71c7dd98e3793f5756fc534459b6076a21eabcda0845f76e20bfea97be69f8678dbed981d390dea174368eebd39dd11348de9769d0858fc671b4e9fcd85fed4c SHA512 a343ec36e1e0594374eaa1edf87abf85eb3c5b4b8bf4ec0c83fe096978dfcf989181d7553d531752fc151b5547e6c3ee51e33bf361cfdc063c9bbf3a7d04170c
+EBUILD sqlalchemy-migrate-0.11.0.ebuild 1590 BLAKE2B d3091ee27bba676a71b8dab734a413bde323f4face48ff9f412e41f21016d64e3b79a67276e193fd7ac06c2689b555c8020f6e0ebb28781ce596016bf9e4c6bc SHA512 426eb10e417e0d3382d471b99d774856510ece5e81f810f25cb9fb1443417cedca2a8eac7166b7e7e213ca0d15d2e367072216ac3a67f027194e2cb3a7325695
+EBUILD sqlalchemy-migrate-0.12.0.ebuild 1375 BLAKE2B fa00a74ffce870629484b16fd01c7dd6d8dbfa1bb6113d9222559b0681a7762ed7a740e5a24a6d001cb6c9245cb1b11e5be974764d8f6f472c33a01caa8dcfad SHA512 7d96b8d259562be16f529ffea13dd278724e37f03f23060db5d58ecbebe518ace908690504302342084f3b2bc607d86d8f66c1ac49957c44d56a6f3b7ff74dee
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
-EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
+EBUILD sqlalchemy-migrate-0.9.2.ebuild 846 BLAKE2B d620a6f2926c343d6c11dc1f47621fdf65b25db6f3e5e846f83b4ed904431e6ab946d9c7a512a81aa17df2a7073f07d94dafcd4b58f703520b6a296266e8ceb0 SHA512 59d7912da4809a9df896f18526aa1417501c803bdc1e996e42878c3e3a937a45123ca7ee8172d9f7e683a29eff98af9ab28aa051ecc0cb9b96bd6730cb8ce302
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
index 7ac37e2373d9..64e04ec74bb6 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
index 816b77f663cf..3ab35352ce48 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
index e4ae122b728d..ececcdb04577 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
index 8a7997ff83ca..6d6301db4b4d 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index b0d512532b4e..8e1fb5360cf6 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,8 +5,8 @@ DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142
 DIST SQLAlchemy-1.3.3.tar.gz 5864870 BLAKE2B d109e0daf0afdeaba946c4b18d14428c108ff15041876c9a35cf8e5783f9b9a1896e69760b249c53af35e4575e66f4b59c855b4a244d7f6569fadfb52c5a400d SHA512 f8e0f580ba5cc7eaed985e5a3af8cdcc2dddddcd64bdf02b247242eeab542b5666a93d46166b5edb4b28af3b89df44bccfa92d5bf94cc0e173dbcd369ae6487c
 DIST SQLAlchemy-1.3.4.tar.gz 5877278 BLAKE2B 1200da89ce6ad077cc93c58a4e41f856a2222618b3570badf3bd8543d70659e0313e4add0ef779e98654dbd60f8445ae6839830ac15e72d9c0fa259eac328251 SHA512 6f29aeeceafcd996bbfc781b79dcbe0bbc681f1214cdab2d52b140bbae8492a633defa97dcc720db7a6d423b062834b0805e965e6183f88f99648a8f8f8a73dd
 EBUILD sqlalchemy-0.7.10.ebuild 1594 BLAKE2B a17f6b8adedf40005bfdc2f3e39601083cd16e29d84c9f73332427e51d9ba38516b3f2952b66ec6dc8ea7ef59cec8569860400b04ad6217b15ecdb5878714443 SHA512 c723bcf5317afbf83fea22e43d96ceebeb25fac6d8d93642e63f2890743441fe55901e739db15b7f8457e1d9688e72ac04823ff64f3539b9768bf7c13c2b7324
-EBUILD sqlalchemy-1.2.18.ebuild 1801 BLAKE2B 801345828c76e6352b384b8795c269f7a9c43465c115774c424bf22238493badb1917d458394accb8a3fb68130b472c0e8c5a5dc9ae18d4b3d803ed9fcf9309e SHA512 975662153ec6bbb3dd6ad0aa56e0cda5cd6a364211d884785f78a0f1cbd784c1e820ccec177239dca1f5ae2399b3551daf10881b61a574a15ff2dd8387c44a50
+EBUILD sqlalchemy-1.2.18.ebuild 1802 BLAKE2B 789909dc2066de95c5baed9a4005f891519ea9261ede10ba04f1eb0bc71c329376ca5b40535b2125b00d0bbb58965de49239853ff11015e73f62babb8ac81223 SHA512 b2510a9e392c2fb08f0788e4282efdbf59ea1007e80455116c08633983aaad978fe9bdfa17cde28d2603407c55be7a64107ce076372da6a8a5cc86b7c50b5a46
 EBUILD sqlalchemy-1.3.11.ebuild 1530 BLAKE2B ab1d2b2f0288d1da6a71ae6038fca40dba1242093a298fc175d186e0dd45d3eb2763e0ee607d7eaf694511c07e6a302cf903b0007604c9a21caad679da9f438c SHA512 03c98c853d19f2c37126622ba48e210cbb6989caffeb4d816f63b15bdfa9edb0a90c5bb1140cbaa00429c8c4ce8567504fe2a969d0182855b97ff2ef55d200d6
-EBUILD sqlalchemy-1.3.3.ebuild 1633 BLAKE2B 907547c38f8c5c7d55c04fee98185913811764c727d8c472e666169c2e72cc993479d37674e66795937b0acfad3e87139651575dd1c0d5b8ef515880832a361e SHA512 2e49161b123f13af7a7dbd892556d3dd5bea9667cdf4c027cf1a975c32becfc75f4c1e14baf589313e648906b5ec83b980ed584bcad0a894c90d84f84513b29a
+EBUILD sqlalchemy-1.3.3.ebuild 1634 BLAKE2B 5cf87b184c1c9cba2149a14e7f711fe22f8b1de5bebd1f0571d2f2d48ff0a0a9ee13057e5615f6f163a8b918c6089791047fb4ead0e7a04f26852861ef406b6b SHA512 6c3d1286491aa54e80f1eede55119ca7683c5ac3020d35ad4ec126361b4b3b156787a5e63f0a6dc722c1b2f416f71d49ca4bd4d55b8fd10f1a2c140b68bd0d3f
 EBUILD sqlalchemy-1.3.4.ebuild 1646 BLAKE2B b37d8915694008971306941eb64c51423dc45493c2e9a6b66aef5036b5c25d011a3d04736c8abbde22c4654aabd3c6156ff51b32c4c010cb2c9182c65d304e96 SHA512 88623532cd2609a83fca57a0f583be9c1e3e3a4a721834f7bd14f2f2174942d75f4e32d40fd128594565bde44b45ab760ed5a5b97d5b3a50ccc9f9a9391036ec
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
index d8c4aad2c978..7673c028bc66 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
index b1b1115fffe3..ed1d71da6fbc 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc examples +sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index b2d956bb6444..80d5984625bf 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4.ebuild 1197 BLAKE2B 3a1e341c8417a1b5b597114529a83170d974e7c41733edacc59b26119852cefebdfd752f19d6eeebea5949fdc51b6dc2e5da34662c2d2a187e8511b4a5b88c2e SHA512 9c21d09a8352ae249812850b0bf211a3cede9a893b748de702f769c5471d5b7c70ccd089e5980b317107ef7a2f6df6c1bad7bffbac808828923d3daa0c495d99
+EBUILD ssl-fetch-0.4.ebuild 1198 BLAKE2B e47c4687232f3345c45307e0860bef8172f57e6b77eb579a3711e0ad03960bd2bea6a240a986e4d5f017ff6c5c72e873d949918cdbbca83e4215459e5687350b SHA512 48654b3de25504b5fb7686fa4dc709dfc9b090986af69f0d510566751406943137d65bbd2674ee8eb90f1c1ec5aafaf78f576c326b001ddca1c77db534952648
 EBUILD ssl-fetch-9999.ebuild 1078 BLAKE2B 98ec73d1f51af732bc1c3584085916d2cc87f9d555620664a9d2f33f90b8d2c6e093d38a4a6df4ed0d02c4d8529e6452adb1fd6fa100ee6604d9a583d6bebd0c SHA512 35ca6befc9754abb12e3e5beaf152a95cb35bf20c7cc257ca59cb2e94f43813c2e051e9529ff210a67c8f33fce29b166a4f68603fdccfb14db4f4855311a35db
 MISC metadata.xml 473 BLAKE2B 5b8b4e2ce1dd31802946dbe506e7423f0b134d1a1cad24c33b7f005c20a8adeb4a89319c3b47f4637c150ab96ab4b4f44eb7d049faa0cf5a79f8b45e11b1b269 SHA512 832ff018c61d870c30ea89ccf300b4ede17e5a2b03b079a14d1b53a2ee95224e48e9f0091e07f8a79703190fceb77646458c3d760c53de08d29339143724c447
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index f2da56545e00..4711b10e72b9 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index a2aecf8d289b..688462628e28 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0.ebuild 1065 BLAKE2B f76f941a1dd0e20e8d72c3b934a0cf23b189c529b758a8783fe6321372bff6b694ca96387d8d37079e1da1e64c9894878f9323cbcc469affa88bf34217bc071a SHA512 0409fcafee325bd6ed51b87675e1912c366750a8e885cab6af5a81a19e0f06ef391e31367301774c79b7226e27223708546758f1b14a25ba11a6fa84282b39ee
+EBUILD stestr-2.1.0.ebuild 1072 BLAKE2B 8b5890beba667a3cffb1e1d07b5f36c8f23d08459bcff761073eca09802291022c54d663cfea7eabbc79c2a00d21b872abf700dab687eb2a9ec05823309dc731 SHA512 43b61b78f1bc3ab45afdd8ce5026fc86cce10caa67df7b3602c05c14f582ec78a0a4e8fef7e0b2da137516d5e340d4b137402e044b42cf0169e59829a63557a3
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0.ebuild b/dev-python/stestr/stestr-2.1.0.ebuild
index 18acb832372e..2a44ac818bcb 100644
--- a/dev-python/stestr/stestr-2.1.0.ebuild
+++ b/dev-python/stestr/stestr-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="amd64 arm64 hppa ~mips s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 hppa ~mips ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 6d4bac368522..0405cfc4d8ed 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,7 +1,9 @@
 DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
 DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
 DIST stevedore-1.30.1.tar.gz 507795 BLAKE2B 92af8ac52dd28d765df32bd127d76aed0d0d66e2a4edc772aecb35ae78b52e9091203991a457be732d62a2987cc378d0c62cdd94898ad7e41f33b320401d4fa9 SHA512 3316ba9c73dc5499588a65fb0abc85ffc8eeea14dc94fbaced6379246098f03201d8a13dc64510a0840cb3d266ac83ffbb957738a61ee2a36440611833bab4ef
+DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
 EBUILD stevedore-1.25.1.ebuild 1654 BLAKE2B eed0a9a0bc3060cddca16036565295e396cdd66fa809419702ee2266dee3a59790f697b1c169f969f821604c4a5dfefc5e1b2cb0f2df4246511ab88e63a8d58a SHA512 615c0a461af5e7df37d4311613255f408fa74e86c9aae5788049ecd761f6e21bcccb939c4125f13e26b585d758d8c2fb2f68fe58a1d47bb41603c57df53b4d9a
 EBUILD stevedore-1.28.0.ebuild 1658 BLAKE2B 80e6db12c462571344c4535e49b4c0a5d735cd883ce5208c986ad54bd8962ea2e3ca5c7a6cf589ccb7e081c13ebb6f437d1c7216dba033cf4a07feae133aed35 SHA512 19ba33f588e410ef03cb6e280e17b2b99b6a2fdb2e1c2880d98a9e2ea553df0d94f9cae8374989606d0636d6595dd6d332a526eeba2ab954f84bb32577031336
-EBUILD stevedore-1.30.1.ebuild 1741 BLAKE2B 4d24e7122a34c472ba928bcf3b8e5383f27e07ee7afe3c067435370186880bc02c36d0093118c3b5dfac2c46a96749db66c5c1bac2a6b15fa0f7948b1979fef8 SHA512 cffd593849c7a12df7c2d17e836dc891293262ecee069565cfeda3b92ae13b4e369fd1a1089ab498c69e9385a0750c8931bb9bf944f35889005bd947fe9edd06
+EBUILD stevedore-1.30.1.ebuild 1748 BLAKE2B db6730d19729634938ca5877bca6f3a5f67a92d699d232c6d55075686f7f94f2289932e8664710b2087504cd9dd01d4115b3b0d2babfea21bcd923400ff88fc3 SHA512 45e1a8c3baefe89acb925c724eea7fb322a0b5396a56ef999a6397da81fdc03ad53e964b407554287c38fecccea34cfd97a17bd77550f2f994c20982b6f739e6
+EBUILD stevedore-1.31.0.ebuild 1208 BLAKE2B eb1c283e0625a5c221659aefded60f6ab305df6c3346412dcb36f93436f96357b980fbe469a668492b26c2bc1d7917f648bc295c685950007ad3a2c2b4ff333b SHA512 7df35ddbe9dd25b23020f6ef6c8fd65dd468d58712fd6c475e4077e2a0ee03cfd019b1e211d1cd461515cf654c9f6434c7c65e8ca161bca581a0c79e5d26222a
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.30.1.ebuild b/dev-python/stevedore/stevedore-1.30.1.ebuild
index 2eec276bd2bb..a507bacdf854 100644
--- a/dev-python/stevedore/stevedore-1.30.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.30.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/stevedore-1.31.0.ebuild b/dev-python/stevedore/stevedore-1.31.0.ebuild
new file mode 100644
index 000000000000..c78b9d2fcc83
--- /dev/null
+++ b/dev-python/stevedore/stevedore-1.31.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+# entry_points is added via setup.cfg as just [entry_points]
+_DISTUTILS_SETUPTOOLS_WARNED=1
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 3607c39ede17..86112f90038d 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,7 +1,7 @@
 DIST strict-rfc3339-0.6.tar.gz 16856 BLAKE2B 635da447439282ec64dc7c27a2602d35b28f0a02fb36c16b622b38e73f907e9a39b709c5d87319269ef1357d5716a1d92de7f205f66b2aa77339d63aabdb21df SHA512 7f1e15d60c2295c00647af84b31a1836b6c3994fadbb2695f5709861caae543ae69a3199dffd6dcf7e0768eadf39e496a5e600e291dd0befbe8fc35fa60897af
 DIST strict-rfc3339-0.7.tar.gz 17552 BLAKE2B 74370e28134ee22545c536d9eab383c0de6bba66d1440a77d020c7dc754699c32072300f380bf044e5283ca663beb370a587ea9d111dbdeb46985f76b5c9dfda SHA512 94a2992a9ea41b75527348f0f8dae1d118d57b0764122f874baa85f5e3b523beb219ed83c2d7224725e504cd3737a6bde485957135856dcde470f32675e44e77
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.6.ebuild 624 BLAKE2B 2f13df732cf1881b18fbf2c0c71840aca5c1229a4079eb2607a210c551fcbdc491bb2c6086be9ecc88cacac8e899f8ef6bde61c76553a908089c7388d9d43d98 SHA512 713d55551ba05481716304081b9d40ceaef8f745ee480edb886d0fe901745fdca8a8f7fab97fd0d0bd88abb261520ad61f6483ec2d82170509e5dbaf9bfc1aff
-EBUILD strict-rfc3339-0.7-r1.ebuild 705 BLAKE2B eb94516c1521cac2697408193c729a60d5b792d86f3aeb55deb94ac38b263034cd96500d5d28cd6168fea3a3c071d4f5c7014627afb6e852da826b81c266c17b SHA512 f819bb2eac24a02ecb1fd00fd280bdf6f8ec07352d895dc36b0a84bb4be0d6c779f6e820d55ccd373ac6e126f71eb28a8e08e19f009b075e006e6651532443cb
+EBUILD strict-rfc3339-0.6.ebuild 625 BLAKE2B 6dbc3cc54bf31d6630c5b9da7f5b863c97615ee43c67d9cf8f8769ce8fdfda3c6aed15a80369f74764b11672a133a87a83d5e837855570bac5e9605989f48318 SHA512 9118877bc3bb530b81956e18b9f7860a32c47dd05be9c558fb5f99ac727872552d1d52e261c413d80b4cdff21c82271592a780a47a3891e1449c6ab111db5788
+EBUILD strict-rfc3339-0.7-r1.ebuild 706 BLAKE2B 51e427dd009adbbbb2ba0709a2286e476bb870e1480f6b64a1aa5e82268ba70cc35e0bf2d33e28acfbec0adca206f2472e9f516e25d4e44db64c71ebe2c0296b SHA512 277da9d2c5a5e3bd6ad9e062be9824b5be9f1105753b2ce7c624515f334d6a5c1e0435ea2cc54fb8957fa455819caf27f95e3afe03eeabea7ac4370e7fcdb76c
 EBUILD strict-rfc3339-0.7.ebuild 638 BLAKE2B 24a2c21114ef1d1fb5a74d8845f478a9c37b4dba8b6c0fc7503af94ef56469c222a42d56eeed01f4ceb9b119a1a089dae4e672da27818ef153478690f4451882 SHA512 614ff7752a7167d4ae88eb6ea3767595277a98298b95bfc1ce41e1679714c92bc040e185f73a5b8a3c617119e23c8a51296b7edf9df069abc601c3dcfaeabefd
 MISC metadata.xml 385 BLAKE2B 3b51a7f471d2ff03a26cf4c129dd6ef190101b5312d21b303226a7c2c65b06d4910959581c413675030804904029931004edb3a005c47a0bc6caf11761f9928e SHA512 c825fc57c6aad0acc8775432fe511055f26a7bb453628340e56c1615b777cac4ae43dafe6d648a7ded7dd4138ebccc3e5620ec9c5f947f2f491d544d2c69ccaa
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 769ee8fafd0d..f376f4650ecc 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3+"
-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=""
 
 # Not shipped
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 36185cb5b75f..930b689e0aa7 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
 
 SLOT="0"
 LICENSE="GPL-3+"
-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"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index ffd5fb80c141..e24448f78350 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
 DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
-EBUILD subunit-1.2.0-r1.ebuild 2652 BLAKE2B 069747d0d2ece8094cbed5a32edff52c0e318d5d50b89d29193bbf331b4b81857fde4d6621a460280320f3bd89192bbf8e7c5890ff12e79d67f99cb2f02ca192 SHA512 0c64c7b641e45c211ce999c520f6665f63f420b2a721a9e7d85e3e528e7f6b9855bd1ee69c06c959111460258c0c8d32659de7fa9ebadbeb9ed513f505228a6e
+EBUILD subunit-1.2.0-r1.ebuild 2653 BLAKE2B 746b235a6fe76e90442a4c8ba274735a64d299984447a96f7dbd5e9534d0bdeb30481b872a507d3757d314e3a96c3be503787fb4abac684c7e023a8621b34a9b SHA512 baac084fca21a63cf2124ede36aa480e40d1903bbe9830b7b7a29eb469a88001dcd0af629aaec1b4ad98b427650fd0f372bd7cf4f28bb0cee2bd59aeb98fab84
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index 2800670d1bd9..7f655fcd911c 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+d
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index db15ba2c3067..b127d096e0f2 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -7,6 +7,7 @@ DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35
 DIST sympy-1.5.tar.gz 6294079 BLAKE2B ee6764264d87454c9713a6e99b70b123e1cc2d36a691287a53e8b69a548df5503168989afa2ca85a08cd5f6792c952e5556352fde07332b1fe47b3746d02b47a SHA512 882ed99cbc7333cbed85d247d04a764a92855e3d26cee96163d18ece566115b9d38999bbe022225521834037dbdfc4c567548112dfddd5ece65af8f672a06091
 EBUILD sympy-1.0-r1.ebuild 1835 BLAKE2B 1368333592aea1b621105ee4a1dcfad793308494e16b928b3aa617aa2c4fd4981bad8e9d496ad5014d5bd75d3a37ea00d3a4614ad9b3c4b4ba005ec67762a6b2 SHA512 7af2c4c82a66f114a6ef1f27825ac15dc81ffa612c3a78a65b4964d8d54cb7e0eaa1633d6082917c4460fab26ba9b0a5d26e6098a83b933db029dec2bb313958
 EBUILD sympy-1.3.ebuild 2001 BLAKE2B 5b093b8dd2b9f3444d5989f9040f5671aff393e19fd18d56d7586b1e99d2846214b62d38060b89f17ba722fe2a3c0d8d03046e647d531a6632741466c84b100f SHA512 0972b1b9437c7b6190b30af365861b19542b03e5284a1d3e895c2b3ede892da1c7d1080bf958a92b1d862e9f43c5a6b231514e809351129a0e3a597349dc31ba
+EBUILD sympy-1.5.1-r1.ebuild 1927 BLAKE2B 6b7570d8482286a45a321224d68d0a3ed12d229de218d8e58240853d8fac03129dff542f01b38aaf67d16d6955d206de2106b0410897c7c214c17edfaa34a464 SHA512 56f208b24635b6c1f09b91ddcde012acf3fc1221cb7576d6129c42364d85c5a6f4765a8c04515d31681eeeee7f0199a01ac1924f86752c877811763b130a7384
 EBUILD sympy-1.5.1.ebuild 1971 BLAKE2B 4cba72321b539e4e91638814d2ec2d9b18f3efa48848766798e762833ba6c45a1b2e4b637136b2538de08bb5943176c540971dfc4827c9a8f67854e41e0b935f SHA512 de4ec2eea57e752adc60ac279c42589e76eca783b52d973812519c219a0f258fb25e0107f6dd647a49e0bcb86b5a194156e2cfeae911ac1e623ff5b15c6f8df4
 EBUILD sympy-1.5.ebuild 1959 BLAKE2B 23ee8b172fda1e860bceb596e71a4c1d190f18a3ace80a3a04964cb00e66ecefcb204e5f24333dd3704fe3bd46d4ae912eb6ea7dd3a10ab7ae1172a6c77cbd8f SHA512 8c548b1868a3e5bae7b63c279b53eb7082f7c065a34b229362e85ef7e28de393164b653d58e491efd008a767f81da76ce2ba0b00b7855b23c5226a55ace4a22f
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.5.1-r1.ebuild b/dev-python/sympy/sympy-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..8952e3ac040b
--- /dev/null
+++ b/dev-python/sympy/sympy-1.5.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Computer Algebra System in pure Python"
+HOMEPAGE="https://sympy.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	ipython? ( || ( $(python_gen_useflags -3) ) )"
+
+RESTRICT="test"
+# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
+# It is a non-trivial work to wipe out all such tests :-(
+
+RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl )
+	)
+	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
+	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
+	texmacs? ( app-office/texmacs )
+	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+python_test() {
+	virtx "${PYTHON}" setup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index 2314466d4739..58e1e97306bb 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,6 +1,6 @@
 AUX tempita-0.5.3-pypy-tests.patch 933 BLAKE2B 9b49ab761c894a54f883645bbae9eba938d412aba65392fd78feffee1feadefe6f34f63f4aa7d61c5437d6697aae0dcd89434789d84055b6c089721ddb559cee SHA512 bad83c3e05d3aa8d151403ca71c527663b2268c3fee517ab5778a169b497ab491666bbb9be627369f41ba8444b6e98511953ece2744582d1abffd1ef206de312
 DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
 DIST tempita-0.5.3.tar.gz 12707 BLAKE2B 921087bf09454506db8cab7b37c780bba5298b206113e246b710367b92364f03055afda6b826ca3008e34e4ea8821c6aabf045a735ac0887db1ba8a82e048ddb SHA512 43bafd42ab0c07bec636d637bfcd42053559d188e13bccc66527dc5f735fd9c3ec30fcf29f3e650d88315fe8f2eb2c5af280f51d2c64db099e08d8a70969a1c4
-EBUILD tempita-0.5.3-r1.ebuild 597 BLAKE2B 933e7665b703d7d579f5ff1d8c5567591b2ba14332a3e820e727140dce9992d88051cacc7e12ea1a9db59df6b4ffb341c9431e9982aa339c728c86fbd0b0c9d4 SHA512 129f3f338cc9e9a60ad2c466e26b4115a47436d344c208f6ea50db9a484badbe0bbb564702f2469db2a66af1f41ba30626349fa6570ca2bd38f665a85084e9ae
+EBUILD tempita-0.5.3-r1.ebuild 598 BLAKE2B 66ffadc32be3504aab4009a3f68b6ea36e31556a0c6931c3a92fe131d7760edc621c8f2af8b92b045f9c46fea2543c55036f9bc682b3932a9ef8bc4f57aecd98 SHA512 e9f3c4ba1d9f48a500544e58b1b199e259f9930663fde2a3174421b9753d065204e06f8c9a3ca2615d7933c36253afdbd00aee41f7d3074676e902fcb5b72da3
 EBUILD tempita-0.5.3-r2.ebuild 1406 BLAKE2B f64ed5bb21271b0e5e9489ec772b22637ea525db752084c97a66d843ef0b1439b167a45d9ab2e0dda1140ee1922296a77137e7434f447356ba8802f49f9110f9 SHA512 1bf4f89638bd42015d94045aa3fbd2b4028b86db031021ae18cda301a97f9f4a433f572355b2f6b24f8d58801f4e59dec67489ce3605b590bb749f6db3ec6c94
 MISC metadata.xml 320 BLAKE2B d26cd9d2555b7d1a56ad44c86fb280a249a4f2d45c3f320cbb9a98de249e826701d49b814c209e6270d183084b8955e177fdac69af0136a7432cc5370b70fb3a SHA512 44f0ea2e06ab198180db9be4533b29c56e7cd0f3af9f522188e063cf787ad1eb1eff9fe2e09debe97be85769a09375385c1f838a7eedc2bc92835e846320f109
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index 5af06fa4b57c..cebb98835ae0 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index d17cc66b635c..cffc9720b4cb 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,4 +1,4 @@
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
-EBUILD terminaltables-3.1.0.ebuild 763 BLAKE2B 442c7a6ff10f07427b5d4f64199e15798759b5a62c56a86c9068f15d02edab934fb84b17062eb74f537f3b07234e65cb334aa11a1dcc6e186ee1caa3ecf46b0d SHA512 7fe2f8803d3b2113f464d2bdcd7c95a3945479b151980e44595a525adc24c155a0970d41b547d6d36014a05a7df8224ceb062b6dfb015b8265149132b800d16c
-EBUILD terminaltables-9999.ebuild 743 BLAKE2B f5703b10e49514fdaf0949e3c82efde21e57d618a1bc5822a5548d74961ebc57db085f6ec72e2550bdeb7983b6960ffffed62d6e782a7af206e35cdbc74f8d88 SHA512 2ef0bdb5149449e1ae0afc9a3ccdd050be08ae1f34ca42d7c04ca9dd4c657064899032d672b1383db6e6091617b2fc28358c4dbb6e2a12c55e4d06f1e3150304
+EBUILD terminaltables-3.1.0.ebuild 759 BLAKE2B 224752d1cfc6a641d85abc7e9d65ebf89ff53976457fc696afa6c5af5f03778c88e87e6979ab1c80c6415a844ef4a47a53dd8743f29e99e114e0c1e58b65384b SHA512 ff0898cd7fe1e23633710a2096b8f856b7ab64c6b57706908cda429a13644fec39a708a5e94914893a8f642ff753c31040e71e45860568663c5484fbbd5efc57
+EBUILD terminaltables-9999.ebuild 739 BLAKE2B 552ed33e08ce9215f2df043d2e7cf906479a7b1f76544ad1bc02730b44b214a39d1b3c5a9e4a5f6f492e265d08c6dfeabdf3d8397d6b59082950afaae539fce5 SHA512 cf5565a99841f661b1b0abe622e26c4c4817c9997f570f6d10613908f103e98bf3f04840315610f313e917c7e5620eb24a70e7b9a12f49afe40471f9d1b86d2f
 MISC metadata.xml 413 BLAKE2B 7aef163d29b857e19732c69ff0a5745d511ba8619a9f44f6ab0ecaf5b046a439b109789855cc1ee13ac99b1b3dbff6ba5432ad4bb8d9644cb4aba43aa9a8abe8 SHA512 44b71c2921a4db4517cd9c2d64021f39988a0767dab2020b2c4b6354da7eeb79d783bcbe197109cffd0fed3bc01ca6a1a1d5a4d8793176792e4ef749e59fe975
diff --git a/dev-python/terminaltables/terminaltables-3.1.0.ebuild b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
index 850b353f1d1d..384bf33858ef 100644
--- a/dev-python/terminaltables/terminaltables-3.1.0.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index 260b99550c11..a855b1d99da0 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/test_server/Manifest b/dev-python/test_server/Manifest
index 1981375fd554..e52218739fe7 100644
--- a/dev-python/test_server/Manifest
+++ b/dev-python/test_server/Manifest
@@ -1,3 +1,3 @@
 DIST test_server-0.0.31.tar.gz 18578 BLAKE2B a08c23a7db43f1c99a0cd270852d9ea841e0c0e9888d1d4a95b8879b436f8c016d1d10222127fc8024fe3560340fd65dc629677106a18c7bc01a565c85a6702e SHA512 f245165f6326e63fae6e51ae247cedade41a391c505d9899c00b886df192326aac32f2a479d322de079f77b252cf199746a7ea3e06089cab105646d194d4d775
-EBUILD test_server-0.0.31.ebuild 885 BLAKE2B aadeeb6dbb28edbecfeb6dae4959f88e502fa429e2681802f47abd95075b00b5bcd8702dd125c36ef99ba3ae3468d8ba570595f64f8df83ce1e332b6138c010e SHA512 f68f5604a11ee317d923a98caed087dbd1ac2ce4cb8ace377655750e2fc77719341639ac4225b884983e35fdbf81c4961400ad7d735d8ac145be0f6b92fbe91a
+EBUILD test_server-0.0.31.ebuild 843 BLAKE2B 14c0b86bb944be6c928c38803be047a7ba7dcf7de2187628990aa4af2026422ca1afa856b57e19a74fe3bb4978ebdf0b67421f0fda62ca7ce2edb651a5d98de3 SHA512 0f2b36177225b3979245d1836a674092b9d2fdebeda1462aa9e7ec748b813a78a3a2d1ff937826f5e3bafd4cdcacb48fa9a442e9ad82a0bdbb711feca2b379d0
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/test_server/test_server-0.0.31.ebuild b/dev-python/test_server/test_server-0.0.31.ebuild
index 722c8ee0daa0..aef01051c6d9 100644
--- a/dev-python/test_server/test_server-0.0.31.ebuild
+++ b/dev-python/test_server/test_server-0.0.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Server to test HTTP clients"
@@ -19,7 +19,6 @@ RDEPEND="
 	>=dev-python/bottle-0.12.13[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/webtest[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index e2ccbb5e356c..8b7714f7e02e 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,5 @@
 DIST testfixtures-4.9.1.tar.gz 90117 BLAKE2B 6560d4072f8b0108b7d7708c980f40df1a05af88df86dd01926bdf0eab107744fc89d75bdedaced7300c24a52a9d1c0685f5dd3f5f732121ff97af6d0859055a SHA512 20053d22297b7852382a4f2bf6d76bde6489f788a9073aaae407f68bb6b3d7bdc4a045868cf7c99fd294936768745ee7d652c86a4a96c33fb0e95fa0d96d2a59
 DIST testfixtures-6.8.2.tar.gz 110838 BLAKE2B 4b83a1459aec4bc4b4dcdff48603958bfd115806ce0c567faad37ac273e93096cf964af08d24b98c1743d6302d1b2f6f9c9498023c781ab3e9170e2eda74cefe SHA512 ce6561d976a0b8f79ae72aaca6f5ffa8d1cae30ad73d3d88625ed4fe55da5f0a913785fa3e9aeb4268dfb243a7b74dddc262554521a71c766089383aa5b0e022
-EBUILD testfixtures-4.9.1.ebuild 1618 BLAKE2B bb0abdde4b93582e8d451177388109df5d44cf1180d831e716bb134d396d5b2b1d4e834ea99e596c379eee1c8f4a4a4dd70f6a356210577ada4809e62af287eb SHA512 e4d8cfc18acf0c1db482e95d9d6f14cfe19842ad0ec660754eae740426ef1b58f770b897f8d6da31d6a980b1be0eb02f5773ab5308cf779cb211f9444bc70bc0
-EBUILD testfixtures-6.8.2.ebuild 1620 BLAKE2B d53326fbc9548f146e3b1030a64fff0edd3c988c0154a1fcb9fcb92e18f5b7d413fb4a6550c9a9e1df6a04a10c32c6ff4d5df9871b99a6b744fe471ed4fa83e3 SHA512 c7322df37a08046af02e31968798a4c0890d72e6d1b77aa0629853b09db565960775ca3af1596183c7fbd76706fc78892be87d72e7e5f3d85be30ff5baf04278
+EBUILD testfixtures-4.9.1.ebuild 1457 BLAKE2B 58500f713407ddb1ab8942f4212060c985ba4478d905d77a249bc0efbd05f93f495d4b76f9da858a228a68bdc54f33727a312ae3201ef95ae03b376877ca61b0 SHA512 aca837ea2ed905e93dd3c9c4908e88b8ec1f8f1bfaa4b00c96f0969722bf93b7c154c227c2471fd2805d12d10a0a185e9b3e9786c1e9a769431f768fbf06b451
+EBUILD testfixtures-6.8.2.ebuild 1459 BLAKE2B 07c8898012785c256515f01a77ce1c291dde783b735042f0413fceee6f6260aaf75987df2c25f728999bf8dacc8896e1b54ebe779f7c0c30f90f24033dcf9c29 SHA512 335ec1c72774c31f3f07bdff4927a716e63d97b76574067d38a5477c53edcc7c985972f42e755cf81e9591e7d62ee6c1cdcd3e53c737aaab3495e53d886126f0
 MISC metadata.xml 390 BLAKE2B 7211b89e4130b65db09254857e522420bae09bce05ff1065c6fa53802cddabe3536c8631e2ae79ab63d63f4d2550113e49a5d0834d7ed782524678a38b5c1144 SHA512 b5acb87f7a097840d861cf348e917f652b81712f9c4b408bd4a3b0f5a7b051bd1731735b2b3f63aa56144a032e6ea54fe3691c5858cb678666b6c4d701088776
diff --git a/dev-python/testfixtures/testfixtures-4.9.1.ebuild b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
index 7c2dbd6ada6a..60bd10d75f5f 100644
--- a/dev-python/testfixtures/testfixtures-4.9.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -21,14 +21,12 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
 	)
 	test? (
 		dev-python/manuel[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/nose-cover3[${PYTHON_USEDEP}]
 		dev-python/nose_fixes[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 	)"
 
 python_prepare_all() {
diff --git a/dev-python/testfixtures/testfixtures-6.8.2.ebuild b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
index a3b4728a12a9..a827aad44dd2 100644
--- a/dev-python/testfixtures/testfixtures-6.8.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -21,11 +21,9 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7 pypy )
 	)
 	test? (
 		dev-python/django[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-django[${PYTHON_USEDEP}]
 		dev-python/sybil[${PYTHON_USEDEP}]
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index 3abcbe2156b6..68901e924a2a 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -4,6 +4,6 @@ AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d713043
 AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958d0e7e30b6ded6f463877ea1315087cdcc3feee234885b2dc5282e6c9e8e09f6f9a552e94efa48bd101b6532caa6148927d533a4a48c8 SHA512 a5c41912d9dd73b288504b25ee1ae6faabbbe75d6992485a69c61d63b762c900567ea2bdd7ca9a11904aaa7bd41f8983d50a5fede05b4d94096a0681a486d200
 DIST testrepository-0.0.18.tar.gz 84886 BLAKE2B b6c0161c55271722644eddd5d620ea67b67774e92d2de0117f645fc1016c9de209de6a9557862a27e08850a3ade5a2406ea5eaa410a2ce4d44fc26c8121ddecf SHA512 4e90db6364f77f464ae063020b016367529588f581af001c2564bf4babb264fc37bb7231413725211c6d483a269360d86201f81d2b24d7eb162dca2463d13c92
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
-EBUILD testrepository-0.0.18-r1.ebuild 1277 BLAKE2B 69b8f0db46a5436233a45cefe79c47aecde25d80bd573f3800e93203942694fee16452ef19a4d518c461b4826cc557780edfbaf738fd66065a7aaee8e8f17871 SHA512 9b7e2bb931c8523fbe9965c5eda2237c884baa9c9d087db85a5fa5c497e60113d42730f2f2d0b30168ec74751b7ee14c71001bfd13a51dfc6730a03eacb2f9b2
-EBUILD testrepository-0.0.20.ebuild 1315 BLAKE2B d6d040f20bc49e1eff798dcbe85bdaba2fd1db508a33929b2ea81676fe33ddfd756d9b26637ef9f96fc928d7b77dfde32aec8e250a810eb9844fc17b2efb0391 SHA512 1d1e084772a5fece73a797918b1112e1bb14984ed18a9abea95774b5596a86355a74f7e29d6b31b60ea149f2790a10c48516217bd69b55630925ce95dd17c7a3
+EBUILD testrepository-0.0.18-r1.ebuild 1278 BLAKE2B a66aac487608ac8d03f066531cc641ed6686a2c8db69424ac5688baefc85848c9a1cb6fd801db804f62a4f26c4f5738711224411987a575ff13892a9477af7ec SHA512 bfbbb03f693b2250b96df55b6b6a01143ef762156f91614817d7c8b392354010dcbd1454771710eadb12faac7071425e78c0e7d8158834b3b92a37adf674e928
+EBUILD testrepository-0.0.20.ebuild 1316 BLAKE2B 130591edb00b6d16664e2f725b6923215725069bf4c35c721fa1f239287bb6209ade2330e1f65ef8bc0df40367332491f81741a658bfcb50c81df38e3544aa06 SHA512 57f880c49ab5633efb559bd9ca31186c2ca575d9b3fe424c6275a6a77b5885eba56ec0254d11a32d973d48cb16f8b8c99c64764af3b1b2680bf36b49fa7585bb
 MISC metadata.xml 575 BLAKE2B 7a1c9930c814a2bd60788a38d12909871d068def9c39041ac346466bb2d3940a3df3dc771fac6b2bad39e2a85b20f2b4fb8dc269af4e7853f02206eac9044e22 SHA512 36f0681e6b41a80ee0f3cdbac0520640c67a5612e73baae30b0b5917576d343db3327e03a40e20b23f23b0c76ca797d5ccd09d8dd339dfdb5af6029a4f4d79f9
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index 690d9023eb84..c9f86536063d 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index d62ecddc8497..68e35f0ad6ed 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 35b2b61b49ab..eecc8320a72a 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,7 +1,7 @@
 DIST testresources-0.2.7.tar.gz 32050 BLAKE2B 9ff16d2e33d7b528598d2f5b903e57625018ecbfd9484dab0d8a7d922429cc8d35dada91d84c897c426e06e01b7bd0befe23814996f4aa7b0651148edaa6f246 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7
 DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664db7569d3459548d4a9042ab8dffd0d715c16616ffe08ec86ad4a0b4940e0c09b83b57f7bea86b35b6f728e55384fe3 SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-0.2.7-r2.ebuild 967 BLAKE2B 168f1d808154a3f70d4be0e68d33f46bef508494a6f1c80a90d2fb9ffc964daa4751fc375fbf6228a0b95bb9a16810f8476bb0c968de03462caba5dee0831eda SHA512 6a31620168fb8b0171b7af71eb3c497e19b6f7d618b6edd7c43f783756295ef9e28f6772ae662bfa481534b0214d8761bb26031747207e92b5d98843a4c9d18a
+EBUILD testresources-0.2.7-r2.ebuild 968 BLAKE2B cbc2890fd712e251d3fb913f42107590b973706b9ae08392065a7dbfd42b622670afc6edd0e8d8a1b2ed164e0f3d3fe8c07d2a55fad4b660b9178cc390a76fe7 SHA512 1705f26524fa541769f32c1c1ad8473fa6c2de513ff36ec69a95df30f806bb3ad1d146a148b9dcd8c00b5e265da94a086a1d72c773978c7ba714c73d944dbc80
 EBUILD testresources-1.0.0.ebuild 973 BLAKE2B a893ec87b17bd25250ea227771d4a4242308665b857b084631b713e207abf9ba9353bb2d16397008a739241bfbfb569a02a5d6010903c11b98e029c5502af6ea SHA512 1ce7c14c841bcb11a8af276c68adb413acef2953d538e34470b1fb6b1993489da39adef032f38ba304082f55b300806c2e750dedf5b2137f391f0bdb1699c854
-EBUILD testresources-2.0.1.ebuild 968 BLAKE2B cc76a41360f0d1b188307571e3ef1249e7ae13318041d94505498e1691bb1f94ab45e2764ed944e6278ea6fad23a91e5027a41bd248b1eb3ef9caf69bc2cf571 SHA512 22b32f233617659f022f324426b1fcb8211d5e5bc162a824305350532f42fdefb652b5b5d7390981ffcdb9a0452cf596eda9df9b8d004e4e6f491614a9d60bcb
+EBUILD testresources-2.0.1.ebuild 969 BLAKE2B 43e3975d227a661e5155f384d5d5c2dbca74f20b73ca8d745eb5aebec1606981df5348af9c4d09a8e96d7e8d50888ef50ae3b422a124b7930866e98cf9035b29 SHA512 bba947045e5b092d98e195c4d9901a473398fa82140a49dcbcfee1c06ab65313b2fd81be771158188bb45c3e82c9d4d886b76b755a75f6997b41c00f53911d6b
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index f5fe0a5c9f1a..b5ec2ed6b813 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 11d03bd2bb10..bc591c7b20ae 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 1bcc7c2b040a..d0d88116e633 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0.ebuild 1021 BLAKE2B 6a3ccdf01135a00221c4da77580eb5c4551ff5b9f286b15e4a25beb80dd0952dab4b015e105e99d94d5c590e4faa76a3a0ebcbff9cbe4b85e46c76616f792d8a SHA512 ad82d9b4bc97f41b3d62641f7438eb1a9dc6a182a565dd39da0883b49639da1e3583d88e0c0d05e604c55df5346252a087d56a64a7a32266a9aed3c5f450deec
+EBUILD testscenarios-0.5.0.ebuild 1022 BLAKE2B 1dfc559e1b99979cbc8b503e1a983c84bb521e8d5287f9ed211a4d663d5491240d8722a859934d09fd8aa50abd86c8cb77994ecfb37d59fa1e6c5698a136d503 SHA512 09587da35ae526639f096c2d47466b7398efacb5436e040019f66e82cf68b97f37602272014176a5fe22c3f4168e957d9ba620fa0a2569fdd5c2d6ad3800f497
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 644fbd44ca69..ed6efe9c84cd 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 651fa61378b5..c6e417936b60 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.3.0-py37.patch 1740 BLAKE2B 10a1e774fcc436b1e4f33075f807ab70ec79a7d16338cac35f63dbeaf4ab4f95d5f67c69886918405edb7ef939b9cbae00176202705d08a9f1ea80f08c3c6af1 SHA512 e8a441464b8d6e2a75f95b26e83c2b2fefad262fa193bf088b65c1101fb34a9d53ee7a3554cf005519a44cc007f78df74d32163e5910f447318c2e89e67529d3
 DIST testtools-2.3.0.tar.gz 231559 BLAKE2B 6ae098e368cabc0bfe45736324819687a6086eccf868de7eec312caf7c64b5d75a3168f3966d5cd0b05ad9295957a7aa1ee3c1589f076de1f5cb619b197ba08a SHA512 558fe6a1bdce7215f9f6f178f469a2b76948dc7ff0ce27400482a16683474edb81d9bf90ae48b6fcb8df9eb70759341b694aa162ed3d9d4abd372981cdcd8a64
-EBUILD testtools-2.3.0.ebuild 1520 BLAKE2B 44b1d6fb117ba9d423a7ce122376d3133f7b167bba8d988bbb85e1ba4a48112df3fd6c9d1e5ea2e8f8ff88001ec112ffdad2663b8c86fd972970fbc0927901e3 SHA512 14d585714be8e55f643c0b3b1dc07372cc719973ca19b6678a0e3ad45c45d232b4512da87e9ec5a2522a694abfb467c8cec16d6ddb6ddc0813f2ade29265986e
+EBUILD testtools-2.3.0.ebuild 1521 BLAKE2B 4f45050b2208d6073202690860cbf248023cd79d82e6eb94387246ec1f2acd2cd5a5d163fdad60b3459f846f72f2713e7085350bb1137b7e83b174d5dbc8391c SHA512 c5024b349b2d38aad824764de2e1b021df6e37d374a570960a6e395234012930ee0c7968dad3bfff5ac4a5caf6e81b209c93ab5af71bd8b4e48f203ee25f7b60
 MISC metadata.xml 554 BLAKE2B 251f32aa81267f470d8f5d1f22bd2e2354fc39ec79ac326dd64333e73e5cc8ab35d6633e1ebce2bad5086d55f838fb129d7cbde2e1d36cf77945527e6e786157 SHA512 ebe5defc73dc62044732463b2d295c08ca24573c34b689150f3865247b34ef6d925437a0c97598c3260ec037c4ed3644017601fd2b7127521c7c352edc1e6384
diff --git a/dev-python/testtools/testtools-2.3.0.ebuild b/dev-python/testtools/testtools-2.3.0.ebuild
index 6c1e8b8d2e95..f47a45fa163e 100644
--- a/dev-python/testtools/testtools-2.3.0.ebuild
+++ b/dev-python/testtools/testtools-2.3.0.ebuild
@@ -14,7 +14,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="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index cf8f122eb833..733c3978b153 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,3 +1,3 @@
 DIST thrift-0.11.0.tar.gz 52467 BLAKE2B 72dca118476dc5d618f6434614e5d72c6f496088731de9b62fcf47e76dcf707a171721df2aa4c87fdcf90670b8fd11c3a1cdb2b090b78683a3f4a204ef8121cb SHA512 cba59eef2841fa008a19cd36b322491b67d711698205d6671c76e38a3de2b330db8aa54516de8cdd4020dc795e67ed55913df53466f5dbf07d38fed2d10f9349
-EBUILD thrift-0.11.0.ebuild 480 BLAKE2B 25f029bb88f731e03e8ba26cf35efdc837598d8494e1a5554e8f127f90efde58f18a9e7ad2ccbd726d6c860a000a57ed30a79a68c144593d663d4aa2a5649861 SHA512 8a9dc2df142b8826c68c287f53834b3e5096cdd3ac4a02328cd793b790d3d057c5bee4b8dc28297ae16958349879987f05858b10b1acd4e2bb83a11c4be8f115
+EBUILD thrift-0.11.0.ebuild 478 BLAKE2B b0b118ac230bea690adb9f90adbb7c381c57ceefb05d9216224bc2e8f3b16ed26c74630131a302699fb25431582b03938beb3c8aaef30f44c3255b5422b42ded SHA512 bdba8bfdc4c818d1978201d5e785e8bfe67de6133a20c8e009b8434d6b446241dd31b68fe9ec3730c9fcafc9b8b085ca831a78d48fd125476d320d7d1874021d
 MISC metadata.xml 327 BLAKE2B 68fffa25c9e88a87a56110743553819ef0591f40567594c2ec966e86228bd3a0b0ef0d84f9f002c427b90d1f139d51f1af9786a4451457a7edb43adbcba10ecd SHA512 5f1f04b5bf6a52319bf4810089b26ba4ea4e4ecb0fb44b70322cca98bac1ed2851535fa8d8e6eea38e45c0a411261c5ca966b13a68cd9f3f51c4f7ff003b7291
diff --git a/dev-python/thrift/thrift-0.11.0.ebuild b/dev-python/thrift/thrift-0.11.0.ebuild
index b2e382ac8ed6..d0470e479508 100644
--- a/dev-python/thrift/thrift-0.11.0.ebuild
+++ b/dev-python/thrift/thrift-0.11.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/tinyrpc/Manifest b/dev-python/tinyrpc/Manifest
index 795b1d322a24..071e06200019 100644
--- a/dev-python/tinyrpc/Manifest
+++ b/dev-python/tinyrpc/Manifest
@@ -1,5 +1,3 @@
-DIST tinyrpc-0.9.4.tar.gz 18432 BLAKE2B 47f9b6c550a24869e962b8fa26ecd4befd7df0b892d2929d2a8fdfbf819a856461c9bfde952bd61ee6a735566583827d45487066bf73afd3543092505767a437 SHA512 4f806d94675ecbc56f74d5dcdd418337fb32d70360c69854112c20776ce38bfb3da2be82d19db0e94247ff2639347628f429b25bb3461500b97160b8995c170b
 DIST tinyrpc-1.0.1.tar.gz 23299 BLAKE2B c1b5b9028f978594907db7d7e23b0d5b4a7fcfabb49e660a8fc5352462fd7995f841f08d96fa4845a1b82a0718cdcfd26e94901ceaecfd30bd11b917a0987fc7 SHA512 9a27e002959a54fae1ac8d89ac931cdd52b7ee96eb08c4c19f7eda4bc402834b53b0d9a3f0be857e5205df7e9597a1391e1376d6354a7d0b6085b81d8dc24b93
-EBUILD tinyrpc-0.9.4.ebuild 981 BLAKE2B 37be5c6f8400fe5dd8887ccc8b8c9f92b9cd0ed5faec8926ab468462f9f608d53696dc2ac9f4b3dd15b4ec017da91d8a19645602dbcc7881693dbfbf7d71f06a SHA512 b61ee0ff4ddf6b3f3d87616b024ab87b089422531faeda42104dcefe1c15730577ec3bc10c5f7a715107b672c976367196ffdf2a198743b299d8a370317ff0c2
 EBUILD tinyrpc-1.0.1.ebuild 971 BLAKE2B ab954ac421e1841d1edf384f4e6bb653f25ce2b90bd2bcf04b3067159ceb7489c9d143989a066ab6d956f7161773cea4b90dc2fd83d6ad752251697572632495 SHA512 7d818e8e6e34042d977d0a09597ef409cea406989c9e3a318e3de6677290694b374d5201765df55873a0534dc8a0ef9fb00877bd90ca6230d66e6c0298816be2
-MISC metadata.xml 890 BLAKE2B a4ae092a73f9e43688cd809fd9e3129eeb20b53bcc17b2b3f385f6c15a6a3c248bd333ee1b288f527b1f84a5c1ed5273195bc47dc5e99fd3c5fabf16b308ecea SHA512 2cc182370624a60856ec5518d5d9dcc8c895bb11b9af8b828f3687c5d1b11fdb7aebfd87b7bb33d141137e41c09683b756350fd3548312b5f5a2a07ce0f72e6b
+MISC metadata.xml 787 BLAKE2B c79df5b1bdc3d1f71fbe3045d51654900917a98a9aef7140228260c956c855c4f72eb64b1789ad980072dd14f7ad35ae3a629ca621e71773ed967881fb760af8 SHA512 a1dc12f55dfd1db498ffa0716ba7c77f2ea20db2eba89f11f042bdd018922f11b1e2949addcf6e85f18089bfb8ff6fc795fd2f5c9ea5a864584552e114ea9f59
diff --git a/dev-python/tinyrpc/metadata.xml b/dev-python/tinyrpc/metadata.xml
index cbb58c71f48e..ca3a7c6516b0 100644
--- a/dev-python/tinyrpc/metadata.xml
+++ b/dev-python/tinyrpc/metadata.xml
@@ -8,9 +8,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		A small and modular way of handling web-related RPC
-	</longdescription>
 	<upstream>
 		<remote-id type="github">mbr/tinyrpc</remote-id>
 		<remote-id type="pypi">tinyrpc</remote-id>
diff --git a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild b/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
deleted file mode 100644
index 262fba28cb81..000000000000
--- a/dev-python/tinyrpc/tinyrpc-0.9.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A protocol neutral RPC library that supports JSON-RPC and zmq."
-HOMEPAGE="https://github.com/mbr/tinyrpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gevent httpclient jsonext websocket wsgi zmq"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/six[${PYTHON_USEDEP}]
-	gevent? ( dev-python/gevent[${PYTHON_USEDEP}] )
-	httpclient? ( dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/websocket-client[${PYTHON_USEDEP}]
-		dev-python/gevent-websocket[${PYTHON_USEDEP}]
-	)
-	websocket? ( dev-python/gevent-websocket[${PYTHON_USEDEP}] )
-	wsgi? ( dev-python/werkzeug[${PYTHON_USEDEP}] )
-	zmq? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	jsonext? ( dev-python/jsonext[${PYTHON_USEDEP}] )"
-BDEPEND=""
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 57a7956c5bdf..cc9d65d602aa 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -2,6 +2,6 @@ AUX toml-0.10.0-depricationwarning.patch 586 BLAKE2B 6da04c9641095a4d0cd2b45ac09
 DIST toml-0.10.0-1.tar.gz 20396 BLAKE2B 3ddcb4cadfc68239cfcb34938a785b27326991ea89966aa6ba3ff2c8a430099664dce1474adf453f2d372b0d149c43584bce9c7abee4c8cbec3126adb3d2ab95 SHA512 ebad9d87606cf66f3db5abb2b0abd333d5536037446df131bda3f8138c33a6495a8923fc583328c27632d39448790e0e6788745d8acd7d600ea3ce57cb7dbd45
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
 DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
-EBUILD toml-0.10.0-r1.ebuild 1171 BLAKE2B 6b824d13e705799a6bd15dfc9c478c4164de2b66deaa0c4ef6df5be30a26aab90255d6073d08db42b1816c696d701257b261885a4125853e64abce993f0e8ae9 SHA512 58c53883a84152ddc5e43db14cb1f4000437ab9328e94f1556befc4e13f6fc78344f602dbde37e822f52062f6890c1eef35688784da64e00b6002f445e37bbc7
+EBUILD toml-0.10.0-r1.ebuild 1170 BLAKE2B 0926543a526c3d8bedcd4d439f77fdba495efa30f1bbead4bdf701cd0e5f09354e3a80b8ab4c6200cbf320b0b2eab1563259d366f044afb7b0914e8b141daf3b SHA512 664ca4a392e972f64366fabc55cfa6afd2ca8661a57ad77a1d661f7a1fa08fba0489da95de7045d051f8f2093c875d1ba81a5dd809a2510c68e3d938c83b4c8b
 EBUILD toml-0.10.0.ebuild 589 BLAKE2B c45241f49e20b07b97e85659ba76e609df70115d0c8e1221ab44c9cafbf095793c8d189c3d4175b5f1ed2bd793910774a05e613601cc19017cf4fa420c7d5a8f SHA512 4d28037aefd93828b83a36bd69cccf77dd14760ce1d3d0bd041187cafe781d9416b2a97585738ca17f9761ad21ec46198ebe51205686bed4aaf8bcf17355d4cc
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild
index 24154b7d0b5c..afa4ad96da39 100644
--- a/dev-python/toml/toml-0.10.0-r1.ebuild
+++ b/dev-python/toml/toml-0.10.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 08dfdddfba9d..887fb4b70f9d 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 886 BLAKE2B afcc3b230cb3399ac99edf40cf57c29f76b6b8eb10f38702d7c5034f9d045bc910ab9368e51960b64af4a5c9e49ff4b11b44795bbc8d85489f1ebd263d098422 SHA512 7242730ecb254b32c88656709316d9d900d8d0e744fba7fe70712ea0a0cf8967e475459f7dfaacc69c0856ed17751a2471f1eda2fbe96e55301d5dd31eb7d6bf
+EBUILD towncrier-19.2.0.ebuild 884 BLAKE2B d15c55ecb08a086973d531b48798b3e768238cb5bf4dbf73307f24f7df72cff81bd89878ab53fbdc1b1bf5693cef40989a2745f1d10bf5e4757a90a93cf5b1a3 SHA512 ad20db02b6be0fb9ede27ee7cf270470741271322ba5cb5b0cc393425e8bf6c989fb66c220b848a370f690add013e963ab7a62266e30e8145bab19165bfa1b16
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index cb8c66280384..ec6aa64d94b0 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index e7e6ebca1b1e..41c4b94aab68 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -2,14 +2,10 @@ AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
-DIST tox-3.13.2.tar.gz 286403 BLAKE2B 579692b4902e9cff0ede954fcf2d1a7f1771c0e3ad4b6cd362f93b1e745b238c739ab857b2394700d736eb6a0d91c1f2b385de1926908c0c4aa5a9d183a6b29a SHA512 b2447d4300a7469eb53f094427a7bb92ac973b5fdcfdf9b98736225b3a315953e06e92a4accb2f84f8649fe79a9146fb804afdf9adebf9231afb0bd143e646cc
-DIST tox-3.14.2.tar.gz 288615 BLAKE2B d74de145c8e839938c332f1e5a4819126d2ab1212679cc5c50390a9c7b0edb8a7059c55d9c6c8d3697f36cace7c0d3361725f5020d3f9d7efcddf8faae8c9be5 SHA512 c573d4b6a8e6538eb17031f7432d6f52f75514309c5daad53286aeff00db51146a5de089bdc1efd76f8126c374efa02c0ea7a8ca4224c0ec0f9ee945edd62c97
 DIST tox-3.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a508c1fff134c7738feb2a1a5e130201cd7c9f1229c2c05349139bd54aeae1183fdea9c1735ccbde82bcd5a SHA512 5ac912c4f1db7fe23dd6dad68bd15127d3db97498ca58f7b8573f1857634bdf41eb7fdb4cf8d22afa14547363b91a7b52fdd5ad80af5d60ef4dd95c1d103f8fb
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-EBUILD tox-2.9.1.ebuild 1288 BLAKE2B 3e42bca1de4ea29dfce30ece9be5543f2501f43b9ffd31730fd67606d9abdbf3afe2244c5408f12cb6c04314efeaa9f07e0586726c1679034c80219af79f16a2 SHA512 813c4f90bad86dc76fc8d62968e373ef1cbbc8f1c1b38756e8dd927a70363a1eb4c6dd5b81f5da3351d8886562b088505b6d37f4f269a60a8e7894382911c486
+EBUILD tox-2.9.1.ebuild 1283 BLAKE2B 2b406622044831eaf4ede7d01feae7a19ad781f7afdf53caa79f758ad26a374363934bf241b183c499792d0bb251e9179bd796cb6809cc1a018947ef94780bcf SHA512 40ad403cc7e5a7e5fb43d31aeb070dd38015f63d355f19cabce481eb555f8ff3375578d23b471f7e698045ff9475163c2240e610ba98ed38db264297ea90e008
 EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
-EBUILD tox-3.13.2.ebuild 2015 BLAKE2B d675f1b4b7f6f10a9fdd515613990e55a956a6e2394aa57260236916123c914c35481de44ee2fc3a69fc210b3412e26c063b2d2f6757479e5c3eebb6d3da1927 SHA512 38406fe7ccb5add9df41e584330276a3200e1a62cec80b602ed93588b5eb23be108b7403fa989314b466aab17822890b24712ad4c550edd4b47b3c77f258a440
-EBUILD tox-3.14.2.ebuild 2221 BLAKE2B 9f4865c78aa66d3fb5937e783a57d3eb4d9bef3fbbe1fb302869dc8c74961fea510602071c939df0b8fbd90807494a76d446023d341ba7cbb57805ee0f6de2a0 SHA512 11b85a23c47a7d16e52ddf51f25b1ea212cbd1ca7937210b92238197ccf910ea8c500aad1aa7b8455adab78e9335f7a9b1ce5b1402fdc6762bf33dc45c2e599b
-EBUILD tox-3.14.3.ebuild 2233 BLAKE2B 87d45d6315ec648f7338ab389b4c0d06dac2bcccb9f2cd4e8666bc99fc60904ce5eec5a14f3edd6ab9f8eac7d1155674d1de68264681b2a6e17cf5d027d6e774 SHA512 b6e6f07c7aef216e776ebc53efcd292eab4826f48895c39e92c7931735ec86aa2932b16c2c4bfc8c5979e76ae2da8318a5cf8536b2cee5f5ca6f29de3a912b22
-EBUILD tox-3.2.1.ebuild 1975 BLAKE2B 16f3f857f3bf4c89eba1951455101a39de2e593fcede962cb8c36e6260ac3568c09bc759d8cc92c92bc24f742d68448843952278bac04a1711d222ad995e8dc0 SHA512 6bad81cdea97209d8befa10298b4ef1e496581ff5bd581d4e9e7a0c5437fff6da45338bd1abe1eb8af646a45e591ed9e50f55080d679e2eb26d55d8cb8d3becf
+EBUILD tox-3.14.3-r1.ebuild 2236 BLAKE2B fde46522a9c4eba0437673a3ae3d8d5b54cb0836980ae5c1d63449b6664ec256bef84cf412850e23fb07eedcd026b75eda24b5dfe18853f867a720804a04635f SHA512 a9695b63c0d79d8d2cc045970d0a4fce948d1cfef5c2aa44ce67bf63015db9cca4bbb93fb5fd8eefdb3eee7442c4dcc44e896c9b0abd12af86292af5d8aeff48
+EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index ba15d6f5b969..ab13183ca68c 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/tox/tox-3.13.2.ebuild b/dev-python/tox/tox-3.13.2.ebuild
deleted file mode 100644
index d255c099c483..000000000000
--- a/dev-python/tox/tox-3.13.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.14.2.ebuild b/dev-python/tox/tox-3.14.2.ebuild
deleted file mode 100644
index eb8c4fbba74e..000000000000
--- a/dev-python/tox/tox-3.14.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.14.3.ebuild b/dev-python/tox/tox-3.14.3-r1.ebuild
index 8cccb8451fe1..9394dff0d0a3 100644
--- a/dev-python/tox/tox-3.14.3.ebuild
+++ b/dev-python/tox/tox-3.14.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
@@ -26,9 +27,9 @@ RDEPEND="
 	' python3_{5,6,7} pypy3)
 	dev-python/packaging[${PYTHON_USEDEP}]
 	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
index a7c3a9df5999..b8798335d338 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index bbfc7b427fe8..812d23ce55d0 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0.ebuild 608 BLAKE2B 67388889f3a5e3ec9df45b832b5ed3f3553b3eb863e2aea7eb08bfa8fe0917f9771d81c08b77643ae2786e6ce78d71cf8375cb81456029396e5de98a4bbb5535 SHA512 29fc6b0cc8c49d7d25b426d342ed99250e6cb54edf24c6ab4fd3017cfee41e6d889542e72fafef1cb55c656b223a645ecfc1be322a7838c336be3e071d5f54c9
+EBUILD traceback2-1.4.0.ebuild 609 BLAKE2B e4fd6ec25585b4fb53ce1b7a4f3c63668316efb4ef3291f298d74872e235e25b5c6963a2f3b94b48b624959e499daf6f66d84a6ecb233ada4d04ce9c6191fd57 SHA512 497e8674afd3605e5f22a34b7eda6e5516bd6f5ddc69840eb6bbcad97c1c99a3da1ce0a7da612a412d630e027b674ac322f370d13254c9e2124b6746a4a16df4
 MISC metadata.xml 302 BLAKE2B 97962b0a7d9fff03c6bf59aa6b2702faf2153df607b896ceb41e6eb7886045b9180048b121102caee6229950711cac23acec5bfc72771b112fcac0fa59536dfd SHA512 59c7be20af309b3258f6d3208da4956963e89c47ac2d15b68c6917d5d33b9aecbb359111579959fcbba5c5abace520ab7181e1e993e015f1d1971e1f5e4a3564
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index 96c45f094b0d..c8e6a5830617 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 7accff62a854..000d08f858dc 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,3 +1,3 @@
 DIST traitlets-4.3.2.tar.gz 88173 BLAKE2B 51848cc4405521872391e2e4e55bb6c32ac939125337118bdc6282f4e7eacb116ddc94ff901fec18c2cf023af5d39aec77e6737bee2f915b28b4032611257860 SHA512 4f3239bc31af224814c8181dd1ac0fe5287160aee48b2b0f54afae841c8a9d7eaed010082044b6d16f91cd970bf0aa1eeba57d4503dd919fc8c4613ac5150ca9
-EBUILD traitlets-4.3.2.ebuild 1241 BLAKE2B 37cf84c78f631c852c61fd4cf6cce64c52b274d94be823436b94d328852cc22ebd410959a25027bc9da35557a645d28f024a2748fef92102dc79319f69a0a9dc SHA512 c90700e4e5db16999222450c6c1d862dc2c76e3203ae4aea2cc57b57203c586f21230cec22ba042838daf354bf39dd26157de862d06f9016d032d26d27b8e4bf
+EBUILD traitlets-4.3.2.ebuild 1231 BLAKE2B ec66ec1a62c8c87cd8f37c20bf25ccbb19488d9762e6b9618c5a72f0f06d5d5ebfbae7bf389ea1cea1ed0f3488be41ce2e122ceebd702b30237bb9b65e47afa2 SHA512 ad50f6cfcb13a0feda3a93c447dde1985bc51a0198f5e2c402d945723566238e83f52e630ad2114b6d03e4b2b332441991ddafc36e9da7c1459d5d14757ff085
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index 972d6cd0d1d1..1d687d9cd6f9 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 9bbf9b206bd0..e0dca39f0ef2 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,5 @@
 DIST transitions-0.7.1.tar.gz 1283833 BLAKE2B 5f2f2813ba158cf5ccac4e2d55700149b986bdd24f9e864cec8d03390724cf79d9d379afa06b1a7b56c6a91376410252fdda169024f6ebbba2ed976fe7a18e7b SHA512 3fe5989faf9dbfdc15d50beaf2656240317f00278727271e5bd64ad465be1640b67e760fb73f4b06a61920343215815a8be03d41dc4d32086222446463ef71d7
-EBUILD transitions-0.7.1.ebuild 988 BLAKE2B e05858c89a8ad2bfa7a4b191875f6394a85632c9e5eed7a41c617edff8358e5d4099e5e8c47133b15f5fb0e105a7db9b51790064264cef057c7f256ab7215e13 SHA512 7b88838d7f40754f8ac71047c909b89933c9ee443c40df3fd1b60b59da7abc49ff3e2623e5cd8a1625b0de9efbd14e9422279e0bdc735e9e4e18d185afadf45e
+DIST transitions-0.7.2.tar.gz 1284500 BLAKE2B 12f45023f2ac1d2d3cee520f8b3618224abb69264ba4a2a7d7bb9db633328bad3cf6c9c5006e2040dc53792ab457e04aa51c9b3c54dada9ca40b845a81c40494 SHA512 2c2b083fd07c84b5e3e0a7848f54438f19234f9d54a5fd7a09b4df6bdb624ef5cf9cf59e66463b27547b9a2002fff7eefb4aae0d49b7b620edfe349688f7cf22
+EBUILD transitions-0.7.1.ebuild 978 BLAKE2B 21528bd19c7666cd7c45ff50098bafd3ca9762ac31df01e48509c5a5499a6d9fbbd8128cd3c9d8c8235ee036d321955f17a0b2c0b99ade30afd2aea44339dab0 SHA512 7271a48488b9f43b57d47304e667b451ce9bd53bd01ebaeb06d8f5197042b21d448a7cc8924fb11aeae72c3e21d0e7a5ae685e80c6639b186d6b6afd49bac347
+EBUILD transitions-0.7.2.ebuild 980 BLAKE2B 2b229525563eb04ebcc06248bdc4f8072bbcdfbeb1b1b26ea2f81740eda89df7f442fe11427b8fda1900e34e44a709e09ee849a25114031401bceea2b3b011ab SHA512 8a85d3f077ad52a72a0a2bedafbda15e0ad1351724f936795dcf5b35556516c7b9a2bfeee6ebd48851b0ea312075d71a3fe4b41e2129bfe7ae97d818609f675c
 MISC metadata.xml 688 BLAKE2B aa20597be6470d32cc9a933d01f04f2b145d9d0dae23cd7bd3f4a3794e919c08cdee49f0c9a861b00e8971721091a315474d19f482afb6d009eceebb6a49ce15 SHA512 4b09b37102dbad8597aa58b1a0bbaae9c37360e58967c468226ae18122fa29e7c50902dd44a71e28a6822089ca9e787781d28d1e09e56a73ae34d8a7b9a6d941
diff --git a/dev-python/transitions/transitions-0.7.1.ebuild b/dev-python/transitions/transitions-0.7.1.ebuild
index bc0debae05d3..d07f7758006c 100644
--- a/dev-python/transitions/transitions-0.7.1.ebuild
+++ b/dev-python/transitions/transitions-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/transitions/transitions-0.7.2.ebuild b/dev-python/transitions/transitions-0.7.2.ebuild
new file mode 100644
index 000000000000..60c72178daaa
--- /dev/null
+++ b/dev-python/transitions/transitions-0.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pygraphviz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 912152bee97e..b031be89e5df 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -1,3 +1,3 @@
 DIST ttystatus-0.36.tar.gz 30766 BLAKE2B 4fbb298a86472305a01ed7a8a41cbbea3f0e1677c8f5b349e71631d3474a59cbd65d114f55ad64339804ecb97bfc3e745cd93d09bc110c2c32f53404f898ecd8 SHA512 0005d18834eca702e4c96ab85216e3bb06fadf58555641405b2657b9f296b750d1084947d1a39c4e2c0bf0711ff859df06f1e859d6e82af41d2945e980529dcc
-EBUILD ttystatus-0.36.ebuild 550 BLAKE2B 464f40787e799e639a6a916dca3ec2d68fb6e64b735fe0a63e71c079fce0b156f7657a1b7fa29886db2d631e83fc624cc69f2b690a8578dbbaaf3616c12c7feb SHA512 42db8af37c016f71a6f848a6b768afdb994e2997a12e0ff1fb82135d717ab9d697ac04057b48f87bb918cb3df4f54dee30ab253d75c0b21123f8517824a05b21
+EBUILD ttystatus-0.36.ebuild 551 BLAKE2B 3a6165d8cecd9b735248d151853e6f11ffdd186517c39caddf1594fb88dc4479abd415bb533b2ac88ac1eea6ea6b49f0dae952638ed4306cebe7a5e606688077 SHA512 a1248ce89e055f5da77c4960fd843856309dce2044679c6f26b29a594885d57e22b98253ec3a98ed2e4cc7dd5bf7d6ca33a175fb1b9532369741148ce71dc0ad
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
index f8e79b5670ba..0e09862cd6bc 100644
--- a/dev-python/ttystatus/ttystatus-0.36.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.36.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 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"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/tweepy/Manifest b/dev-python/tweepy/Manifest
index 10f783f3e5a6..6ab4ae7fe7b4 100644
--- a/dev-python/tweepy/Manifest
+++ b/dev-python/tweepy/Manifest
@@ -1,5 +1,3 @@
-DIST tweepy-2.3.tar.gz 52352 BLAKE2B 6853f133e73d8a97d5a2326ef6c877a527fad87ba9767e6ee218efcb84f6b8332d4f66b044b572987e71d4d9dd8a7b743c7976cfa9947101f0df5c6f9de5d1c4 SHA512 23317a507174e108cf8d13232aa467d892aba1789ee4f610eef4f5503b045841b5c85e8ae63ddcfd1e07178afbf3bf9f4a9fed939426411a8566f1c949b9b831
 DIST tweepy-3.5.0.tar.gz 24348 BLAKE2B ea9d96abe4f364e1f77a97ce28fcd4fca3224ab307698e59a834c20becfa53ab68851e638946085431ef2edc1a4e3bf4f42a113c2ac41561930b7f4638e5d6c4 SHA512 cf87f0b7dea0ca444c17a3fdb9c2ebef814683c110511876c1997630b3202393276d3dd2de3b37fc21eb7a15382d22cc886109bda5a11b3d06a08081704c8c2a
-EBUILD tweepy-2.3.ebuild 1136 BLAKE2B fa335da13355d7c4bfe46543536cfd84d5e2b64dc7416359d8539ea80d93d9bd13f85d44d24fd81e7378982394eac480085b397bec57a5fae5686613bd3bb7bd SHA512 1cfae88261e6af78b8488f01f3c48f848289aabc63661c1136ad6f301d698b52c48f9b1901d0f62770e4536dba931801889e26e05f47bfba29f0737a2e0b4202
-EBUILD tweepy-3.5.0.ebuild 1215 BLAKE2B d8cda39af7587ecfa91991dccdbad50bb828e256f50078acd109f55222a551f47b8af7f6d9352cf7ca5a9fbe42a49d1a394f7fc49758d58450be2703dbf23def SHA512 2efde6202ceb44ca6d0d2dc5247c2262c58bb0f863ad569cffdbb749ce0d9f6dad7390e4bfe53f7f94cfc73c5c3e9eec7bf5470ac905263fb202d668f60c02a1
+EBUILD tweepy-3.5.0.ebuild 1205 BLAKE2B 9abbbd35f91855028b31d30081dd71ed9bec98d58b5221ae5f224c07b24559f2168bf2a9dd6b2d85060abfed5fc621d576f69f2782b997cdb9aacadc263ee8a0 SHA512 dda5d53c3ba30973a14c254ea199bab384b3875a4b3d035e65a0199d3767d9c6b0e7b8860058acaa916e721357b8cc433294c28c615ffea9614da4ce6c8c3fd4
 MISC metadata.xml 374 BLAKE2B 54949ade0005d71f03bcbf3c84676c9a8b6b10420c8b28ac1e2e27b772b4cc685d3d88d9fce150c3f8a46b137ee4c3441cb4eb1925487f4e42858b73b2e1596e SHA512 e2785876cc350cb7130905648a4f9013fc79c286697c6fdfac203678ff79217383fad2c4d4d2caa42107d83c6cc29ae0d149acea16d74aab804a3039a3e143fe
diff --git a/dev-python/tweepy/tweepy-2.3.ebuild b/dev-python/tweepy/tweepy-2.3.ebuild
deleted file mode 100644
index 810587b01250..000000000000
--- a/dev-python/tweepy/tweepy-2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="A Python library for accessing the Twitter API "
-HOMEPAGE="https://www.tweepy.org/"
-SRC_URI="https://github.com/tweepy/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-# online tests
-RESTRICT="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/httreplay[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Required to avoid file collisions at install
-	sed \
-		-e "/find_packages/s:]:,'tests.*','examples']:g" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v \
-		tests.test_api tests.test_streaming \
-		tests.test_cursors tests.test_utils || die
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tweepy/tweepy-3.5.0.ebuild b/dev-python/tweepy/tweepy-3.5.0.ebuild
index 008e2c23fb34..603f325a84ee 100644
--- a/dev-python/tweepy/tweepy-3.5.0.ebuild
+++ b/dev-python/tweepy/tweepy-3.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index e9504a7ad7a4..8b14c117f75b 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -6,7 +6,7 @@ DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec
 DIST twine-3.0.0.tar.gz 138502 BLAKE2B 80cc475704979030435505103e45cfd051d2e3979e6fd9d4ad33fdbb2644bdebf789c504491f22a161f346295222287114ab68034560360f08a1beadefb20ac0 SHA512 1f5577c74c47618ae07672b53633110a5ecb486d25046cb87f36cbf5974b679714f962803b9dc6e970c57d8f2542b323e11437e76effe7172511557b56df5f12
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
 EBUILD twine-1.11.0.ebuild 1176 BLAKE2B 483675af4fdd10de2677941e2b7f488fe23eb6fdc62d325793cc5ac281b5670fb74e588073924a6b86fb65777220b54e65d8b5360b46cdc675eb57ce3dfda7ac SHA512 5405f4ecaf9735a4e1e2ea2c3451234bdb9484c980a414924a9c9f2e373754ff56a699bbe6ec1bfd308486dfdc2d5e61aafd09cb06bca260af3bffd131c8b4e8
-EBUILD twine-1.15.0.ebuild 1317 BLAKE2B 0e6ac22c984e40a8f5bdb48928347850eb57adaff59e301eda38d93e9f72857df6923f180b2cab1bff3e6e0cc15759a272d9d27cb061bd1490153bf376b5c5f6 SHA512 2ba33364aadf813704a9212e803f2b99c25a8fd76e38530954ec3606ce4d43f50938a75a04ba7dde6029ab8b974b0a6caa5b3610b70468cf363ea7557c00a9e3
+EBUILD twine-1.15.0.ebuild 1315 BLAKE2B 58dde5910e84de9575ab5b4af5dfe28b7a202856104bd3c2d16f0a3da4644ca07e9073c414ee7a18b32754694c30a3ae1551ce7f05463d7ac987fc1d5bd81269 SHA512 295242934452f075f685fe1f70417a8552098b706f2347b20e6efcc905eb5751c15834d43fff11850afda60c83bbf34af0dc4ea1d0e56cdd7a27d30d28cbeb52
 EBUILD twine-3.0.0.ebuild 1757 BLAKE2B 783da90be51a5d9ef37493e137725b169df848e9271d368c39c52f34ac2f444bde7a81bac9cb9e2a0f7617426caf875baa60467e63567472f257ac59b65a1b20 SHA512 31c21078d3c7bac76ba3f6065953de708991890a401eef990835905cdc9fec9be56bef8eb9d2bfab22087d5731c89a342747a63d7e3142cb50b9a46d8754876b
 EBUILD twine-3.1.1.ebuild 1811 BLAKE2B 112908686d07e9cc9f4234cb33b7ce4725982310c290667c2bb942edf3c0fb1c191a93cd9efa5c483408a915b60fdc892d2491a3a08dc3a63c80b6a30b6a9463 SHA512 0e2a17da3847c03fff802cb11ff8475bd6330880f8bea480cef43e8bab3ad8d7d87c582e4866691dd6c00f389e72c50d9fd7e60b6aa47346020bd63310df9033
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index 5a95c421b744..d6fabace0f64 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~sparc x86"
 IUSE="test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 1e332fe4584c..1e9db15f42d5 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedConch-13.2.0.tar.bz2 243977 BLAKE2B 96e11e1777b32b71dc7fc2c0af444ccbee0a7bbabc33cc45ea844818a3270bfb6877eee8442d4388530fbd55494d54d07b5e78759c8ae37f830a16b27c283e9d SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043
 DIST TwistedConch-15.2.1.tar.bz2 222736 BLAKE2B c4de3ffff523b8bb12918a5eab0b662e32f3e08985c0698b5a70167f9d655bbfb63e1c0c58e35be8e4042df4ea041c25bf421162220005caff369490b42c5d49 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7
-EBUILD twisted-conch-13.2.0.ebuild 788 BLAKE2B f82752a4b35e7c7fd4b61aba8014c1fbbf1f9ff2f867ddaf99fe05e2ad0e7a76279c55861d3d6c4c704dd5698bf6f3d2def21066e8267d26bf5dc218c343d2b3 SHA512 4e66a99ec56754da74a8e3c58da79cc837b7f723518efed38fa9f245508e0d47d14a4ea307840719590d22b187b1a1ea10854efb311a0c1af437391032e06e7b
+EBUILD twisted-conch-13.2.0.ebuild 789 BLAKE2B 3dc7c08d5fe19467ad42c3a6499f7a464d602dea892193ff171142b1311c34c6d5df6cd6d11ce8166507fa2b2b413253f329951029e9525447092aa5ef3474ed SHA512 c858d23fe51f5d5d51395e533b9adaf16cec4095de1193a77b2600cbaa562e2f35812ba13a33d28eea14242a127e04d74e2063f4e57d203679d80029021917e5
 EBUILD twisted-conch-15.2.1.ebuild 484 BLAKE2B f0cbe69e0fd05fdd3e54ffb07545bf61023dcb2725b660447e51fd6f0618ed3dad8477c9edc478259f03ce3f381297c809344edc5e7d2d19fbbbc615a434e3b6 SHA512 859e14bdabb4d74c1449d9c0767a3a659f9f2ba89c12e83b8dd7c3fbb4fa1495664595f72b59322d0664f6be1a23014758391c45d221bc7df917c430ba576a11
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
index 65a2ca05ac74..60ad20c29442 100644
--- a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted SSHv2 implementation"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 910ed50b9c37..a60f3b35ae84 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -5,6 +5,6 @@ AUX twisted-core-2.1.0-echo-less.patch 269 BLAKE2B b4f68663c7485a9ac247415aede69
 AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 BLAKE2B 674b63a74ed134596d21d384737fb510f4a26f6c4770c1feb7a612901c8b7bebf9f8e2cbaf9bd6e18a1c7e11f24d47e0b32b2ea15204cb37ee70d5b1625bb9ef SHA512 b77cdc6f7df5a283075f1bde7f974482cb5c5f49c9189b0f3fc3a39da18fbb7ade30a115cd76cc4241d5bc8727994cfcc1e96aaa835c68f753b6ac3523438a63
 DIST TwistedCore-13.2.0.tar.bz2 1496299 BLAKE2B a7034a23c4ad890a8591e7ef1de1c3ba1dc486ac6f3d1987cfc280756323d3e968a913bc4291ef8dede295a12c02b8e166a27f665ce7f4a1c536e6e7a6991e53 SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6
 DIST TwistedCore-15.2.1.tar.bz2 1179442 BLAKE2B 39c9d3646fbd31225dca1a4888ee177c9547b7a9809c57e2e9577c90c02f2b64e74cfa3b8410513b7645312d39ebb292fdc8dced26a9dd29abe95dad24a8b870 SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820
-EBUILD twisted-core-13.2.0.ebuild 3611 BLAKE2B e1b7b5048edd74b069b4e4703bb9868c5b2b58428e10cbfa48364bd93a8fc9062655d2b05084b0f533288c7dfbaf82d51f15f51fe69fb428da006fd21e04b13a SHA512 0886423ddaf8040c0374e6dcbfb6f9b50858ac5487eb0d5954609d5efeb10978dc236378e57740989dc33d51800c009551c7dd7443bacd3db563f5d5c864ffef
+EBUILD twisted-core-13.2.0.ebuild 3612 BLAKE2B 97f30d5b4c0f02320a73353be067684cc59a4aea478d01998b5b7c7f0b03b3d096c5962972c9e8e8859c08979d63770a3692c688bcbb86d2a4e45df1dcf656a9 SHA512 7ddc2d9dbda1b6a192d307406c9254c9c59173e25c83502a59d92bba259a5a96eabb46ad6bc53d339619e4952934e1dc385c20f2051e2251177e866b38d499d0
 EBUILD twisted-core-15.2.1.ebuild 4129 BLAKE2B 8a62be9cae53a415487f713e48fe3f8e820667d7ccbdd29746cf22d9843d3bc2d6a51060d2df740056a535b3c6c440a92146a72230dee7a56513a3822bb955b7 SHA512 6c0e009788cf2be7eb0464e4c4d9d770377e807552499b51de6e5ec7e96a6fe8bbc003936636f7ce50bc077e1328e5e887ebe8af5fe57395a1c1bb6362cf0512
 MISC metadata.xml 596 BLAKE2B bbf2d93b3f599494e0913ae0068a5aaf6d0c972959eb5fa80231f247fd4988515aefd978d25d023ea6a66a9edf036a794599088931dd098223fa9951c567dda8 SHA512 acb4690541dd747cbee28993ec56a422149ef02150505b4b1ee1ab0418745dd074344a8cb2d3dfc76f7027229f921e8eb25738bfe4b829243dc4530c96a41440
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
index ae3eb4bb192d..aceb90bf02e0 100644
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic twisted-r1
 
 DESCRIPTION="An asynchronous networking framework written in Python"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt gtk serial"
 
 DEPEND="
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index d37229ae0143..0293394e239d 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedLore-13.2.0.tar.bz2 88616 BLAKE2B 9505d0bdbb61f2ca1bc852e49a6d46a41cb921443d10c3409f91d793cb4f68c3e15363caf022eca9d5782bf250e42f2b855abe31005834e6a98c52dc8bc6e5e4 SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6
 DIST TwistedLore-15.2.1.tar.bz2 54070 BLAKE2B cc99513a90e07793f91741d4ab43ff5ced78b3df5b9f686799eef6aec54b9833604b25c2de509d170c95449f02c90f03fb2b807f4a036c2f689afd07287dba12 SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a
-EBUILD twisted-lore-13.2.0.ebuild 446 BLAKE2B 4f8a3b2b2802113443862d4948535011f47874970c0c331448f705f74735b9130c21c7746e9e48e69996361466adcc8b79f0ea1cc7e9bee96eb621a672edbcfd SHA512 531e8c2a3f5fc6c14b1aaa86b10af1779288ed0950ed040644104796a36e361aa5a25bcd3fcf0f8c139f09f5c74b15ab087db41b1169225c49968ddd97e0b49d
+EBUILD twisted-lore-13.2.0.ebuild 447 BLAKE2B 21e977140b437362d154aa139b4a476527b392fa4de95c199af0e0fe287ae8b91c423b179d1d905fac123c62572e6b05dea98357351190224cd25d074104b953 SHA512 3d3d184bd8f5bf5f008c89d62f9854aa72a88b21c40c41c8050ffb7bfc609bebb2bde764d6dfad6a4537ed7c06cbc19fa33f5c3ecc9cfafff5532371d329e1ec
 EBUILD twisted-lore-15.2.1.ebuild 451 BLAKE2B 84191221fa7b9e644d30a8c5ac04fb08b45bfd2b663aeb2d268e3f67201b94828bac152174ca5e994a69360147195a8ef5ee4654226c409b835c6a68f5c3ba84 SHA512 a93c44151a5d4e46af861002ab57339f0d34d55aae35bb253ac0ebc0e4c0183d919a93b0d1a2ffafe25d0bb12c6968b25e8c8da17f7b36e02f7f1997c9569d8d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
index ab7023f2f841..bb11b07e17fa 100644
--- a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted documentation system"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index c80320de6d0c..631c95913c31 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedMail-13.2.0.tar.bz2 160046 BLAKE2B d13c04c2544f59711de980bc3902e65997f02aa389ec2b59cded133dbf931f1cb24f3d1b7bf100af7ac91b7a39b02d87959fed32ac218486918630afe911096d SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314
 DIST TwistedMail-15.2.1.tar.bz2 161891 BLAKE2B 5ca48f016ba7fa5612b6a0dcc2d5244ef0bc87c312840f641ec62a78949fa4519c3ea246030da656a663d044bfe58cce9d720093471baa5b07848ec8a0c2bbc9 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23
-EBUILD twisted-mail-13.2.0.ebuild 590 BLAKE2B bb1f662f9b931ecc6ee6353e65d370ba06ac291793ee36759dffb4442f1efe1e7a6af4769ce8b2ef85ce026b68d692d6030fb3b0afe45dd7a01689c1f23b8854 SHA512 2b18307584dff18eb76d217fc8beed5001828e62cfee8b1470be5b9ca6c77048ab785430b427681f3efb5cd3228b17dd76f76e5087a580eb9110062e76314dc4
+EBUILD twisted-mail-13.2.0.ebuild 591 BLAKE2B ead04991342529dd1d73d18ebcd3f7babece9857c3518c917efc8e2d6c29774403900b56461358ebb050257cbb9944a6b8c933e2ddff8f612d4e94b59e953bc3 SHA512 436daa4a724376710de7e9a3837ad4e2523342ad502c87d6ea01d243bc7a6ad99a14d9872c82b6e1fb12ec3dda69f43370e0ab5906a04b92f184e3f005ce4f2a
 EBUILD twisted-mail-15.2.1.ebuild 592 BLAKE2B 1f554e84fe43ccd046178d89a743c2436e165e71903345cf1c8f21624b944e7c98a2b2ddac293fc9de8fab4eb24f4eb3291b0f9a2267fbbdce2cc4775b547da6 SHA512 2925b6fef338346e0f04a9012d42890f357c19a61268988f76a6e11fee398f086fba9bd74e0a5c08e5bdd07ac41f8fac0dd79c96b3ca5a0fec1e8781330cc83c
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
index f831284f4ee3..183927934b22 100644
--- a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted Mail library, server and client"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index de202704d143..d9303517fe36 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedNames-13.2.0.tar.bz2 71127 BLAKE2B bf84c95a42b3738c5764d22acd259ccd443e236fcb8c87f383a2de46cdd5c9859b09be57630a11595be125ed74ce5fe4dd0783af2dc76dfc802a873dd17e55f3 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5
 DIST TwistedNames-15.2.1.tar.bz2 88688 BLAKE2B d6256bda4c674f0aedd5fe871c1ce3d2c6780c7d8c32c26598b47e1840d9061323e925a44aae4f02ef2537a20ec947a54eaabc4daf7d45465843c48b76132ab7 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80
-EBUILD twisted-names-13.2.0.ebuild 512 BLAKE2B 5ad1fa086e72ef19dcde3b58275aa98dd68c39a211076ae3a93917c8df17da6ccd0614249bef5e2774a409131c9f5f545703c69018e6327bd68828efb235c41d SHA512 6f5b0fd30782b60d2b348400b49fb08cd20009969c8b88040822a0ac9418bfe99e1a4cb8f66e96ac4fa184da5ffbde9990e5c3aadce7dd484ced738cb3d76980
+EBUILD twisted-names-13.2.0.ebuild 513 BLAKE2B 4c31763e77efb864fd31e0faeebbe31e2d3c0a3393f1faddc8de906eee9cd116ccf44c5ee3bb2a16ccf0cde3fabcec9dfdee081ab162cd233e21b5057c2ce8c7 SHA512 ac8dcff9dfda1c4a1a46d77e7c2fd0319ef75a4517ec95d43170b4328ad2d849949ed74571fe84429410f3a124b6ad711994f021605b0432501217c23f61111e
 EBUILD twisted-names-15.2.1.ebuild 521 BLAKE2B 84022bbfddbb69d59323b514636cc550fd4f974cbb55215d81c075f6def6e7fcc7c38a59abbe513f979b92cbada6f5f7b56e8a4390d7aef3c9ae7dd8c4ecce47 SHA512 f6193ffe4a5f1acd91b515d7c771a3d954ebebe2136e5d08a6e45a85d33d22db23659b07a4f6a80d47b99389a1c491c47a2eab1bd2b1720046332f8b2ead4934
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
index 097b111fc82f..c413c537d0aa 100644
--- a/dev-python/twisted-names/twisted-names-13.2.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted DNS implementation"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
index 9806cda9dc5a..4ca2cc6ce594 100644
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedNews-13.2.0.tar.bz2 19706 BLAKE2B 42969d66d60d5bb228e4565c775b8d3e10acd2fd833d3b48e08d773b72bd01dd9d71d5fbdf1d4db767219d5d7f9949214bf5dda0d487c76434db3fc8c9dbc124 SHA512 439f35b882f28be1fa466fabe93c06cd688662a44dd21f58a3c2d9670f95910c038bb30b79c88f661f50be7eb9bb820f6d89a94fbf61bde2d8bb46af574c9274
 DIST TwistedNews-15.2.1.tar.bz2 19889 BLAKE2B 4043b76752dfcc8205f8b978cd87267d1fb31c1c794c65678e3a1fec1aac3b8131dd55550acf69909149873eaf55fc69f232083cebb46224ab2b23d95374188d SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342
-EBUILD twisted-news-13.2.0.ebuild 473 BLAKE2B 6aacf502401b8a1fc055102fe41e7adc66a656d96e2e9563ff6c74881c62c959694e0593154ef7034fd895679afe1cf876623c8d7b5a5b0294bcbaa4ccb5576e SHA512 e678bd785dced8e6bf16f2c664d0049ccff40aa367176217706c0119dc14f7296de57bfc738ca9f8041cce5559b1fa4e1e9dc3cc451f747e802e09cd0cd87dd5
+EBUILD twisted-news-13.2.0.ebuild 474 BLAKE2B 476a62b7f59d8760c5cf5d2beb963ee0ac0ee362b8a2c23760462554557748f2b3fa3fbf80686a6a2b83043b9311df3cb3dd0f0ef0373aae7ebd2971e7a27703 SHA512 8cefa168349af59b1d52c2c813e719fea7cbc16737c664a2a00cb70fa34d85033de50a568bec07c7338e4fe5a859600ca69b86e5a9c7ce1296d73073a9002f02
 EBUILD twisted-news-15.2.1.ebuild 478 BLAKE2B ceb4c3a60c6eef449891ded0b016ea5e71e4fb7fb4c0f5123b0cee00b2485fd5090da25aa70f8b9cee3e304fd505aea3a62bf21f3b9c7d2fefddc3a20f4a7af9 SHA512 cfcbe37e18555f9b3344e0669b2e3c98aa3d30a26965d4968b95f8c4e9711646a682087bc9959f7ad0dd7f5fe1ae7bb55fb1fd3815ab8bdcd7acdc7bb2f2b3d6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-news/twisted-news-13.2.0.ebuild b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
index 84bbf614e35d..10a198b6150a 100644
--- a/dev-python/twisted-news/twisted-news-13.2.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted News is an NNTP server and programming library"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
index b892e0ffc0fd..a4696b457474 100644
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedRunner-13.2.0.tar.bz2 12944 BLAKE2B 98060e134cb928897c4a49a66928be645c4dd48d6581792fb699900599d653882b96dfab91d50480928473b5f33eec21f891663f5eef520e43b45119b5c424e0 SHA512 1ede91957ecf349164fb63e284896f8909c88e54c032c6c326aabe2efa3058b5b9ba232e5ca60e71776dff4514a6c23483d9720e815f07c48c10232831741489
 DIST TwistedRunner-15.2.1.tar.bz2 13041 BLAKE2B 212c846c0aa6ecb1e8cae8f13dd016addba200575b13d58b028277d91b95e311d47ae30b260be05ae8404bdd6558119a785a1d3f16535537d0ccd04415ce92b8 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867
-EBUILD twisted-runner-13.2.0.ebuild 423 BLAKE2B 2f4741d2b4582dd5ddba2c6760ee09b0192e202d06bb66287874309b737694cc6573a3870b2ac9c5f4796b0721c9f6e82a1688b53f686b840894925f21d212b4 SHA512 6a845d073e337d3da50e9e088055d6cbd82d7618733d1a1e9339483419daa8c3272ca75d2860b72c00bb0128bf38c91058121e3f115a76bb25fc189fd0455310
+EBUILD twisted-runner-13.2.0.ebuild 424 BLAKE2B 8d7b2a53d0a48734544ecfbee382a0df6321180a8a82ee7ece3d2248ea21a6d3ba8e48747b0b4834ce100e4fc9f630d7a90ad4f7c358bbc77b4289bddd2f0667 SHA512 93ae4fa8f9144f7d1f0b6f0016009855d287179fecf81c0d9253eb8acd874532423ea9635bc6158a3ad44c46019bf02383b2abdd1518792d7ac88566b19bab99
 EBUILD twisted-runner-15.2.1.ebuild 428 BLAKE2B 0d86dd5fca9596bcdda2796507c1ac85e4becc575cad006cad29bc1a7c50ca14c8cfdcd999b47eb59bde649b915e997d36305e6a741e202a6a8ec2e715adb457 SHA512 3c72076553f76e97f9f43f953ead87c0abf8422f2aa78d8c2117265049fb4d3245f476ec5a551af8cbea9a9bb6773f19750c9c5e0558174577b6453a9c28d164
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
index 92143997d6a9..c6f492148337 100644
--- a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
 
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index 7d7d5621117b..9b0ac0ef2d67 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWeb-13.2.0.tar.bz2 403931 BLAKE2B b003889c566b9063ffbef9eeb3f98af22eff4ba1b10cf2db1eb76ff3da08ac45d3892790943348c0d1cf4a28d8e66050aca9281409b47e48df42ec036a25e1af SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f
 DIST TwistedWeb-15.2.1.tar.bz2 231092 BLAKE2B 2bd561f973f0ce8ac67c1ee947f07b9b4fb82f7cff6e543ad324d8ef3e60d3be28b6290abd173362d49d824d4d4c23223361d30d94702176c385f5b9a7c048f3 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1
-EBUILD twisted-web-13.2.0.ebuild 1108 BLAKE2B ab9def630b28c2d69908f4643450af27ff8856c8e35c6d201a17926f5f20cc63e8915bdbd822b28f8b95f7252dfe6d87631a4e8c1d84d435277b2a86b692487f SHA512 fe457b5e3569a2e5a191e6096d624e5440918d45ff8d9ecf6fadd60a04c8260239dac1e2743fdd42f6d1703e9557ce0fe6387cf5e488877373deea75a955cf75
+EBUILD twisted-web-13.2.0.ebuild 1109 BLAKE2B ba97e79e0384c54895a3987d51f57729b1de48608f641abb5cd9b5957c9e030049f7581cfcea3a585416ff18132f25d8a7c9aee22839e0c9f1d4c7968176f7a4 SHA512 92586731d435098c1306cc3963d4350e8407c250ce174c3370f3a754d2aaee20a9ab5d0744785644e311c86022a853cfe4007202750337ae5bbd745dc3490c6c
 EBUILD twisted-web-15.2.1.ebuild 1114 BLAKE2B 3e00237256a307ad2ace477a21c42760238b5674d91ae689073f6a8fe38e6aaeff5ca30abfb77ac69ec76955ac46030dfb6e28fdf2153a83b0ab99b7960e082f SHA512 05c64b97c4e5bf7f87b4bc2057702dd789ec6a769c264bb80e16bfee7861636c577405d3749880ec8828c3ab44d76a726770f396f7653607a6963e521a1e7995
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
index 164efd25d20e..8b31bd250311 100644
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -9,7 +9,7 @@ inherit twisted-r1
 MY_PN="TwistedWeb"
 DESCRIPTION="Twisted web server, programmable in Python"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
 DEPEND="
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 332e2c72bbab..f94f5e298698 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWords-13.2.0.tar.bz2 176411 BLAKE2B a8972dc504fd03a5d3eda5a6c908989ca6561124617b12cca5b1379fb1cf5ee37aa52c798b08023d1e381e4738c784091188c2f07952bb2192ba25d027907b4c SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105
 DIST TwistedWords-15.2.1.tar.bz2 168483 BLAKE2B 55d83e146b83212ad42d25479fe59b88f885e948127ee7f52afe69da9d5513ee709c7ad8bcc564e1e77cdcfd63f3f1592624e7dd7d957bc18a753a94a4ef76aa SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7
-EBUILD twisted-words-13.2.0.ebuild 502 BLAKE2B ffa14d29f581742a3761f93eae1630cb02e89a49ed4eb9edf753f0b41886d6f57c56114259eeb7df8a570e83e34eb1bc5be15997e6119bdfd6a946531d09ce7d SHA512 305f00edafb146c4af17f7c17594c91a276af3309eb6828c0e3231cf6b57cc87e789b91fade2716b926b4017e7effc476f19996c67f53e972751f08b9668f8c9
+EBUILD twisted-words-13.2.0.ebuild 503 BLAKE2B 804335a816072f13875ecc59625c9bc2c455c915573ffc958248b973f089101adae42c94b568beb34dbd7bdba7566fdda225f132ae9ff379fe9beaa984694e1b SHA512 41d0bdffc034fdcaaacf29892c6225d5ceaa4512380ee6b6223581a2b2f59ddc6afc9ebf79790fa8b9ca2d87bcfecd4c27298022c14760ace39956f8f52e60bc
 EBUILD twisted-words-15.2.1.ebuild 505 BLAKE2B 594e0685ed44c0956261489557532545dd284459bd426e945e2eb1defdcb682a7cc1876ded9b943c9bf15b801864bbdfbe17819008cb8d2d1f74df377e3d4cdd SHA512 0be3a1b8121cb6aeb821baddf9a156c849ad0f9ae2de6c30139e00915b181f1a69aab61222f6ca879c29dec3f9bf0a91643c4cfb49e64f382bde9132a0de9170
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
index 817f04c70b5c..33d23604bff3 100644
--- a/dev-python/twisted-words/twisted-words-13.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index aa009989555d..14d8d3eae00b 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -15,7 +15,7 @@ DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b8
 DIST Twisted-18.7.0.tar.bz2 3063847 BLAKE2B a71e7f0f2888eab2849b90405350194091731730e8507172744212b9af73ba440a0c21d5c5a45ae987752c813c07c4dbb06e0e27a8c8e436d7ea6f7c3026137e SHA512 feefa578bc1787648df07e4a53bd6fe29b43c4357472e4fba37526f075be9263e8c671b6781ce6ad3569c1b1666cb702efbee903f597714a749971695018f826
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5780 BLAKE2B c40ba84907c0f150c63b27043f4d901b382a0bd2545d4b93368677d458bc3ed4b27146e9b3a89ff034afcaafe0ed0b858101f62ee4c99ba641247d83dbd6af79 SHA512 067865da1b4c3c59188cbd3edadf87985d68382ebd1a28457b391101e27efd6da11d03755e5d58bfa2650605933718710b6096053decf2b9c0fce8f7a0abf8d7
+EBUILD twisted-16.6.0-r3.ebuild 5781 BLAKE2B 903214191b0fe8095060db2c972f6a64f50d3610da00f50f627811405342e878cafd726964433187e3d66fd000443b81db55348a62e8a30fb984634366959089 SHA512 e8cce4249cb0c9f4afd788bae0dfa7d88bd4faacf59f93f5267d317332d4d578107e7bb3aa686a64b896426b2117499c1110153d27bab54a22ae83c2e057b443
 EBUILD twisted-17.1.0-r2.ebuild 5806 BLAKE2B 4f226dc0edf4c316d641fbcf9d0686ea5e432c7c9dd1ed9798e121d5194c7ca3479a793286d08e3b6f6f4d16152ddb82bb6e3d1a9184841c34fef0cda964da50 SHA512 d486b29ff87b1c3fb839bc1d9b1e52b6ca73a5070fd7a7ad2562575d402b18f5e565888e35d772db7b276c7db9d15e169ea3d535af8fbb26033e5e257513090d
 EBUILD twisted-17.9.0.ebuild 6083 BLAKE2B 4ed1d5d980a8bc92ef97d74ad26454bd00bf9107c8743e73984e5d76906c20aae55236089ca74e73758e137e820965c8500c951b835a4503d88b816d66c25dae SHA512 784f4db11850b14bc44e3411bef33a9822a2e9a4a99f354c31842f71734723148a0707be4bb04cf3a7a908aaccd0a3de5e6d0f6a8d5cf3829a1f4c4b785a5414
 EBUILD twisted-18.4.0.ebuild 5951 BLAKE2B c964dfc21f41e6222227e8ce5e5901d1b2fffbdcedbb92eb3cc0365de7e032f8b07e823dbf2af0287f4e6cb09f745fee061eb309d019c9605edb87c4d1d612df SHA512 c7e25e4d8c59c4f8f7264074ea23e58214cd797476b424b51eebe15b94f742d27600783e5bc4d56d43aea385b55df8b07f9e27f7020e0d3667585365eacb5260
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index dfbb0b376be4..0a61f63c5bec 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index f1fcf95e2ed6..971023cce583 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,7 +1,3 @@
-DIST txAMQP-0.6.2.tar.gz 20749 BLAKE2B 697271755e2f736424cbbaecd6a009b875326c0da9fe4c06f03da9c7b662ecd263c5ac4c770debc0c8c65098e2d01bf9ca74509972b5be56da8572a43260cd0a SHA512 676797a5ae4e013d3cbf42e94f2a3e0421c9db0056e2abaee7bfacbb2b31b50948b5ac51d389ba6f8c609207a294c35ee9359813f3151f37d049092bd1aed78a
-DIST txamqp-0.7.0.tar.gz 117964 BLAKE2B 0ad4c0e9606b6a333ee55f8717d8ead587e5980274d84f1c04652461fddca2f8202485c0f13cba8507ecd7049a1a414166d685326ef146f4d14d1734f0634065 SHA512 8af8dee44885fce6a8015fc3763ff1fd6a3effb8cc954b5ee2baed7c652a34440df4c6d8360b22930dc5b488e9965c3f8ad4ff8d49604ad80e31b6de70c233c5
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.6.2.ebuild 515 BLAKE2B 9b305128a5cd4338a05a614015af3789f22a7a292f8e5da3cbf3a07f6882879e176c8f077bc35603a8eb806684cb1ef6074ef8defb74e512fe475ca4b445c270 SHA512 f1c5418b953c91d1f6ee56d51d9e07e2c013e54e5fb463e8d2b35cfdd06ae82bda5d4415273d5c11f53bae1b42b531e549097d922b20a5c5dc1a7fddc0f1036f
-EBUILD txAMQP-0.7.0.ebuild 1333 BLAKE2B c644f85fedc7edc8d3c643fb744cef4776694dffa44467223758163c6d9b2dd22bd196b15895deb52e0525c856349260d18d4a6bb3bf95a6e8e442c7714b54ce SHA512 d92469eb0a1415bc70f0d8eb3fd5116b2315bd2b0bfb392acb7e0a0f69278492157d9f6b56002a69d45f9a33ea68de78d9a2143e220402e9036669a0c678a8b0
 EBUILD txAMQP-0.8.2.ebuild 1428 BLAKE2B 0609764434c8945435ae872aa514f4744eabe79b0b8ab23823e2f82174dab20dfbbab2eb5a14f6fee9f8ea38942adf0cc5c4004a069b23fe9ba03aa761365516 SHA512 4658da0af7902366f43a8b56e682a384cd4eb83ae2ec2c112acf3332fdcd95b2f375112115c99d48405b159d7b16abf4a64bbe41f30ddca9231c7ed647fa7858
 MISC metadata.xml 423 BLAKE2B 507dec1a447659fd4b519d029b63840460fcf93e9c5cc1d97e7eb0ae1278488c7f4dfaeabe53510da3c07cd079ca9e083a39586ba8e0b99a4e54e44efc27d3e5 SHA512 e80129432dd18c5d4e08d25d560a7144b6589feffe3c0bb6dae249868932fbd8290426531140bd4b0d124b1b06d198527d1a225cf454454f195a20699482a09d
diff --git a/dev-python/txAMQP/txAMQP-0.6.2.ebuild b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
deleted file mode 100644
index 8feb2695f495..000000000000
--- a/dev-python/txAMQP/txAMQP-0.6.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
-HOMEPAGE="https://github.com/txamqp/txamqp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/txAMQP/txAMQP-0.7.0.ebuild b/dev-python/txAMQP/txAMQP-0.7.0.ebuild
deleted file mode 100644
index 7220086d7f04..000000000000
--- a/dev-python/txAMQP/txAMQP-0.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_P=${PN,,}-${PV}
-DESCRIPTION="Python library for communicating with AMQP peers using Twisted"
-HOMEPAGE="https://github.com/txamqp/txamqp"
-# pypi tarball misses necessary test files
-SRC_URI="https://github.com/txamqp/txamqp/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
-SLOT="0"
-IUSE="test"
-
-# TODO: split twisted-core gives minor test failure, get rid of it
-# when we port revdeps
-RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-	)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		net-misc/rabbitmq-server
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-# Tests connect to the system rabbitmq server
-# TODO: figure out how to start an isolated instance
-RESTRICT="test"
-
-python_test() {
-	cd src || die
-	# tests look for those files relatively to modules
-	cp -r specs "${BUILD_DIR}"/lib || die
-
-	TXAMQP_BROKER=RABBITMQ trial txamqp
-	local ret=${?}
-
-	# avoid installing spec files
-	rm -r "${BUILD_DIR}"/lib/specs || die
-
-	[[ ${ret} == 0 ]] || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( doc/* )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index d7d43bbf4da0..930b78b6c615 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -3,5 +3,5 @@ AUX txtorcon-0.19.3-Removeinstalldocs.patch 1755 BLAKE2B db819619ede7aec946226cb
 AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809917fefc21603a4de86119ab54dabad0e1258c8a387c632bd034decf1ea0d6a0a829246cacefd8651b84d1aaf10b55d2e5423d6ded58b92bfbd SHA512 3131dce9b4f3bf15d09ebc87b323c06bdc30a833ab7c6a964f31599d0b21fd5baa0c696af1356db58677c58d803033e786a80db1d46444d92b91a9fee2736cf6
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
-EBUILD txtorcon-0.19.3-r1.ebuild 1957 BLAKE2B ae6709f35298bf15ac2eecd04f36a24e57c1d1758063f275f892eff932aa678cb4aa9f8638e7ca1a480309c3bf1642004d05cd18e338897bc05e22ec24abd621 SHA512 b52dc0b37b95539a2f9ef663835805fed638aab646e31a71510c21ba88e14bf868545688d2bd7e104539cd1ca7bba625fe8792aead9114420c6467af4b607ef7
+EBUILD txtorcon-0.19.3-r1.ebuild 1778 BLAKE2B fb05d3e43b0b5deefd796004485e658bd3ac755a847e618f4dbdde94c084c349ff2c37ae87f48e2f7463cc79dd36db026edfe75a974881c875fc26dca4f9dfd3 SHA512 081b9383013286c9c2b9cae3041bcc235b81c91ce8e9b1f250e03331a8d8341446dce66ccf3b9b34e90d073667d3c9d58e74a27949d3ad62509de335f2c7008f
 MISC metadata.xml 532 BLAKE2B 757c7b063ce80fd9a6c8534be25740c4dcb59a89b217491cb83bcee0be8ed9fe03543e2cd74da076f366a01174d0b93839642bd37808b41e2c9a9b72fe494b2f SHA512 34e60662826b41e73c51a35105adeb3a80a634ce620cd42c3354b3faf7651a1e979f66f140cf7b8f45b130170735242d4c4d7a34d018ec9cd9d717b3b6cc06e7
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index a699641c2411..44b5ad81aa0f 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -19,13 +19,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/automat[${PYTHON_USEDEP}]
 	dev-python/incremental[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7)
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP},crypt]
 	>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/automat[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' python2_7)
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-3.6.1[${PYTHON_USEDEP}]
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 5c85a1dba6f5..a32e665b4575 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -1,7 +1,7 @@
 DIST typing-3.6.2.tar.gz 78726 BLAKE2B 80adf3cab2c37ce36bd33d14e475ed07918ec80ebb5bc68a820abe06dc862fe6b38e1a90f9bb3d37420b311cb4a32af871ae2ff72807daa8c1a334b6cbbe4d2a SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981
 DIST typing-3.6.4.tar.gz 71347 BLAKE2B dd49919595698347ce4b1004abd075409296acf11e10dd6ae0697d2bf94dc9d1cebedb2afe454be95eddb80fd0a60aebe14ddadc8df8de86545dd2ea05986c57 SHA512 f595e0fc395ba13a129ae45681faca7b199fd5c23e8f1573f49e2a6f162b7f2aef680306e76cbf50b978de9f047c674323219981e89c476474295bb8c02211ce
 DIST typing-3.7.4.1.tar.gz 77982 BLAKE2B e770b1c028142a70799732159b295d3bd5c4911619fd5f200567f8b27813d86de643e9b79aa45fba8590c1e2a6c96c1411dabd0707190a237a79f6f11851e1e0 SHA512 5f5080bf66b1de094b7984ed3d1de22651de8ca018ffde927dfa67fe65b13f91602a877faa24e73d44558638b609be276b924b894d63999bb93b0657a2d5ec6e
-EBUILD typing-3.6.2-r1.ebuild 732 BLAKE2B f269b7a2567c7383ab4a63d97e023a560ddac9d7031356735bfd67a50a523b253a252dd67a31926a8d1935379eb10a5166ebc8446a8d1ade2c0c794266d9009f SHA512 49edc4d7fa5833ac5b5f909b1302a96655a2aecf58ea6f72525c6316473a502c1ad9173a47d5f3d6ec165216d2bb2fe277050583383264c32f7cec4b9dfd8a8a
+EBUILD typing-3.6.2-r1.ebuild 733 BLAKE2B 206c1fb73fd0c6a1b3e368a14a378c91107e5f358e06af205d34d5a36428c7dc398af8d0bc2cda953f9895b8a033518917064631c1ce45ee29b0338b53832064 SHA512 6ff4b1a063540832e662f0b907638f39e8ca7c5ee20c7afcd7f429c660a7135137c5fec2224978788988b7c404f6bb9431c515e6c68c0297c666ff995940ce05
 EBUILD typing-3.6.4-r1.ebuild 767 BLAKE2B de260ea58a8b531653b26ed2663ca188c2f86a41f621bb0c9bac4fa90867e544d740cfb2d6e8aae36bfe219f678d63b2d8d204e95ac8050909291432991c5857 SHA512 5c75453e58f32ff4948bc001b745775425d6e51b4b9ffec0ace1e9be36ebba9f6e86178153cb161e95da2f6590e2de13ba5393a5b02b95f24df1f96cd5088d9b
 EBUILD typing-3.7.4.1.ebuild 957 BLAKE2B b8163d6e2cc71adeefe32529efb7eda65739ef1fac7416bc375429f3eba102ee37146aa5b81d67aba6a0336dd24f743ab19b908e7e43146e7a7c913f5e7987e6 SHA512 08cc95972dffc040a6e2ecc8f8a5a146a0650b48af21daddfbe53af0add3b0ade0c70a81f3b4ee26fdbf3060c5cf5b858136a919498228334e17ccd647dc8938
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing/typing-3.6.2-r1.ebuild b/dev-python/typing/typing-3.6.2-r1.ebuild
index c8ed7ff223f8..8a187b2bf385 100644
--- a/dev-python/typing/typing-3.6.2-r1.ebuild
+++ b/dev-python/typing/typing-3.6.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index ad659bca3c04..8ed2a29946ae 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,6 +1,6 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
 DIST u-msgpack-2.5.2.tar.gz 17641 BLAKE2B 643984fd9ed2f87ad0cce9e64aaa064465048067098bf01bd844a04bc1b870d6688eac6bc9f1dddf9bf705fb14bc332796f06b8b59d0dfe79261e85ba11b60d1 SHA512 cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9
-EBUILD u-msgpack-2.4.1.ebuild 863 BLAKE2B 851afa4b73a631ca979ec61318c2165cbabd0e7dedf357f88c1a490d1e92b99dbbd9660a38db7b441d1aa1f99546ca9b8616397729bcfc5436eafbb20b3e6ca5 SHA512 609963506fa5eed159ebdba71cc18585062a3ea1b44641733f82367a7128a12151a6257fa993ee28b20777450cd2699f8c1d9753f2639b35efcf00727f2aff66
+EBUILD u-msgpack-2.4.1.ebuild 864 BLAKE2B 9c9214c89848f65e11f4b018067cddc527b0720085c98f9bc54e922deeb4a946875a285e9a84874d2edfa8cb5c32aa5a79aeeb90abb8a2b85e8dc56442959e8e SHA512 7900508f85020253d942ff51d4172b9f33545d01e62a5e38213425b90a04f9d82ff9592d75cd12f3da4cdcf43579d8d421280c1167258e42fbb1df658cbd0737
 EBUILD u-msgpack-2.5.2.ebuild 669 BLAKE2B a41b0eae191d46d8b7581477200e4e9d1e0b7943f1f67da9c349510c673eb04de627e5cfd2512d90cefc9c3fd39f00f960d53c1439bb5975619a3a0716b15d69 SHA512 86f4f565616497b07e836e37f3160a1c0c82f69ee35d33acba999fd4a55c520058250aee871d125b8fbbcafe44bb19e3f3a6a0bd9cc45201c98f0bcf28aeb150
 MISC metadata.xml 907 BLAKE2B a60035eedce681b6a0c19ce0d701082b64f83ebc121501b170fcfb0f179fa60348903d215435fbefcebf65a1beae39ff00e1757d6b6cf04bda82bfbe0583b81f SHA512 6c4ca8d0bb44563efecbcce894a6697758aa203814124bc45c1743d91cf0ebbf34f6ae868fa1a76f5a16691a37bf8b31fd36070044b3ccce56187abbcbc2ce51
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index 8a807125988c..a2fcbf641fed 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index b04dbcc24eed..9376fd8cafba 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,4 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1.ebuild 562 BLAKE2B d8fbd0818d6f72f607945073e71450e9e7af43be4eb41f928cd4a34ac65cfa55bf871d7191c25bca316a1417eb70636ed8dd0fd2edee5fd0f2a07383aa0432ad SHA512 6db1d4dc305a580b22821219f96bac3830927ece1989580d14d33a92a6840645a928e0df7a7eff0fa1fdf1a462608b0d89c781fdb96d6cafe08949526403937c
+EBUILD unicodecsv-0.14.1-r1.ebuild 501 BLAKE2B 518685699e710d8f70444d289bd0cb2f41ca0ddeb7843b95e27749da6130b4e8c92d416072eb13843e1834a165b3e3e0cb9ad53d2983f235040d81767c336fe1 SHA512 692ffa250698abf2becdffe6be2a8bf6c72f7137d3cad12dfcdb846cb0b02d9e7ef2e733fbf2ceee9bf9c0c1fbda8d29126b70ea829c2f04dfa47e34128d9e7c
+EBUILD unicodecsv-0.14.1.ebuild 569 BLAKE2B 74de058c4a28781ae2342d9eeb7489a7c774e5b62c1510593fbc434e86c0db1d318d00bb58213408f746c97855559c79d31899f1a64544fee48bdb4f2506d3fb SHA512 fc7609768b4a79dfdcf987882db6ea4d796056071c8dc63ebaeb0eb1e7ccbfa0b8443f73523901c8b0a151744c2b16b48f15cbdd9cf83c635674e738705534e7
 MISC metadata.xml 377 BLAKE2B e3a9bd3feb345bb487881810f332f1caa566eca8ba8279876eb6936dc98c47ddb5008623357b82a715d1459f3c50cd5e9b0e00433e678705b433a832d0f7a268 SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..0e140b7c1aa3
--- /dev/null
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
+HOMEPAGE="https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index abfa9d11c8ba..b419261409fe 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index bc1e1b3b9b35..80bc39ad15fd 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -3,7 +3,7 @@ DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30
 DIST Unidecode-1.0.22.tar.gz 208877 BLAKE2B 21df38361b9b66f5e2d6822afcdf4656cfb240dc679f7469b41652b95d3a6921b9409a65891e359708f5bee09dbeff1885801ca3842c8ecd12b31e31689d69ca SHA512 f7663b320040bc750bc10ac0ed222e4feeb22c903b103c148cfa31e9d4cbae146d9668dc45c6efc82e8ed28e0db28d5de5e3ef1259c712bf317f2c6b2543772a
 DIST Unidecode-1.0.23.tar.gz 210727 BLAKE2B 2d19139e2b337bf979585b99a5fdbe0fc629487413a0bf9928fff954f99bf06efdf59a85ef623ab9334e5420971613d8b748bee8173918e099c33c9210eb2c36 SHA512 f3f48a1c06942caf06a9be29250af6f2ddb022cbee6236e2f9ab897af0b11517be3300b4a391dd89befd531b138eb1c163f9bfac178496c01ff2870b6a522f3e
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
-EBUILD unidecode-0.04.20.ebuild 574 BLAKE2B 51cbf4cee79c8ec4b0fe96bf7a4ab8104cc065a26a215ae9c73edfaea16593c21f0e5e8e39d56ae80992e1c0d79df655f270a58f3df5780705b014a08003e4a0 SHA512 c27e64df4611765be29ab929f9856d113e9eb3903699f99462482cc78b6f782ea435b0915e9f2757dd330d7c5199b8a5404b5ec047b8a16247ee2c73d712b08a
+EBUILD unidecode-0.04.20.ebuild 575 BLAKE2B 47216a591bdfbec46151cc21d2f7ee6a9ae2e68641d148809f740bf979e41192bd735b1ac2c6bd4289aa624a6b9e410392ceca93df4288cecdcb697177be22ba SHA512 61ac17e4788fd89cb138a9d6d7555df476ed1feda6797b241edc634ba05c9bf9f7d77cdd8d7a1ef15656874d0bcab9083d3d984cde77189527294cce518b38db
 EBUILD unidecode-0.04.21.ebuild 589 BLAKE2B 861ed8b52084edc3120fda5867487864077ce31ccc72ffa7e3076d2fc5cb48d88ed6b9dec1aa6e6146924eb0ba708f72cfbfbce3356df4a16f87edd80875c3c1 SHA512 f5e5fb77b42f1f2f127bf20cbe08243962d7228849f7b8de57cb3d3660e471860bde278613e686d08ebc6562a2ed47dbe3a1bd33d08dec4600d58fbbb7d57723
 EBUILD unidecode-1.0.22.ebuild 597 BLAKE2B 6ecafc2c3517881f9dd6409f2024090f5d8801b5d3155aa1fb619db2d91c5765b5386ae3e92b1b6d156dcdd07f133e7f6cbc1f039ba4f276142954a90e64d436 SHA512 df55a02d2a464ad2526e18cfc3b338fd651f803dcc1d47f533fd94ed5c5736afb4b1a3afd9d6b4580e5b59da0533f12db74fd73dca61eed6a575320593d54717
 EBUILD unidecode-1.0.23.ebuild 680 BLAKE2B 63b883d25715d8e427b4db59726fba9009d99949cfc4413e6ee145b21db290e5b6cbe01da234d50b7d65e129f0483ce9ca4074bdd30753699ce15563f2a22dac SHA512 193d1449e2072b93f0a7d4621d140e3d94214726bfc5a817c7f7807b37ca12b0c230fec81198f62e9b23230c0f986b8cd755602e6d075d77446651080a49e537
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
index b73c07a2e5fb..f2fc9fe4034b 100644
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index ff4139659178..e7220582629f 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0.ebuild 995 BLAKE2B 4a9a1100d91b56a6b3ecb060a56af96551347a3154b957d921dc1f2ea1a63f557d4ae75f8a968517033666afc3c4358755d9b8f0476a7b4172dea635d8b13fee SHA512 83a218d9ae043b5baa27d7cb8043e98fd669ff1c7c73c046cf4ab3f620c830a0c08394870f98372e0d2877346a506ef2678f11a0ced50d1dcccd011a35276f8b
+EBUILD unittest2-1.1.0.ebuild 996 BLAKE2B 35b93f211973bbb02338931a5c420ab714006639e116306f6c2727813fb247c17ac6f47694a49a422feb54b09fec38ef72fb281fea1d8f87371597b345e70ab5 SHA512 46ad9627ee1a997135151d219c12b470699c4a319137d83760d12cd995df4c445097b4d3488b2251325e4ceb1972672aeb78491b12d1391829f0ebef199e9a12
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 0e2918f6f6ca..b7929b5aa637 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index ea5c25da29b4..f9747a5630ed 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,5 @@
 DIST uritemplate-0.6.tar.gz 3508 BLAKE2B 41abd9a347a6ab0fae668a63c185d64e857cb88431a3b8ecaa673076a1fb700869c1679313ed772c2aade5952cbad7f0ce898f4be4ea280fe8d867cf1c280911 SHA512 19e9d2f7cb6275c1a3bc6e287d9d3bdbed4391541f29765130a8e33825321e33fe3220adc349794d179354bcb9d77571ae20ba7836034962f3713994c7cdbfbd
 DIST uritemplate-3.0.0.tar.gz 30038 BLAKE2B eac4deaa980a9a4618a245bfdc8b3df2180a4285b9197488e7556e3cbce88c4a52ee8bdfecc5f500d80d14a59f8ff0e1ecbcb3aedff422fa9853cb2d40e25df4 SHA512 9988ae6db1d0234a2dfb393ab0205dd7902c814b8a85e06a666b8fec44cacec90fc8852b64da068242cb57cbb2ed63478567224fcb6751df82605d1f0881ad6e
-EBUILD uritemplate-0.6.ebuild 547 BLAKE2B 4b8915058a479a3417548e834b6d8394ebc367fe02f1cc8c782291c721b12055be5d4363e85bfbc8432a5f4e30b37b902c4c26eb9a6c2c53ee9dad7ec42a6e09 SHA512 dcf2be4334b45d2afd7dfce78c8fb6f0f07e700cb75348eed258a231bb0e52cd9d5186c3d52a8d3eba69167129787d9aa5d88d605168fb1e2b27351d2dbac089
-EBUILD uritemplate-3.0.0.ebuild 558 BLAKE2B 7743a5be5337b568c04f79045ae45d5ad2a173025aaef0e7492ca87fac83277dfd351de54eebb20551991b56294405779403f62063b6694d0c43d88b74f055e8 SHA512 ca1f5fa9b290e1bf0ee663f2be2902697d94493e3dc33fe122083d5accdecb7ee4edf013640d16ab70b61ae8b4a5f58a25eccba2eaeaed6945a0f6da27343678
+EBUILD uritemplate-0.6.ebuild 537 BLAKE2B 2295bbf5a9b40953d80ace390ce0cbd0db0db8b7bea3dc99628e5f1cee15d23b27a09593d34afa28e356a051ddabdc695475c3546c08d01402cc08feb8c90c61 SHA512 fbaa48c8492e121afb6dd2814c8bbad881695763c13cef47968bc458ae8dd87ea54d4a96c9151dcba4a79dca4aecc03ec7005ad6e7138943546b01a618f26875
+EBUILD uritemplate-3.0.0.ebuild 548 BLAKE2B 70c9b5bd863dcd1427231cb798715a06d3d00014661d01ae3b39aeb1602722385862b59576606e1622d1a17e1bcbc1defc566288664f0addb37157801f1cd3cc SHA512 5d92b7d79ec2b0bacf65d6cbac85e44d604094f684185e350b81b325e272980ad7ee56867f7548fdfad67655625f22620c4a0c35735a51d96f60bdeacd9228ca
 MISC metadata.xml 324 BLAKE2B 2279bd09d0632113a7f87be6510c579d6fb0ab9feadf54b1196b68591c3ce0343e26d862cf045261b52ef9b9a535de1416d26a57ec88f82189bd7a9dc3df285d SHA512 ea995ed18707c72981d9174d1a35a30b0c86eb9035acd9b229766d0c0e5e2baf25ccd2bdd1c5091e58b2dae799643c1af81a3fa18b66ad5795ff50595d27a51e
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
index 570f4547912c..88dda851f425 100644
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
index 3bdb0a01acd3..a4ea032e684f 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 4b7fb8915165..e817adde8f28 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,7 @@
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
 DIST urllib3-1.25.7.tar.gz 264636 BLAKE2B 32ee47df52e0d164865400ecb5f0b65d3640173b53e1d9cf8f2dbdec46ac34d56ca66991ab719d9fafb8d49440630a3318312a925f11e3c6b8d26cfa72600c4a SHA512 e43c1b7893488b77a38a9fdcfc9760ceea72c53cf176eb8e4d1d9990732c5c1936f85c653a646eaadb3eaf72a99ccdbb5023430b97beca6458b868095005eac2
 DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496652d75220438f8f9cfbfa96c22a6fbea29380f45f18d8620d14568056dcb3e8b6a08fe711085298d2f6b2ea870 SHA512 6e380d98d9a8b06534abfab4eb67b685a8311a091e31adcefe2b0ffc61d2b728229df067790b20358f2646e9054a546450c3351e4aa618f31d85573ea50ceaa2
-EBUILD urllib3-1.24.2.ebuild 1546 BLAKE2B 39803592372309905dc6371995be59211b4b94e5fafcc655822be8377acb78ea5afc6af7b2324be364e99ad9903c9ea4708cfe7e22071b868aecc7a4a6a8a389 SHA512 0e968b1b8d9f92fa5874b5cad6db3cf921d7f12dff271d45c5a7549584920e56f8b5b87b43cc24a9b51f2765ce0969832c24c0b331a908dbf73d4596fe3ee9ac
+EBUILD urllib3-1.24.2.ebuild 1547 BLAKE2B 395b4aa38cc23b46dcfad2f6628758599145ce49f9b527a3fb7c0ab99f3e4d69ddf822a7fc6690f8f9ae058b2207db7f5389a943e2dbe0a72fb711b66018ddd1 SHA512 80bc2673f42b1258939204e052f582342b67775cf377208572d1a873dc02b9d072be4dc369e6987258aef0e8d0785b524c9aac0e6d1634e3f14929b30c718e46
 EBUILD urllib3-1.25.7.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
 EBUILD urllib3-1.25.8.ebuild 2255 BLAKE2B 84acdca971d5a9fc383322ae91f2883655b7de7a24c2e3bfc60637f9ff92dddda45a63ec72fa3d3736b678639ced3761964b5c5ca7d6f0b333c045489d235e4c SHA512 f998e4723410b7516dee1e64805146a20c3ef2a5b9dcdf5d0556b529af04b13535694205ecf3ceb1c6d1086ad27a52810980c5f7322cc57c6248c710e0b77761
 MISC metadata.xml 462 BLAKE2B fa1a23ff540c36b4d00a665f92e4fbc3651ef0d91669c3181b01c6caa3c0c2824ae5ad498c784e13b2b6bbd1763a6eda891385ac584c8657843d61eed03ee952 SHA512 b82fc435e84e67e5536dde9edcd40644706eec6198a65233db5e43f20027ecf70a827f33f7d6b34095151ec7d33b6935bd16022355ac2ba87657185d35210aa0
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index 19eed900a555..5c781b4effa6 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vcversioner/Manifest b/dev-python/vcversioner/Manifest
index 286c6f90ebc5..1ab589698dbb 100644
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@@ -1,3 +1,3 @@
 DIST vcversioner-2.16.0.0.tar.gz 9024 BLAKE2B 70d61a0d65129c28c9febfae54454a50ce99fa3478b4948fb677b90f52d7abff4c14b69ad8e71b26c45cb40a7535be8f916cdf3951a1ca932e1b7d0f07ceae0c SHA512 e4e34693aa813e57991eca01d20102bd2e939b536461e2e9e063ac0e3558580e57d7e8d5e08d010690b3c901c97e53f187f20b48520b333eb492ec33e85757d8
-EBUILD vcversioner-2.16.0.0.ebuild 669 BLAKE2B 46d918468246547b815a8af504094f8100f557b08b0357f39f1931bfd524689fd93cbaca7395d8372f3bfa550e8243b325f8f0f37388c8aeeeac029358de7dcc SHA512 97e416c009c9d39c1a8416c02f23d722ebdc6be45a56cd959ce90259962600c5ed05de10c1052ed80c7fc2e18b5fe9d2aa199f40f24c9c90360382a011a07b3a
+EBUILD vcversioner-2.16.0.0.ebuild 670 BLAKE2B de1f728050994e254aeae0d2d22e7545379461a02c27bd04a1069792155af3e2f1b1d22deb7d2727707646874463231ed90b05998acfe1e701ac2969d6f9f140 SHA512 4e50b9be9edce392028ab8c982c019b457edf7b643c1793d563047a07b3e13dce03a1ee888aaca35279efaf04c6e35ffe872558baa71c8012d3c675268906b2d
 MISC metadata.xml 308 BLAKE2B 4d08920d23a6a0b63b12dd665f4002efc68eab182ee8be145f7d9f707bbf028ab84daaa2ac37386397173c9cb6251270a7500e776d9f3264d371bade8ac923d1 SHA512 550f181e53960f17bc2aff125dc10ffdce51bfff4e8b61572bbf1133e39a1e18ac8e473880504994447fdeba479c172c14aa0c20777ab4e7b07c0e855c686fcb
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 98c200abb4a8..6486a6d5a5da 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/vine/Manifest b/dev-python/vine/Manifest
index 4c2861ca56e1..8ca33e92abea 100644
--- a/dev-python/vine/Manifest
+++ b/dev-python/vine/Manifest
@@ -1,5 +1,5 @@
 DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
 DIST vine-1.3.0.tar.gz 51953 BLAKE2B e58d750dd7a84f4a3abb24156de6ec7ab84a911692587643cabcb0df750d3768e70b14ea134da4a39978782ecc530f4fa08ba0ecb780a7a32fb2d9b506633ef5 SHA512 f7242378ebc9b591b6e0a7b6263514f32cee4b996bc6461313221b9a391dd0dd1d833591d6e9ca72ae003f6ce5c4204856d49bb5e57c69a125072cac25758688
-EBUILD vine-1.1.3.ebuild 625 BLAKE2B 3e7e7df02c9e3daba96b8a489b88d7f35c8d523e89ee18c8c1d70eb4156748714a76ade39c6143a3e321dbf21e65c82dfa030a0a406a7f038333d7b7896cbdee SHA512 868ef89cbb58055be506a4a79396a4bc06f9d9aae122716bf5ef88196481be075614665ab5c9d96fcdf7e1efa72e576a229c0129efc39195805a35a0785461e4
-EBUILD vine-1.3.0.ebuild 627 BLAKE2B 0e412e931ed3b034b1c933c88e2b7761c5d9d25c0e4b86564b5694e9c4e6c990aa22add9c2f80ab79645d7f88f684fdb3436e9a7a17c011db6a9bc5a58e10525 SHA512 14aa07b2c6c288449badc4f81c8d2132267aa3f657398fe872600168ae7a5a743d42c189a13da32ee5e45b1af0225ff5c6a4b4a2d8a9632bd8c688c258f29a9c
+EBUILD vine-1.1.3.ebuild 615 BLAKE2B 0fb4e35593be7b0e2da855eedd91d5560f5508071572b4161aabee02ab2714d3302e3370fc7aa915ae77c80383a9e179229be0db9397178e9178f330579b044b SHA512 f3bc210c6f6e688bc6e95d31982cfb69d562fd3c834b29df0770134a9a0e1d77e604e976c90be2b1f05e115e34e217f29e4ddd07f385034382e5f07cadfa12f2
+EBUILD vine-1.3.0.ebuild 617 BLAKE2B 9ddaff3a6a9fc46c40d90449bf315ac7e9f677ac63a52a59c33a0d9fd6d636f48572902346364811861ef8fb41e388645feaaecfb9deed2d2c774cf7b2769060 SHA512 e80294cb5fac71295a6f36b4ad16e33785f15d54950547af3b1171489f45ccef1aef89a7b2e8b7a2026c1baaad69bee6930ede6f37e4d24e6ed426e1b775da02
 MISC metadata.xml 336 BLAKE2B c113bf51d676148154f535f077ce15d52100f3f2acd6e7cdbf715f41876e6401cf755d980d66cf61bc4b0fe0884135fa8478a7512c518253d081e3ef5b75494f SHA512 992b2b4914db3beeba877533b6ad293f6449f230e2eefd8ede373cd1f9ffaeeb79fbb92234434b38c9c392a88e52779e5b0cdc6b4f1e3f69098b7847925ec21f
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
index cd4e2df612d0..884156772b28 100644
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ b/dev-python/vine/vine-1.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vine/vine-1.3.0.ebuild b/dev-python/vine/vine-1.3.0.ebuild
index 82e0d8e87842..d4f6f397b64d 100644
--- a/dev-python/vine/vine-1.3.0.ebuild
+++ b/dev-python/vine/vine-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index ea48b04eb883..908c7c9ac830 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,14 +2,8 @@ AUX virtualenv-12.1.1-skip-broken-test.patch 542 BLAKE2B 8c924cafcc0ee78b3101d55
 AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b230c2502691f36f49502427c234c8b2da1a2d187791aced234fd70f7be98b98ff158f570747e670cc0ededdab1d5ed499d7b8588be SHA512 17f2a38d32f17c7f8bfe138939b6953dcbf13404371b8377a47759118ad37aaf73f45f670d46d5956fd5948754fb9c60248d9222920c6fd7e7c2e7c7661c9a18
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
-DIST virtualenv-15.1.0.tar.gz 1865011 BLAKE2B aa460d9188189bf44557417a3a878f4f58d6c4a66fda2da5dd9a69e2ec04a8be6b5cf125160b1f00b4a32803dbf8231a006974499e9110101cac5e522d82eaae SHA512 46c313fe855483cf42def0ddb319df7513bb00ea2c1570efaf1236b4e0074df40d574f3858a3d3760db988b9021ca2046c40a355cc5a3ae32a2802d6120bf255
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
-DIST virtualenv-16.7.7.tar.gz 5113918 BLAKE2B b8189a2fa2c76f5571ff8964e644971ea3a2b7ba924eae860eb41789e3bfdb01096eca4a338a5b9634698ba4920a3ea77a5ea734dd7c6997317661ee3e7ee6f5 SHA512 d39af559c79e1a254bd6aa9a6f20db858867f858dd8cbe44141692166e7ab60bfce6f666250113cca33180a157bc65015c14ec554df335f73c1134120974d2a0
-DIST virtualenv-16.7.8.tar.gz 5116520 BLAKE2B 3a81583695abfa92193f5ffb769546abe4b8f736280bc85bca8c3f5b17c6a5ce4ed83ac2e0ee283b457bd1ce433554bfc515452cb075f4693fe0d127d2eb042b SHA512 fbecf6d0a3cb27e8b88d9063567813fbbbeda95cd6bd626cd612020c6733db762f24119ac1205aa82fcdfd0a69a8a5a084295278895fdd51a3b145aa30860206
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
-EBUILD virtualenv-15.1.0.ebuild 1227 BLAKE2B 1518ffa0109fa93b16d71cd1b880a89718c441fc4e0523be7f3c98f3652d6d8c5c539dfb20a0b502e699ae350a6d1fc8afc6e65f867a401eb4db55619c92413b SHA512 3d085a8c20682c0b8bf223cf83f581c6a1a5fddcccdd53c1ad6c7a03e794c2a414b8609899e4f19fef6d8990e48aa073e88f38507e3cba5038e9c5c9b00c23c6
 EBUILD virtualenv-16.0.0.ebuild 1232 BLAKE2B 9821b7f4a1b039623d354ae0bfe3321302f12fca35adb039410be92af540aecd30867d5331e87c2e37f0a0b6d3c1e2c679a46535522413af08a8ac28fd49dd12 SHA512 21fc397b502911b217ae347f84a40c54d6c35791229fc69c0b7ef3c9d85694080fcc9ef19aaabb17138248ebc7deb129034ca3f28175a195fb11e4ff760f1808
-EBUILD virtualenv-16.7.7.ebuild 1675 BLAKE2B bf6a00be3d73d74cdcba186ea1cd4c1fbdb18286db9c9a492ec689127a5ed6790b5378237141740af37b3dbd6bc7bd3e1cb03fde48fbda2a3261c4f11f7bd681 SHA512 80071bda5ec794ffbff619dbbc6e45164a3f3eea7ac748359151bc316a9332056311e1ab5e4c5236a5d9c402e99ffb88dc39e792fd84bffee896e165654a2f5e
-EBUILD virtualenv-16.7.8.ebuild 1757 BLAKE2B cf76b1789d298e690beb8836a4cc1d4d69938c53004563546439899c13d3e9a393d0f2ce7258341c27a2035405dbf701d687c6ce2c521693ffbdd57f4783cbe8 SHA512 2ed3a44c569a416e89160e0f29d8a220bed8910240b437f4f2b22d5af851be2d060a60638b38045941889ea086671fa1849d5072845050a5b4801898b34e6a98
-EBUILD virtualenv-16.7.9.ebuild 1757 BLAKE2B cf76b1789d298e690beb8836a4cc1d4d69938c53004563546439899c13d3e9a393d0f2ce7258341c27a2035405dbf701d687c6ce2c521693ffbdd57f4783cbe8 SHA512 2ed3a44c569a416e89160e0f29d8a220bed8910240b437f4f2b22d5af851be2d060a60638b38045941889ea086671fa1849d5072845050a5b4801898b34e6a98
+EBUILD virtualenv-16.7.9.ebuild 1755 BLAKE2B ea1ff6e852a81c2faec6d4c7b183b5567cbea9bd63f0c6ddd6d837113dea6f775014a0c67aa02d333c470cfb0f9ab73939d61b8a47e5e18c969d38392b5b521b SHA512 c1bda0869dca2302ff1e1cac6e18af290af5f4a651381aaa9c244577dac417c6db739bf79a8cfe5f06fc7a6da7b47dd3930f58e06c9ceee1757b3ffd75173fe2
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
deleted file mode 100644
index 6695b0fd0747..000000000000
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test -v -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.7.ebuild b/dev-python/virtualenv/virtualenv-16.7.7.ebuild
deleted file mode 100644
index 31e1e3c37996..000000000000
--- a/dev-python/virtualenv/virtualenv-16.7.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
-	# disable tests that need internet access
-	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-python_test() {
-	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
-		die "Could not copy LICENSE.txt with ${EPYTHON}"
-
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.8.ebuild b/dev-python/virtualenv/virtualenv-16.7.8.ebuild
deleted file mode 100644
index 102845894fc4..000000000000
--- a/dev-python/virtualenv/virtualenv-16.7.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy{,3} dropped until test deps are tested/updated
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( docs/index.rst docs/changes.rst )
-
-PATCHES=(
-	"${FILESDIR}/virtualenv-16.7.7-tests.patch"
-
-	# disable tests that need internet access
-	"${FILESDIR}/virtualenv-16.7.7-tests-internet.patch"
-
-	# test fixes for pypy
-	"${FILESDIR}/virtualenv-16.7.8-tests-pypy.patch"
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-python_test() {
-	cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \
-		die "Could not copy LICENSE.txt with ${EPYTHON}"
-
-	pytest -vv tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/virtualenv/virtualenv-16.7.9.ebuild b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
index 102845894fc4..3102fedaf9c7 100644
--- a/dev-python/virtualenv/virtualenv-16.7.9.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index c9905d189fb1..bcbb98868230 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
 DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 DIST waitress-1.3.1.tar.gz 167097 BLAKE2B fc1d0327720daf26c1c00eec6bc617613582325adf16eab9ba49c53029241c5975981cdf54340cc5b051cf8159f0c6e46029ad5c0477adf46b757c4487719130 SHA512 ccb871fc46bd560bff2ece706c826a3407750112cfb014378a06ee077f969814a5695d053665a4d975070944a9449efffd61daab11d03be3b06f1907a2ba0f5f
-EBUILD waitress-1.0.2.ebuild 783 BLAKE2B 4677ff78340370f2caba7b5bf5e1b528a87d3aba09a93dea6564ef6aa2e76737726c362ab2b8a8fb3b3889edd3f321b890a9384ef6d7c727adc8fb87d405ec56 SHA512 5e96afb39a780a309a7cfe8ee77d8eb27a2cdc1d74593af0846405cc4b0dced52aad3e8e9d22c11395a5c2b35dfcf28176f9133134a2bf05e27ecf29dc9dfca0
-EBUILD waitress-1.3.1.ebuild 629 BLAKE2B d81e8fe05b94f75839891fd10cc0d72cdf3d6bef312a8d9b6d3d5ff08958ab6874d098959661348b9cde612f23bde2f2633d58bae8a55e96491632f551e9667d SHA512 4c7aefe16219eac71d6b087aded4e1a987f3fb85f9f4355e89c38ad2f1ea622d3230beffc326280f49d5869dc4cc0c3cf6179f3fbf165cb782b1fb30d576139b
+EBUILD waitress-1.0.2.ebuild 784 BLAKE2B faf5dc32ce5ea236dc21dd1cb92f5d82f030a9e7b35c012ba3483644b4612b375ed3f553374c0d2a1917a5463c36794e7271e926a1e4aa49b3135b968aa3f499 SHA512 eca1e534280ed15d1fb14faa14e1c57df8d02805b58bc9cd9c21dd2604d4f6ee1078970172ce317287f568b5da987c0628f46b2ede294a1dcc85fe223ed250b6
+EBUILD waitress-1.3.1.ebuild 583 BLAKE2B 7f944bb35b668a636dbabb6fc6f5f2e0465ed242f6db3a248a00cf1abc6020ee866914d295633122c565a84c7bc37ff94cce3b5e3b43de311e87fef81b8d0b6e SHA512 e7f8cf0953a36f8cfb563ae01c46a24d5a59c270919786c4acb75216b04d084b5c090d12633534c03a1565b6dc2b77222214747f3f25ba8b43f108599565c801
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 629bc8dfa09b..d6f71815761f 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/waitress/waitress-1.3.1.ebuild b/dev-python/waitress/waitress-1.3.1.ebuild
index 6544ea25f7cb..0b6e922fbbed 100644
--- a/dev-python/waitress/waitress-1.3.1.ebuild
+++ b/dev-python/waitress/waitress-1.3.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -15,9 +16,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index aec32b30e009..02bf5558836e 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,7 +1,7 @@
 DIST warlock-1.1.0.tar.gz 7879 BLAKE2B e132cad7d2d89845f255dca0ab16760c403c375ff89c2f2e465047dfdbe56677c5e52490dab056af6b8131758eaf9abae80c779da96db697de1173901ce4f143 SHA512 57353cb21ee7245cb27f29193d8c0987971535f1bc9f7a8914738ec15cd5712cf7001eae379041c0188e489365f23b0190dc13799b57a117b0bd3ed62cc2e30a
 DIST warlock-1.2.0.tar.gz 8210 BLAKE2B 61e7dc9e033d0893b93eb2e9e82310366dfbc6aa37a15bddbe72cd3a48329be6d5a1b44dd095235f8f828a4e365dbb9f6964e064ef2025c91ca46e6bf119ab91 SHA512 775362a80be7ab37d3a856947cc930e6be74d2b86e59ce44c9e24e54e111288dddae17f7d8b8885ea3d4cfa5674d327149d725a3acf4fc7bb48b2f63f5db63dd
 DIST warlock-1.3.0.tar.gz 8853 BLAKE2B 51b313f81cc7009b2b336d6ea7ecf5b78adfe33b3efee3abd9b2296f90716db25fcd4a06eb6946c26c3700ccf5d090da716bd4c5a7864f285e26bd2504700c3c SHA512 0c60c624e89782009a79a0174e6855a9d3a084403f5fa8fc676ad28c42184ff44c43684d6ab68262045f75588932ab4679dffb05f7762c290741ca645d90f32a
-EBUILD warlock-1.1.0.ebuild 1037 BLAKE2B 20f71086429bcd18d9c0f05377409ac6033b1319510d229854c6f3e1a6de695a78e96b24ebaf917b1f5afeb111896805955383d8f7faf4d0d4d41cb5c8b4fbc7 SHA512 b3ebf0b7d2a6d4b23e6ae02eedece092b2c8c30850f1706242a2f551b04bdd5a3c9f12d38fe89fa0c77b3f607d90b2f2b9d661dcfa5394a90ee1ba7052d7a6f5
-EBUILD warlock-1.2.0.ebuild 1037 BLAKE2B 20f71086429bcd18d9c0f05377409ac6033b1319510d229854c6f3e1a6de695a78e96b24ebaf917b1f5afeb111896805955383d8f7faf4d0d4d41cb5c8b4fbc7 SHA512 b3ebf0b7d2a6d4b23e6ae02eedece092b2c8c30850f1706242a2f551b04bdd5a3c9f12d38fe89fa0c77b3f607d90b2f2b9d661dcfa5394a90ee1ba7052d7a6f5
-EBUILD warlock-1.3.0.ebuild 1041 BLAKE2B 75765b65b0a9baa38f2d144f41ce4d72badff9cad918dab524bea0ea201f60b4f35167b848e37b03293897dd1e58cace138f68fbebf2e24e8d620819475bcca8 SHA512 2791c430b1c5ca004a20ad57d462ae5aa54e18ecad3fdbeea4337a078dde54e1cabfc523528c09f4f382b9899d373a132a72114d897343844d1e54a682933283
+EBUILD warlock-1.1.0.ebuild 1027 BLAKE2B 22a492f2c8352d21f9a86b8cbb4883fd7d7481c300b1eb438d059f0e4d60158350bd3c6b94d25030aa1abf05bb43b9f43f58438030ac088a4c881ce6b1a7e7b8 SHA512 879bdd5de86a7c28c2ba97290c613c836cf0cc3222576085fd6d1b47d3089f7ffba34945e791b6d6cc54c0939ec84fb2f6746834039ebe5116f01ce90dabf0ab
+EBUILD warlock-1.2.0.ebuild 1027 BLAKE2B 22a492f2c8352d21f9a86b8cbb4883fd7d7481c300b1eb438d059f0e4d60158350bd3c6b94d25030aa1abf05bb43b9f43f58438030ac088a4c881ce6b1a7e7b8 SHA512 879bdd5de86a7c28c2ba97290c613c836cf0cc3222576085fd6d1b47d3089f7ffba34945e791b6d6cc54c0939ec84fb2f6746834039ebe5116f01ce90dabf0ab
+EBUILD warlock-1.3.0.ebuild 1031 BLAKE2B 1616b314bf019cca4ac62db5a3790ba26d2d88f472935b487c48dcbfcf0202128f3689cab69dcbba0e7d8dafef978dd728cb91ed0c93b1cedcd4daa835ff2543 SHA512 a09ffc3cf51e6e8a451936891435ac74518932152f567efc104d7533715545837feff85fffed9b03b90e8e46ff18d6073fc08c181aad9d903d6d42c805e8831a
 MISC metadata.xml 589 BLAKE2B d4c6019cd5e0683baa797b05835a7be6f335b5ec5fc16464e910a8cdd777c21678a319829b4893710a44a82d1194dab59656f9138cc792c7eef285696668c8e0 SHA512 35d027f2d7bb036d8b017e1c171839e7cb926d5764da9e61b3acc72a94419e850c87523a8b9852639d5cd6a6cef1e814dd65192a562da0a45c203968d5f152a7
diff --git a/dev-python/warlock/warlock-1.1.0.ebuild b/dev-python/warlock/warlock-1.1.0.ebuild
index f275b1856f17..e013eafd054d 100644
--- a/dev-python/warlock/warlock-1.1.0.ebuild
+++ b/dev-python/warlock/warlock-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/warlock-1.2.0.ebuild b/dev-python/warlock/warlock-1.2.0.ebuild
index f275b1856f17..e013eafd054d 100644
--- a/dev-python/warlock/warlock-1.2.0.ebuild
+++ b/dev-python/warlock/warlock-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/warlock/warlock-1.3.0.ebuild b/dev-python/warlock/warlock-1.3.0.ebuild
index 51516c988cd6..2a6cdc6082b8 100644
--- a/dev-python/warlock/warlock-1.3.0.ebuild
+++ b/dev-python/warlock/warlock-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 46650dbaa942..622ad1ec5555 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,5 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
-EBUILD watchdog-0.8.3-r2.ebuild 871 BLAKE2B 5fa1d5d91d5ed94e2265bb6ed005e651b2e5f22a263cf18244b0351ea19d80f6d18f40b0f80313140ea3a22e6d95e8dfb69da87223d99516c7cf6c109400c6cb SHA512 b5d47f81d21f0b33e8cd9b4428d3276781848bf8a3744f9990c6625738f5743b9866acf187da339634e3443fb3387246730e4da1df0bd2cac7b5476ad506a263
-EBUILD watchdog-0.9.0.ebuild 854 BLAKE2B 44aa76d83fef5cf1dc4b6c307a43bc1f1823f539ca0f5855544d4bcb4e50c56461a6e2d0afedc8ce23acc2a135f0197564d3fd1ed36b17f3030e0a234aaf9f64 SHA512 08cfae3fdfb7294ba331a7068ea62c27a2809cb08f5663c286901e9f9176bfac892d237f4001d1adfa1c6721296b5fd9a0e881f142632f325e934d5c8b89c36c
+EBUILD watchdog-0.8.3-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
+EBUILD watchdog-0.9.0.ebuild 845 BLAKE2B 551104ac09619b2dda1d8f00fe42e37d7332e9b2ce23e6e0a3c12acd2d42fa9559d55810675b5afb80b4b09dacf54ee10c838956be688bb11fa8b5e4070ec970 SHA512 8aee9d4416750ab96d0a63aad109c0af8f25cf4b82ca77461ce1032bbc29e840842acb862f7701c9c858f357dcde415bfd1c430f990146298d736b859f98f93d
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index 0eda092020e3..7b2615c34eee 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 66298b176993..bf9ebf05fb64 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7})
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index d23fa6414957..737892f27bd6 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,6 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
+DIST wcwidth-0.1.8.tar.gz 19957 BLAKE2B dd4ba31bec5161a9509b0ef7e73901c3ff31b2ceedb3d05eeaf85f90c1157e21d00ee8cd0f715098bf65e5d699a40287ce08e235f2f1d22a73f6606f490a921d SHA512 b828450feb56b5c0e686f6922e777ab48d1336816a41ef4ef95f71c25a37ef492861634c16c788e1e4570d21bd4d45c990a18787860ba6043157c2781c78b65e
 EBUILD wcwidth-0.1.7-r1.ebuild 705 BLAKE2B 8c8bb9409efd27a82e5236504ed05b16d510169e2a464e04cbb167feeb1f956f246c64e157370618dde3999c0e85808d4adbd9dc5eeae8b9ce9042d8315ca265 SHA512 d7c1c351ccffdce7745fd509ec82ba83b328cde6f271baffef3e24e3c9e239a70f52974cc2fa5840256f584a1862525ecbf460358a9c9bf15f6cb13d3778141a
 EBUILD wcwidth-0.1.7-r2.ebuild 743 BLAKE2B aa31fb0eb7f68381d27507681057dd5685a1e8f110569beaedbe0da8388fce3e3fb5556ba2cb32a38acd83591cbb7874346ba0be0f0dd2a0a5609956582aa509 SHA512 51a4542e03232c81cfdd7f06ef252679cb6f4e4b8b7a2d55251b437018ba47242adcb1c3a419feae535ee7fbb23e31e3f5059218eff6b2d8cf5a7747ff1bfc55
+EBUILD wcwidth-0.1.8.ebuild 560 BLAKE2B a7a3ff09e087ad1e224c8972dba90c55bffa6384179440343275231688840598c0fa63387ed556b6a978cc273232493ec14f1ad02f1344442bba158bbcfdc95b SHA512 877a91448e219ae4a290f76409f10fdcb898f8695648006ce67363758c3d530262e49c874e70cca85749caf620f7b73084ceafafe691462a16ab07e71df1094b
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.8.ebuild b/dev-python/wcwidth/wcwidth-0.1.8.ebuild
new file mode 100644
index 000000000000..b4fe043cedd8
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.1.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index bdf9738a7ed3..e253fec77145 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -2,6 +2,6 @@ DIST webcolors-1.10.tar.gz 36108 BLAKE2B 9856514e90b5ebd82cc619e19637db1862c5f94
 DIST webcolors-1.5.tar.gz 29960 BLAKE2B 0d46fa57b54525594547b1224801308961f9265dc76866153752e411dcf81d3ca2566cb289bb9f0cd486bd6ec1ffe7cf88f99a04f5554ae43f183175c9eb925e SHA512 84ce8cbbbdb4523bb146cf379845b549570623411a56651a7f9b9687152b7adc9dc42a3a0f684b55b61fb7a3d51d49d3871100b56725c86a727e3374b53c84b6
 DIST webcolors-1.8.1.tar.gz 33118 BLAKE2B e16ff2d9549eb09638722a6513749ec0bc91cd63ba69c19667ddea9c07aae7f9fa2b0fd3390a9b0f6f420f245ff3157d86a585301ba77e724146a7cee0ef4ad8 SHA512 45ddb4ec030206c3ff1edb7de6b8ec1b5f2f9ef5068f37a7c43b66531a2dc6b290cced2af1ca18794aaa9ba17f297022b2f9cc7a92a74ee9b68f758abf7c104e
 EBUILD webcolors-1.10.ebuild 666 BLAKE2B 48c9fd43067543948b9b013d818d96831d4c0db40b7f408e228b88ef8c2bc4fec96642303f6b74f14e73c3d41edcee4ef645f779877e4d846b71c109ec8ce2d6 SHA512 c8b160b592fbcffb2d15d2c8e047ecc796f5b4dfa5323aa2406c0df2797c680bd73c29aedad01d5e3568fcdbc2c01c0b3c1fac0628a291a2ee465e327f4ad7e6
-EBUILD webcolors-1.5.ebuild 686 BLAKE2B 2c235267e536d4ef993227ca4e4f0bbcda509713b5c700e1110d16a7ce742404e1b18882d2e92f9dc01b792a5f1ebcb4d43c3bcddac726a6b38b89f1ce4efc63 SHA512 2916ec50d3ce437bf2efd18d472b6eede93bc0028937111c7bc7e78ddaf28089fe5921edca42874aa151b3b4b6b6d0ad576e63c4d04e214d013c945fb326b258
+EBUILD webcolors-1.5.ebuild 687 BLAKE2B 24207cdd4dac27089612e736ea81c9e3d288317681b8008c207b432dff7a65ae81f7514fcfb8f2da0d240f5bb99b28ae087bdf22d4412faa433fc5b7f237ecff SHA512 c7b2d4029d558d83986ee58c0b58bc4defa3b029df980bac64d9a9d892d9d1dc5fd5052483d9e0f319677a9cb5c458113a16ea838e07d7930889172cd9b9b418
 EBUILD webcolors-1.8.1.ebuild 735 BLAKE2B fdd153ddc9dab0b51fbbcb30ec5bf3e764ed91e31c08a07d8c98efbef06e09db5ce5e44c4f336305ae52f577d7ca5d3425aa9515bdbe87d84271e80e5858531f SHA512 550dcda059378d7a5537345a85bf249dff69ec99b7fc8fd451f091ab800b592e190545739ec9fdcf597d26738626d674397a89d25c3a1143ffa840ce79e7d6b0
 MISC metadata.xml 373 BLAKE2B 77ba0f1d033aa4955155891349878942ffb67450d1e4891c87f068454546c73feade5f683574ae6a4263bf9cdce3f2beebc188e3812086d84a6cdeb840328c48 SHA512 0b99d1cca8cba614a64f182192f08d168e01c3d5dd3227f4425f41f438769b7b0566be41c9d3a3b3bd98825582315c035a7641766416fc5e57816b72d27d726b
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 7e167b681523..463c1abd40d1 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index ea589e24f335..f2d934b6a369 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,4 +1,4 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
 EBUILD webencodings-0.5.1-r1.ebuild 767 BLAKE2B 67c663cd64ee433add73e65e576fa93d1b26be4dfdf8fbf5fa224c5ddbbefa4c33da4b2c2a4c0ac27d4f91b909ea9d57f8a5ac00d974bc58da695eaad72b3e67 SHA512 2d2401d2b713cedb31c1fd040951436bbfd38fe75b708673b52a43b91b9e9f87196075ecd3d6b0615b3df5fef4d113138e2dd16e1d50ad08f166a3a0bcfec599
-EBUILD webencodings-0.5.1.ebuild 862 BLAKE2B 59a1e8a97b7dece742e44f434e78974090570e6965e9528f875fde8a9fc87a75dfc8fafd465650fb9b0e6865abe7920f2e1f5f580882b6575817fd9fdc9ee56a SHA512 b664dc77d3d583e926b0b65d6c0113ad148eefa89ebb6bc8e9609676bb72e048b750fade68381a8f0f5903c8ef31c27c5d6f683ec93bf1c856146f7923cb90be
+EBUILD webencodings-0.5.1.ebuild 863 BLAKE2B f7a1bafdcd453bb40d012bcd1bf0a82a85837bf859c3beb16901400ce25a8ddd7a62b7568de8f041bfc962d3c0ad5f37a3b0b1898ba83a7a3ffe61e947adf590 SHA512 649c98ed6a4dc8c33d3327f641947c7e22de266e7a5c28fc8a1504bf39c766532aaecff4c2f0cb7a09ddf5ee25ffb77e688d4084201028bbe1248720ae31c075
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index 1086c617fe02..afed61e0f237 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 1420fdc4d3f3..d27ab5a7e5a5 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,8 +1,8 @@
 DIST WebOb-1.8.2.tar.gz 271737 BLAKE2B c6eef650e9b03c83d7c618d0187ef7fbd3432d043ab27501cf8c4d6dc3889f3b542c54bf35963d8a313d62246183373c30706bcf5fd00495808e21d3dc9e0482 SHA512 691a6cfbbff376e7b1f71adcaac4dbe8cc26cb4ddc396e2ab946ddf15b34c05c638113f48ee396d4edaf6ef77498ca8539d1c63de9f58894afb0e4b88bbf04ae
 DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
 EBUILD webob-1.8.2-r1.ebuild 1057 BLAKE2B f4ca82dc46570b1bedf03507aabbeff65c2954831b1821a61b91105e3ea15e2c96d525126f51ba5e1ab835eeb4b0be9525dd1f904eb1677e8ef1bffaf69c1a96 SHA512 7c876d979b0f3d4318b8d078898a85e19d74848bd55ee883f23aaf4e70daf17a4a0f150d479460b2fd043358212cc91ca396d4098d7784629a97cc1b01daa30a
-EBUILD webob-1.8.2.ebuild 1039 BLAKE2B 1aba3d1a9c42b8782858f4d94d6131be60d9c4a86aade92c24aa9a0c24475bd2d8fc7ac03349f50ac79b8c176ed5dab254b9c78ace9ae9cc4e4ab63ac4cedb9c SHA512 12288e76cd27d98315a4adcc3771290ef7e29bd8f0fef8f283e0b8faf607b9488c8b07d170d005a8e44f614810c543dd2ae46cf1656efc11174b3c59da034ad1
+EBUILD webob-1.8.2.ebuild 1040 BLAKE2B f2c9b9d78fd1e7a2e8eade7c053e6356d2cd120a04c058376acbdc5ef698c438f318b6386e06c4196c2363b73e6e9ad55ea842c26748d627b3206b9c33b48320 SHA512 70fe851996bd577cc07dc85f21b6910d1cad6073102dd825e9658d47e0d96c36dd6812644e29b10110d3deb76a2711e3d67495058509e13c72fec347a13e1e97
 EBUILD webob-1.8.5-r1.ebuild 1093 BLAKE2B 3f8a91c71068fd8d223fa3f1ab36d3f6901d52d29411df6e1d63df7b996763aa79c410c1b13388926af56c379815349b513cfa355454c6bc952a002732f2e008 SHA512 db3b74f2491b5ebe7f3c57712dcf1e2943cce2908220edd138bd012d87834b3b3c6d6989c742264b5070efeaf1d7b05d79a66554f568cf6fd33463c0171e7277
 EBUILD webob-1.8.5-r3.ebuild 792 BLAKE2B 1972893da0310576d4aab3dba7575925fd2e1cbaf926e90a92dbd4d1bacec3f645c212795c8f3b4f19f200345bfa2647d2b37408a74d470a855db86e7b882906 SHA512 3ec29670f7834cc1326134d69a03085f4dcefc1f8e2dc0c4860158f32e9a8629d834e1409444fafd15cdb8fb6bb5e271b4020cd4f0419bb64c93e491abad587a
-EBUILD webob-1.8.5.ebuild 1046 BLAKE2B d5742f0f2e91d3c0a4d0c3cbeba8aaf85489d272327f5f72ea2bb392d494b66027d2a454b3a75572524c2b2076777aff1d8b22ca8c5fe2d6973f00a7a451b145 SHA512 a051b33ac18f2b9e7492cf53d97ad88ff2a6a22ca5d787c539db7fbf3b08d1ee424b191d461bb4dcef6d96c5b1c63ed8ccc7f0735799ae6bfe427dd669c39258
+EBUILD webob-1.8.5.ebuild 1047 BLAKE2B 2a308358ac5a0aefd3e3a66ac54e4d02a26b92edbd3134643f5fdfa042573623b675d96bf1bcd467693843adf5f69ea561199c302fb460a104249556db5223dd SHA512 0d4908714cecf7c33013b4bdf57b44b6cadb6beca659c50116d5d77f1b067d6143bddff81138d06b35c339d0f4c21d4cc1a6d2a23bea1c45e662b51dc80d14c4
 MISC metadata.xml 420 BLAKE2B ed66ec7dfc302248e6e5b18c9ca6dd2c339ebe9b69e0d1fa964d86e7337321a0a4c6d5136454f9435013fda73ba3d52322dadaf67a3bfbf3764d504b5c1b7147 SHA512 a6b9423edcdffc02b7165beaad70ec8819a8da7bd564ec5b082c2c361ce1ac88e28a738b78c3bd2e92eeb344368e5690d8d3a90dfdc2675f0cedc0a026898f4b
diff --git a/dev-python/webob/webob-1.8.2.ebuild b/dev-python/webob/webob-1.8.2.ebuild
index 7ca5d48a9477..69003bd45bb2 100644
--- a/dev-python/webob/webob-1.8.2.ebuild
+++ b/dev-python/webob/webob-1.8.2.ebuild
@@ -16,7 +16,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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webob/webob-1.8.5.ebuild b/dev-python/webob/webob-1.8.5.ebuild
index a0ff31d4e67c..e7cfebfe4ed4 100644
--- a/dev-python/webob/webob-1.8.5.ebuild
+++ b/dev-python/webob/webob-1.8.5.ebuild
@@ -16,7 +16,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 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 9bb850638634..bf84658cd58b 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,8 +2,8 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
 DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
-EBUILD webtest-2.0.21.ebuild 1822 BLAKE2B c9c393224fa308eb952f026ddbff67a1997f4df365464cf0959cfe2a12c60af03082561f3b26fa7bc0d79f3f29a90fe44597f14c840d450e6c45e0474c8ccc39 SHA512 59b7ecb41bfb97e6f5174617489a20757ddda83d39bb40225fa192d022f4b4f34ed3da6faaf4b459d9ab8f93ef7f443f7d1b7d044d2c3d699ac9035ac3a7fdcf
+EBUILD webtest-2.0.21.ebuild 1823 BLAKE2B d19ea0077775588a8609976c77acd8e877134af3953047528e1c4b5ae6efe3ee0c5a87ba5177044167f128229fe0895fd9822b4e0405a4fde46e674027af6c6f SHA512 a069a5b42c670c43bd6c7665147cde261a229a32e3baff2dbced9c60653c622883f4ffd3df4f9681dfaba74c7fe37d70f0dda22dd3333dc140d1c86038166346
 EBUILD webtest-2.0.29-r1.ebuild 1802 BLAKE2B a53080a329fbd75b0477530aa0d24489619d9690ae76a9d9801d0353b4b25770ff9ad8bd4763723e2e02f41e4b7657360f7e40100419a147d16cb26d9aa6d3bb SHA512 fe27c0bdf30e0bd1d0e850121bfcab821b2b022eae1857a036013717bf41811f6efe33b6052c7c42c68122b01e90686675c3d9ba9de374cc0ddf4422952a52ff
-EBUILD webtest-2.0.29.ebuild 1786 BLAKE2B a165410f63827888a4fe4ada27cdab5826fa3ed73c5fcad4b15dcbafdeb9ef0f25531bf7f9e5d48a2db1ad12709e1cb035de4fff027cbd71335fc2349c31ee60 SHA512 e6cb3958571f29f2422ebad10ef39779ab978c515764ff4476d09153ae5055c924695e5ab58db3cd46b8f073ca99bcf729d59bb72b4eed64a5c2fcda32ccf79e
-EBUILD webtest-2.0.33.ebuild 1459 BLAKE2B 40e2388fe1a10fb38ef17de84f06b9a4b95d70e3b2ccbb5d783964eff52df3281810fd8507ba87cfa702f43f5b32f3e34ad9b1aba0f9883cf1c4ca8f2f5ba427 SHA512 f2dd85134050f063eb530d4ab61711199efb0f3a25131de38036c9bf65d4100187851391968859ac318802a74e55f8696e398e120a87ffa72c648e3d7ba61710
+EBUILD webtest-2.0.29.ebuild 1787 BLAKE2B ac77a1f53758c6ac1fc9e1c417114897282032e49912ec0e67647640efe950a7b70a6ca525d9a56843413e135ab35ee002f2a5402cecec5e0ea369f47b0dc7b8 SHA512 28722e18a84fb6f0bc2b06833d75080655de85e1e658c07677f463a8233239697a581aae7dab3ca9a5b768cfcd6bfdefcebda9a69b3ca8a36eda1a2f19409ae4
+EBUILD webtest-2.0.33.ebuild 1451 BLAKE2B aa295a66677f8d649d3b5826ff51fa0d4d36e378b65b0d5f3a88ce31eb0cf14946a794d8d7725ea8b26b42f64f5b09b971cecb893f2e43784e8e499565ad62d5 SHA512 dd2da23b4c9e3991f457b93e9446e7ff9f48518e9112f3d4cd4613b60b1ca254c020f0b8dfd784c977ef9a8b51b32a44fd659faa909d83e4fd6a8f8b20df1052
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index 3a6a08b779bc..dda003466009 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -16,7 +16,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 ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index da75d4930edc..027c7d221372 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -16,7 +16,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 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
index 3f9b7c6ca0e1..248cccfad198 100644
--- a/dev-python/webtest/webtest-2.0.33.ebuild
+++ b/dev-python/webtest/webtest-2.0.33.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
 
 inherit distutils-r1
@@ -30,7 +31,6 @@ RDEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyquery[${PYTHON_USEDEP}]
 		dev-python/pastedeploy[${PYTHON_USEDEP}]
diff --git a/dev-python/webut/Manifest b/dev-python/webut/Manifest
index 6b947a3f96fb..70d4b326498f 100644
--- a/dev-python/webut/Manifest
+++ b/dev-python/webut/Manifest
@@ -1,3 +1,3 @@
 DIST webut_0.1-0.2.tar.gz 11142 BLAKE2B 8f3c9b68f1f3d78173e6ffff2f987a582be5e2014928cb862123a5768198395adbceb9b257c3aaa9c9254e9b4b57c93dff58ec22cd04d1fd9f3e60ca5bee5d7d SHA512 14801e3546e17f07328faee1df6708050702de75454e4eb2ad1fca2d72faf9a3228082f3d82a01a2810ba0fe15dacaee8fb556adff811596a1349eea61faeaed
-EBUILD webut-0.1.0.2-r1.ebuild 834 BLAKE2B 5ec84f51d7d9e56c050bbd97af8d48ff83265abed74d5432426c835de9f79160689fd156adc8e184d6d1b38fe65dd2995f42b14b4f2c5b369a70d94f64799812 SHA512 6242babe15e1b33a02cd4d2dfd1a8e24073cb5a96da6f2eae3a05518ffeb5fbdf2b9d481611277228856831ba2516b0917cfd8b4542a59cdb76261da903fe742
+EBUILD webut-0.1.0.2-r1.ebuild 835 BLAKE2B b9d63a37a0f418955f2c5205f4902fc39365785badc435a1b99996ceab7acecb570b9177179e6175f3ceaab33cbc3f9854bdd44c2653e1487456f19fb15ee391 SHA512 d6300e8813cc54aca586f04d7abf3a63188967a6bec0fe2c34b87dfd8f738ff21241795cc1bf008edb0cc722cc008370b43f899bd77fdf0f56700ba71ff7d68c
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/webut/webut-0.1.0.2-r1.ebuild b/dev-python/webut/webut-0.1.0.2-r1.ebuild
index d04e12270755..1e1cb6444257 100644
--- a/dev-python/webut/webut-0.1.0.2-r1.ebuild
+++ b/dev-python/webut/webut-0.1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/nevow-0.9.18[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 46bf12a63cb6..00ab799b7f7d 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -3,9 +3,11 @@ DIST Werkzeug-0.14.1.tar.gz 1185546 BLAKE2B 4c358688752adce870e8b44ffede56e44ab2
 DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38afe383fc6b769a793f9e72769bdb5a9507918590d485b9a84e8db392202fe985b0cd1fa00e8af17eccbf53bcdaec SHA512 b27b313cb29128ad1a1d0b04be7d1b29eacd4fb8280757510ce662b4f8743e7311966f7fb170531bd5dcb9668e9c6672f0cc0cf53bb4af3ec7328312a88b53ab
 DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16cb4a6977ff3906f636fe24b4e16662f7777584839c8e153532f32a0551281a6fb28bf618da5d5e6c42cdc6e8b391162 SHA512 78e7d2ccceb8764f92a3252b2ff670065a42fe2ad1d2b4631e05c107d2128f8f6f4090e32bd975526e4b5985dbbdbac22e9ad1514d14e88ecfb064483107d0ed
+DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed764377b458ccdc744800ffa5d2d456a836f0a7c4aef08b750b95904e955ce3b0241102d48bd28080e91fe29823e789e SHA512 52611b2e22b8af6b643471ca1df6e6f262067ef8882363768f21d9b0ee837aedd192c358a3a41788b2036d6c6cc0156043f1f5b8f6a04b2a701790b66837a62e
 EBUILD werkzeug-0.12.2.ebuild 926 BLAKE2B ff0f1765c1871f08092604cb2d7c4b07343d5a825b80e33f8828206c8267cc5b197898156091af42a1eb01564404bdef79f1b6b1ac12937974cc86812855ce14 SHA512 9c2249f31babb97f4756b68f537009eafbc9fe0349d1c3245e32b3fc71e483b022f4b471817010bc678b060295371fe1dfc2e8365d01308eb6d4bd2c84bd9726
 EBUILD werkzeug-0.14.1.ebuild 970 BLAKE2B 179350973b45720053ac84edad202c5a4698ac135c94ea5ce22586bc15ce1ea27b2fb34d7d7c115572eda6d568d18dc6571003fd01ee827e9312ec8799359268 SHA512 a573936d9ab957b9add39c78169349e24b5be0031391f13ab5b3421858789b2908f51ee298e886082868b541b50d075bc205c61f53469061d6b13a588be1dcd7
 EBUILD werkzeug-0.15.4.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
-EBUILD werkzeug-0.15.5.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
-EBUILD werkzeug-0.16.0.ebuild 1160 BLAKE2B 65a60d43852951ca0928c61fc8917b33d681e7cb83fd1ace9789f809dec1dfd529249a1710b2df7074776091660772e6186cf9bfe3e1853ab4e6102e2e357a4d SHA512 7b76a1252734565a48ae7aafd7826f0e0401c9bbf6d50ca87b7342a983db9f712f0897edacad14fc7e3151e67f15404246de4a744fa90cafd5349db48942fa6b
+EBUILD werkzeug-0.15.5.ebuild 1035 BLAKE2B 713b92996a5c6e8f48b7996043fcddf6d8a4b156ae330a51d5049c3d733ef470d0970a5b85064febf22445a287524c26bda5074ed8297b159b4b78ad1a923fb7 SHA512 d73518c3f51af3ff2ca12f8526f26565ece1a3a3ec4d918198b6cae292a7a54e76aedeea09031c96acb7ab7d2797533a987635414a42604b10c45735fdc8ee5e
+EBUILD werkzeug-0.16.0.ebuild 1155 BLAKE2B 7e020995b71d56b38c8a9f6b11a99544c020c08d7e145787d45a84ea0086e1400e558fe9e89da211b2b5acf211e4cb4f632de4b2491fcb2026d8a05c7f042ac3 SHA512 5499a13a9b4f877f4295ee2646d7509e1557bdb854e8ae5b556a3b22a9c68de55399f0bb3dab5a90dc889dea41134f85174f5c550e0f09b58973f09069f42a30
+EBUILD werkzeug-0.16.1.ebuild 989 BLAKE2B 08b60421b7198237c7dee5c47f31ee326e440247c29d4400bd95d3e2ea42156090224aa45b12ad47e5ca3756098d906568dbc2ea5dc87185110fb390620bef6f SHA512 a479d9640b203dece5e28af8ce9d9157f5181a27da152832fc414a8de9e72de31df7acf874b760653c20fb455798d3972cdcc711d5c558cea3928a01fc1124ad
 MISC metadata.xml 450 BLAKE2B 553ae7b037307259ba7c22b90f001cc7fcdd1c2a2437ad4a038eceec9e9787b3c2287b0f4ba40c9cc435ccc80dc60a96ceadd2ca3e892ae5e5083e4dd037525c SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
index 35baad98bba4..d84c0facc841 100644
--- a/dev-python/werkzeug/werkzeug-0.15.5.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
index 81047c3beb4a..372552584b61 100644
--- a/dev-python/werkzeug/werkzeug-0.16.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/werkzeug/werkzeug-0.16.1.ebuild b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
new file mode 100644
index 000000000000..b8eccb696482
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
+#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 569d6456b69a..2761a39c095f 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,5 +1,7 @@
 DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
 DIST wheel-0.33.6.gh.tar.gz 50273 BLAKE2B bc315c87b83bed39ad4ec08dde31edd570e59b65ff28c64c89b1b5e1f2e526fd6035dbe9902dd9a3efd94b0c5584489f28ed895b36e4eb9dd1ddc225d7069275 SHA512 04edf619ee6fd06f1e4c8bc513c6e21ba91615eba42bca5473e60573e274133b1019774b8e3a960e05f5a69bb256508d0a8a31fd9ab91a28f1b87d1095b17b5e
-EBUILD wheel-0.29.0.ebuild 984 BLAKE2B 21920326e84656beeeeb405812739ea63a31378dabfd7faba2120e5b6e59772d96fcaa3f5edbaf6f4f66061ee3ab96efdf151c1a0064d9c5b1774ba5bb57ec98 SHA512 c3b9cdce4e09f7c06c525f508d94caafef9c62690dc876e45acc49144d64f19148cccb8a2a43a166362026a1be0ce4447da01f24981e439928796c8cd38d8ed4
-EBUILD wheel-0.33.6.ebuild 705 BLAKE2B 100bb3bfdd6127edf5ca834da95ba0b3a6ae2dfcd37228df928b672130664b5dc0d7b67b362c9b2fe0fca05cf74dedf8f157a67e194019e9374ceeea168edcaa SHA512 30f4135309551766483e89f8d3e288b68e5314c5466dc2f8800f005775a8263fcb85d1a832539f587ad6bea76b5f615b1be9e67c6202c055f23538a256a79cf6
+DIST wheel-0.34.2.gh.tar.gz 57175 BLAKE2B 4d06c411561f80e51c15422f2d3318efa565f9119e869a2f9284adb9bd3aff7bc104013a63fefae36742d7d87c8468b42292723ed031c2b109323a9141fd1cea SHA512 fcd02cf770382c26b5250aa48f60481ac868ff7e1b08245ed4616aaa7d6dc5e3280d9ab787c4d1690b11550de9f6160c0d31dd65b79554711ab5d02de479e1ab
+EBUILD wheel-0.29.0.ebuild 985 BLAKE2B b09b150ed7e600b6a6dacc71eb309c8f87e283f86df623fb83e7bbeede61c2b9940484edda64be1a34209001c150e02e33ff34f0cd70cded06b8b81dacbc14b7 SHA512 09d95e969da6a4d22aeafdabcf5af65cd662f29bd9c56559f6b2aefcf4d5c1217fb1df657ea62d94bd4242ebd411e7f65631489904c966facc543875ec8aab2f
+EBUILD wheel-0.33.6.ebuild 706 BLAKE2B 5289725ada2897ac5e7b3b6437f0dd01d4d629be215dafa9f54071c06b71c055b7edad7cddd05b5a60e41ea89e6fd0f74a3d09df8377418aadf9d74f89539e83 SHA512 e29e75b98534bee3ccde1658ad0b2157acfa3d450d6e5b226b198af058316d7cc482675e3de8e271bf6c2a0933694f12830e919266e4a3a83a2feea6692ccbde
+EBUILD wheel-0.34.2.ebuild 698 BLAKE2B 27f196f6c6131437b319970fd14c488482aadb3b57eebc9f56a75da3d4f69e1493eea1a69e8b111f19fff64bdb19eae71a6c772df5f8434569ff021a9e1eb3ce SHA512 7162c2ba7d4b557e0c8342ea8957500a2acaa054416b13daaca9ececc55526f58f007ff7b95ea286b02b177bebc0a3c67a71ffaca42045bad91658b5d3707eef
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index 0e8ecce7b767..df43e94eed3d 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.33.6.ebuild b/dev-python/wheel/wheel-0.33.6.ebuild
index 5d6bbb71ab83..b069f5e7a1a1 100644
--- a/dev-python/wheel/wheel-0.33.6.ebuild
+++ b/dev-python/wheel/wheel-0.33.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wheel/wheel-0.34.2.ebuild b/dev-python/wheel/wheel-0.34.2.ebuild
new file mode 100644
index 000000000000..3a1a9b2fd853
--- /dev/null
+++ b/dev-python/wheel/wheel-0.34.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index ef271541dad5..bef2146fd340 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -2,5 +2,5 @@ AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616e
 DIST Whoosh-2.6.0.zip 1193541 BLAKE2B f5afea36c53a06e3f23e06e3b6f51acd2adafa02488912c52fdda207631a6adb071256d26ed455042de1c4c2a136156ba7c89f4d6773ec60b392b03de3c37da3 SHA512 e50e47ec0d1c65ad3c7d657586f5380a1be748945c1ce964305fa68b99379f0da676faef6f0ca45ef151df7be71150601162ee966f3aaf84047a20bca36f7e37
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
 EBUILD whoosh-2.6.0.ebuild 1270 BLAKE2B d011eb64b7718903ced2e36042a6dce2945c736294f9d893b17e1780597613546c7ee28841671d1b211022d2fa787bcade92cf3a7f80b9842216c8356672b458 SHA512 717fb81c9170fff9dfa8e350304d35dc7978bc174ee226ed3c5ac9ccccc62a07d0a68fd0ff8a20af827a51191d886760e4bfa9fdf680a3fce871ade2d483049e
-EBUILD whoosh-2.7.4.ebuild 1486 BLAKE2B b2504840739bbdf92989689e3b41a2a95f1f8dbc70dffb1a86b21f9b1c59320c658b792a25112863a7d40fb63b2b36e2dd88e3b44506caf39884a6b907e88223 SHA512 61d32ed4533667706c5fb1e62295d0374bffb700fff68fd5020f7c2ae2dd08e731703bf83b7ed991318425ddb1bab99c4bc8e37d0b5af6acb3540b47193c837d
+EBUILD whoosh-2.7.4.ebuild 1487 BLAKE2B e5d919f66b64a914fcaa58338e70b76dafba30593ca45f1ae53ad99b7c6801ef46f9296439912018493b2c0b3248de62a3235afa75be40a0d02a59a4ac67bec6 SHA512 c7c3b6bd40371a5c9c6722f2953d8db73b52b5e8fec47c801c9ee9326d7fa5c3a46395b690d493ebca13ec3b074e90bcb6fe8b5093ad9a8b941150b6039f9760
 MISC metadata.xml 817 BLAKE2B dfecf5c1485e029a3614d0a45b78ae77fa7965000e5e9b95d6e7ed21155c4781f23b895f24b7189b1d7fbe7007828dd152d30c4013ea35d93ea1c5dcc985b834 SHA512 b9c1def2c09a31740729aed91c02a3382c9b8f10d9f959c0c80f41ac4822ac5ad3b2c7c998e244f91e64581c17c4d52a7264f679b44a9981587c053bc3b576ed
diff --git a/dev-python/whoosh/whoosh-2.7.4.ebuild b/dev-python/whoosh/whoosh-2.7.4.ebuild
index 56102441bfcf..5052edfb8c79 100644
--- a/dev-python/whoosh/whoosh-2.7.4.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 7b3403ace30b..5eb709ea06f5 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,7 +1,8 @@
 DIST wrapt-1.10.10.tar.gz 122052 BLAKE2B 216c3cf5ba3b91d2ed6c71c3a131242e8e668394b429e13d1a0ca3a0f806d380ca4e1a1a1d17ea029643fbc0d56defdacfcc9659a9eb1df67771dc03cdc7d292 SHA512 e18283cac7bbb137f43fa8c2839fff14072db1fdae57da2b393a5db4007656706838b64bc6785cea25602205b595fc4e7fe033e580d2fb484fd8c77351e046d1
 DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750a2a1c5c29acf91e87a9c9405b11ff10dcb56e4aa28d07d34f7a56fbe9154d2f30556f5a2ae4f1a0986033e05a SHA512 cc051749341bcd6fc1a950607fad94f74334a00acf0366129470181a5af7a3af32a26e5c5deee9242ee12bcc7e4c47dacb958c514aba8a764be3bcc662845b98
 DIST wrapt-1.11.2.tar.gz 124874 BLAKE2B 262518e097753830d80d834e1dcd5afe9c743e7cad8fad992146829255b99ef0c1a6d0344674935bb6beae9a8e5f42a1a4ade760f7300d104b1a17bc6f94f91f SHA512 2551247c46fbc34068e0f2d6efa91d8c87669c8bf1e16c3b5e2e5e0d84402301c38a78485b7e9a13120c99c9c942db680a84d87a52a072d530aba6444d86297d
-EBUILD wrapt-1.10.10.ebuild 1018 BLAKE2B 8433013e1d23e71338ea047a372e6712d573c8aead7f4c0bcf8e6fec636f641ffa805abd7c57e0eec4e61239ce3ec5991e2f8a43d5abc19d50e5bfe4ba3f131f SHA512 49717e619310c829ac227051ff965fefba141761baceaba5521eb8be916e40b8373db378332f7725b29f383adca7d2530a2dffaf616b65be9ffacc1aad4c36f8
-EBUILD wrapt-1.10.11.ebuild 1054 BLAKE2B 01c2a5bcf69d2474f1ed99ec550be16a596bc5afc1bdd4747214927156ee4545f34621c859ff343ec3c20eccbc8f01a8f664601264f31a9aca1a1875684acad5 SHA512 b30588a2ebe1009a0a992436f5e63619a247d0c15e9a12e46f88691f9052cdaee1cc103b34db8184b1a809a221ff0fa019fa2d47137b5768c3e091f123298c6d
+EBUILD wrapt-1.10.10.ebuild 1019 BLAKE2B f620df880417c2c104c63f9d852b137190003c40cd59087d962d04c67951b597300bf1588063d16cb98206e2e016d2d8e0e0acbf5ed4bd0687d0d4a32509940b SHA512 dd66bc1b95c6bc2e1f894570ee59d3446b3e8c868b9e830d6825d26ad1c9ce1e686af09b2923b91a265ead68263d847784bd8de5afc263996195f435862772be
+EBUILD wrapt-1.10.11.ebuild 1055 BLAKE2B 3fae1f5c3166510d246f4796fa7fc8d32cd2623122d4c97316c922debaed7174577454d5e45107aa763dfaad90e2b93a1152bc3d4b62c5dde0e329fbec01508f SHA512 6d4a6c4958d0436be90d01667cbf867a62b5d8d415505695c7e9e26f8608a0cc68cd14131473eebedc2d845095ac12147e89de12a6a0ae4438a3e3a8f5f45776
+EBUILD wrapt-1.11.2-r1.ebuild 722 BLAKE2B 7d218b22796afc1a0cbbd05dda42fb0552012bdca2a6feff2dad631dfba8b76564012f38096935d8326c78fb1391ae1df377d48c8304ed8759e1834a4deb82b0 SHA512 d192edb1cb41a5ba0da3ea68fd2be7ba6645d6928cc9d736e66cc2ace441079f2911256c6e07b62e0bc01b5da20be5f896732a695323650cdc4d6c0231761dbd
 EBUILD wrapt-1.11.2.ebuild 1078 BLAKE2B 864c72ab437537735688f181d469f4851a083d74c58c1bb364083cf330d4ec8181460cdc5482a727e90e0e07555cfff710c56a3b422ae0745fe58b9cfc84caed SHA512 67f7d79d3c8af177dc99df94b7f26b158b22553a07e151d4be32a813344e4efc228aa46b58b8c13639e31e8607610bcc43a90951cd00ee1a2cc1a905083ad09e
 MISC metadata.xml 369 BLAKE2B 6a901e590d47a47fb9fe27cafa1708f61f0a3285b651ddcb138ee1fe1add01a163a031dfb9f37b6706fe1712a9da42903317a7560915be98524168e7dfee438c SHA512 2e999c320cf8b1894ef8efea6262304c7902e37692cefb376c36a16cf457133255a8f7c709e329232614fce918d65a82b61f2f340fdc277ae8d1b37c6d60a3ad
diff --git a/dev-python/wrapt/wrapt-1.10.10.ebuild b/dev-python/wrapt/wrapt-1.10.10.ebuild
index 7e6aeaee326f..882d7de6bc68 100644
--- a/dev-python/wrapt/wrapt-1.10.10.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
index b6b8ecdbd4d8..4ca522a68659 100644
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wrapt/wrapt-1.11.2-r1.ebuild b/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..46b0288179ff
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.11.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for decorators, wrappers and monkey patching"
+HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_compile() {
+	local WRAPT_EXTENSIONS=true
+
+	distutils-r1_python_compile
+}
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 98bfc871950b..c99a7e70785f 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,7 +1,7 @@
 AUX ws4py-0.3.4-tests.patch 2439 BLAKE2B 0d0a185104b073ceed3c745f46b67df5916b001f5e67be50000ef1c68f923f2375be248f4961739180d4992db6fdf11d2ba3558a4725cd4f3d330303fc9c01a1 SHA512 fb8cf920ac48aface7e50576c1038db47133c6a44e7d4ef1b965d6efc4374d22392e44bfdca64bd61696a5c6ed884ef6b1e410e515ed6e1856c7f3c4862d19ff
 DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
-EBUILD ws4py-0.3.4-r1.ebuild 1805 BLAKE2B 126d8870f982918235bec73085e65040ce722465179dc3c41ea54755c59115430d2ed5b9edd4fa7e5f14d3298c3a758a7d31a95b2aa7e6b508fa45a0977e5245 SHA512 2cbddd32f63b36c5103d3fca840e620a56ff482c4bca51bb06644db13382d464887b5803ef579daa83e61e83e5efb7fbb56bf9bcdefd9eec88f0af50163f74f3
-EBUILD ws4py-0.5.1.ebuild 1769 BLAKE2B 91894ab485866f9ffbf26675569b82e7dd87cb0423881941a3967699cf3cebe6e2309f063a77e037de2bb751e6d259292dda910a1774824538b2d5c03a066890 SHA512 7b8c127f37132b3d3bbc2c177543ed034ffa770cf86ac940065494468b9e3d5baa7dd08e5b4e8e5c69cc8ea68b13c21d1e04e37832e36e40ad230bd437690d3b
-EBUILD ws4py-9999.ebuild 1772 BLAKE2B af8b8309f66626d69b1e01abfde27e13ae6c06e03e9cf1ba6ec6885afe7378e988d3e1f4a3702a3ded90d012817c0c2d64c478849dff0e759b7d79d18f9eac2d SHA512 787b88819cf49f4de2a8bc462b8642988f50fa9cd9bde4fa24f62e0de705665adf7799b41c0a3d7b64688a801926bdf718bef4f335eae1984788a4574648a190
+EBUILD ws4py-0.3.4-r1.ebuild 1726 BLAKE2B beffbc7b4a6cbd1487769c4b4d55ae70f748fbd6eaf9d621abc8dbf2b92e927e9173fa3c7d982dde6cbdef4b24044fd883fadb496229dc43e28106b401fed7ae SHA512 00774d6709968c5896de6fff395fc3547d34f0cbf81a2db82201853e73609269ddf1d6fdc6ec08ab568828934521cf990aa8db21bf8490dc6e0f6c7278be9c87
+EBUILD ws4py-0.5.1.ebuild 1690 BLAKE2B 44cbb9758f359bc8b5a549d312f9b77f95011852447778d7dd507b981965e476da6b852550524cee7d0cc640b268a51792fe5f2f1aafa9f3c4c8d467378f68d5 SHA512 98f64075746263eecbbcb0a1bd1690166f927a521cd6aa82128a928de3b6f597516b8878808793c2896ce7c65c2e9558b8ef854e5d18d9adf2ce2eef2809c118
+EBUILD ws4py-9999.ebuild 1693 BLAKE2B dd15979798a374e78162bb71a251030b5b81c034e7ef06a2c17d0baf552cf11fe669dfb83142e8ff0881c07e053412b81f58c3a0530f73dfa5f33e15b0aa694c SHA512 b6cca2a99414019a40bfece659705e58789e70e7b6b3b9e762ae20f1af1a79c607a432d707d4704637e0ad7a5df2affe27edbc2d22f0dd7e1dba68bc3a06d12c
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
index 8637c4905841..d6697eff1d24 100644
--- a/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.3.4-r1.ebuild
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
@@ -30,7 +30,6 @@ RESTRICT="!test? ( test )"
 # doc build requires sphinxcontrib ext packages absent from portage
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
 		server? ( <dev-python/cherrypy-9[${PYTHON_USEDEP}] )"
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index 34de8e37ab89..38507310ab2a 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
@@ -30,7 +30,6 @@ RESTRICT="!test? ( test )"
 # doc build requires sphinxcontrib ext packages absent from portage
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
 		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 5c1543f24678..461f735ab784 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -7,7 +7,7 @@
 # pypy is viable but better with a cutdown set of deps
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
@@ -30,7 +30,6 @@ RESTRICT="!test? ( test )"
 # doc build requires sphinxcontrib ext packages absent from portage
 
 RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
 		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
 		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 2f78aa4e08fd..e19f3697484d 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -2,7 +2,7 @@ AUX wsgiproxy2-0.4.6-tests.patch 736 BLAKE2B 4680b256f190d1bde89b5e8735cdd03a680
 DIST WSGIProxy2-0.4.2.zip 18817 BLAKE2B 90334926b726024c1a16b066d11cfe579ad80515861811766753aa772fa97e521466bce0a08c028a965e51ec40b977feb1f4b59aa6c023ca6a431deb63668ed5 SHA512 3dd750263485ceb644373d8ea9692c9a46126a1ed7cd640feba7d42b0fe618e290dcae2f76dc83be77de34211ac473f5a1496a8309e3fcc64982e9642af786fb
 DIST WSGIProxy2-0.4.4.tar.gz 16475 BLAKE2B 8cc91e8364204a03fb8f80abb926e69112c2224b595c695d25e2fa54553fe9c82e3420f68b58f266d04450dd49a6dbf9257c190da8645dfeee976ae101fc708b SHA512 6ae9fca65fe80f52924f42b26b447631e8c278f517ababc23d26e5f8598d6d9b7975197ec74faf64f2e051824366ac14c5db5727a014a187c70a1b4604105b42
 DIST WSGIProxy2-0.4.6.tar.gz 16481 BLAKE2B c33dc34d430da795e8144e06e1d6f100cce7d0155295c2d3038567a048647a4f008dbc0156fd4234ce069b3f4ec01af0e42b174dd68c92c9cb3ff4e13be83f8a SHA512 c60d794c0c8b383bf1857ec325d6d0b4fce9c4aec4a06cbf9d7549b609633e491e137342b7bbaf4eec12462eabba63096328c8517b0685e241d1baecd5827cad
-EBUILD wsgiproxy2-0.4.2.ebuild 1289 BLAKE2B ce1d06a942f2466eccf8685fedcf2b812ecc613a6d9a7a64dc40b95452698a7d82ee1a597b7eca925a808a79a3eb7d6573c4ac173292156ca6614d8087d7ba94 SHA512 8178a10848154fc179b999e577efda0f439d81eb02b9d3f0659b8411dbab6cf75d2a7fb0c4d344e4e84b84d4f93c2f3e3a2086398cf4e27408d860e08bcf125d
+EBUILD wsgiproxy2-0.4.2.ebuild 1290 BLAKE2B 926823bb344d3459be28af9d3166cd85dfbf6cc713d4ef46c7d3e0e74a91f604c789644674a6e9f857d09ee8e20ad6b923a515c2c11551a3072ea741c2f10587 SHA512 017b131091d427de54145f8266065048e7a0fafe35ac5a3927fe794c100fb638777ccf17ba592230c5c1089118eea4bf0f9de25a97337ae82639d7778acad68f
 EBUILD wsgiproxy2-0.4.4-r1.ebuild 1309 BLAKE2B 1cd9e2efba376f54cd8f600ec5140fcc32e142c1da0a202b59f51b8bf0ec0d2bbdc2963a94bb7806875f613379f02912abc6e5da6eaba142fb95dee5fd092e6b SHA512 63d1d9ede89d997583af5ca90cb2cd66ab0881ed30d9fa77dbaedceb3f20dfd4a06e1d9423eadde3a48cc2eb9dd0f62ae6dc993c1fe6889230c2edef343c735c
 EBUILD wsgiproxy2-0.4.6.ebuild 1215 BLAKE2B 55daa29876d4bdd8c1f1916d70900a7a39fd829560c771052c6ef8a7725e5ca9cf695ebc4352e1f10c388aba9100c8d52be3ef60555a8c763600baf954ddc3c5 SHA512 86360e80947062cc6f19a93a5d7116213c2fa6502a7c961db3b44447c6b8d7c73681fdd1e14fa26d0fee797ffc03cb84f785a000cc7489846b9a7983cc5620ed
 MISC metadata.xml 313 BLAKE2B 45cd2545e5d5b03206c8c3f2db35c0a95ce08f6c29503c19deee7ebc90f578a8a68bc9ca98a504661d09866ccc0217067643efb84e99cda9d1678231ce01a79e SHA512 147915d551dc542cb68d4cab97a3b187ef698dc450cb730c80eec846e4d4debc954b68d04f76e1df835fcc4d179d705ee95379b38c7d39d0f1ffce809941a7c4
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index e2dbe314ad5e..e6581be752b2 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index e0959271c616..74a03b64bfec 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.11.0.tar.gz 41179 BLAKE2B 72486adde659e96910bcc56efe5f3ddd71d962e2844e332eabea2a0cbe5574678be85d330fdd54f951f679dfe5b1c185641a30169cc6cd9ac6c4ed066c6a3533 SHA512 583e030dc88971b3733e5e84e5fbaa70d6043d01485cabbbf45470baa31e4f511aea55e108132fc298aeae0031542af7bdd22b7ae25b11832179025a2fde4bdd
 DIST wsproto-0.12.0.tar.gz 45252 BLAKE2B 1be690faba6665b11e2e1c1725935addb132d7008f0ae81e7d5c383a152a5d79389287b3c152cb380e0bdfc97a3438e2a48b62f3c8acf6b501427bc617225ec0 SHA512 159b7f67eff60c2514cfca17036d95017109fe251def6cec132998ac82a037484e3e248d4335539fd03491f56c491a7cf51582aa3f74a44d7d150220a875b18d
-EBUILD wsproto-0.11.0.ebuild 695 BLAKE2B 304aa095233a1f515dc1d84d5aa5534b84c474782cec6e1b041de9ce43e358e4a3fad98d7b6204b4a298db18c857b3f2a4febb37e3fa3a807641d669510fead3 SHA512 6a618c18856fea8235e472edcd2719ee51919bc3006a20e57f0ce7224e73d5ec4c084f02a78f93e50e0a500b09f31473d4ae9cbc9fc0e44bd53e0dafe221cd7f
-EBUILD wsproto-0.12.0.ebuild 736 BLAKE2B 36fd6fd4a897a11ccd3a78fae5e6ccaea119a636418c6f22577606390d895cf448e0e77b140811c5063373abd919204cabafe295d811cc1cc5e1123d2ad49762 SHA512 a75402b8aa893437a0f3ee5cd1b7f63a3e393e690348435fc01824c7a5e37ffc5f995aa98cdbc84b87ed301636de41649f46ef2614795d74013511026ed6be27
+EBUILD wsproto-0.11.0.ebuild 685 BLAKE2B ce64d19273286fe2d9ebfa5b9b451fed3ed7dd53c95e36e0f3f0f231d7335b3789e4f839668c41674fd722a20a8999ef5b7332fba99365b64046cc415419c7eb SHA512 02775b90fdf06db70162fb079e3a1c9065ff5bb91dbb6a78c54efcd12504bea52b24498060a79218db7eb3a933ec7f1871e9559ae5bb8e910070e7165c1fa1d6
+EBUILD wsproto-0.12.0.ebuild 726 BLAKE2B 321a41802669adebf61be7281af36c4520c4f836a1907be42153890fa6dc554adfca571364e9706a4e306f0226b2c9cc5f27cf0a686a02b1261cced3e836a819 SHA512 638061b8d615fe9e457d7ff74ee2089274034b78ba5beb8565c5325c42879e9e50da5d184ab51c68c0b740bd15206f7ec5f43813030a5619a6b30dfbab20b82c
 MISC metadata.xml 589 BLAKE2B cd779642e22d2843565d087f42dee8bc89abc872632f9a3accb251ba89498d7f4d7c494adf83db613ee06591a7a48b40584b4f3ff23f1cf900d6763364e3b843 SHA512 fd6b82b6ef0367af0227bafab043b9a02e84c61a39435d3b93e2b4c492d247ee121a5985510427ded8339db68f1471c18928b2c3fd12f87d72f72320c1d6d854
diff --git a/dev-python/wsproto/wsproto-0.11.0.ebuild b/dev-python/wsproto/wsproto-0.11.0.ebuild
index 9f398be48fd3..cf252c64924b 100644
--- a/dev-python/wsproto/wsproto-0.11.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsproto/wsproto-0.12.0.ebuild b/dev-python/wsproto/wsproto-0.12.0.ebuild
index aff4557bef64..338c19e6445b 100644
--- a/dev-python/wsproto/wsproto-0.12.0.ebuild
+++ b/dev-python/wsproto/wsproto-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index b51731e75ef2..6c99193b4573 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,6 +1,6 @@
 AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 DIST wstools-0.4.3.tar.gz 148878 BLAKE2B 96b1e9dc0310fb0fc5515a7c061f82897e2ecd1b6187167b57444394d1e64e8f63e5db011d77c80b5fe6df2f67fecffe82f861fb761190c6b3248346cd9f5b5c SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
-EBUILD wstools-0.4.3.ebuild 573 BLAKE2B 5ba5fadad6d3e5f924486049114b8e107e45459e5e940f68a73d59f6c7b6478782fa1635f037604b2a17eaf6f648dabeccb6fe9543dac776f28935395b6329c2 SHA512 619f2606150481c2d126eff5a8bfebab900c44ff1678f1536da81a5cd94e55561265da3dd83f2424b0420efbd8a12013e91fc0a79208a56e05a48ac47c0554c5
+EBUILD wstools-0.4.3.ebuild 574 BLAKE2B 1f8a0eda04ae984b7cf3407512fd68d6a14c1fc5ecb06cc29987c5c0b07c482fb99a3baec126dd521eef02aa1cbf7deb0bf866813683368497bdb7f50f2ba267 SHA512 3b3296504efe8d8ae59718401f586203d84c0c2787a54669e3ad76e9eb20c7390befab10c9f2d38da4c67d4b5bd93f816d3907ededd6005881df4a665ee48ce4
 EBUILD wstools-0.4.5-r1.ebuild 832 BLAKE2B d9b362c95a79cc9d4b9062f3d405400913283c9800195da7f92f6afdf944bf8d9c099f0aabbe8228db7afcda207c4f287c91e87637fb3d669c8198edf83adaf5 SHA512 862083dc0b455b326c3f3fde9365acd9db46ba2940de04beaa6f91096ed006229f2fd0109eb97c661421a0b768058a929a6135bee8bf8c4c1a16cde75310d322
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index 567a1fee74e9..89eac2c6532d 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 9ade10605374..1251a0c5a55a 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -8,6 +8,6 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4593 BLAKE2B 5b963f8c7e96173ebfb0fc3a6f4de213108de0a61183a3075145cbe67207105ee22ba2b38933778fbdf34e1dac81dab2402039f91e334ce39f0dae40211003bc SHA512 2a2c8dde789b018e019f60731f48ebae5087e3c7cff4d205ddce70eadda23571df67149302e49c5fe0390e05e184e3c6002f73847bd97ac79852f8853488f675
-EBUILD wxpython-4.0.6.ebuild 2390 BLAKE2B dd93fb0cbe88f5fa17f048b18668abd2ab4c14146f338f1993e1ca2e168d7175ed08321661e33cbe893fc89ac2fa4d4d67b78a26e72df7c9999d783766ba23ac SHA512 50a52469e12b1437ab9628454cce19140d644d331cebeb0ae3a0bb85d975019d81c089a478bc946227b103afaf38d56e92bd7bfd6c8ba5daab56876c442934b4
+EBUILD wxpython-3.0.2.0.ebuild 4589 BLAKE2B efaa6c86ade47de0353a318d3067b3aa57778649aa3167696c200d6f74f97a06f1feb6481ca0284f56bf05e5a5bbce6fc7f1f14a93bbb1727821d0f0c7a93c7c SHA512 5e834683fb837aadf238ef6ad93602b16a1548fccfb25ee99e4fa75dabc67adc82ad8e33cceba2bb02f0871784867c4c7d66792c8506590097c5269b875c19a1
+EBUILD wxpython-4.0.6.ebuild 2384 BLAKE2B 216752a5fbc867c15d57e806a05f782ca765ca4c65a1540cf9c4ed4d44f7553cee0f89bd72fb73ced7f5ad9ae9c167009c29f639e8435f335620c46b0abd54c5 SHA512 6e633ae4fb2c0ca5a7fa81e62b3cb71068eebdc47f6afde1415db226d8fecae12ca93d25b66a36f2208613c4eeb069659b2da4fc427dfebd6794a536c13e226c
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index 2b8e1f0b9d4f..85f99bd181c5 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sh sparc x86"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/wxpython/wxpython-4.0.6.ebuild b/dev-python/wxpython/wxpython-4.0.6.ebuild
index e5233480aff7..00b70ee2261c 100644
--- a/dev-python/wxpython/wxpython-4.0.6.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index cb1f33261c3a..00f913f37ce5 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,5 @@
 DIST xapp-1.0.1.tar.gz 12327 BLAKE2B a627a833adc8ca32823d4c04fd65ef3dedc2eedd031c3030105f1f2341fa17744fc81c976f4eaa1a238653392510d416692ce804ff5bcfe9ed12d9595245e8d3 SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25
+DIST xapp-1.8.1.tar.gz 19665 BLAKE2B cdead609611396cb24a5f09a1ac47773569c1637b2730b00a545dbe8d3a03d183209a433bd7dfa3ed9bdd27389a6ec759072c899ab106180b839d22edd22b0c1 SHA512 8f20e15eda96f2cfab08c2b99fc20f2e3b686049ea23971b7fa8f8367eec019dce4199b332ae412bfb853de44ed5a1bb6573ea8ca052910f12ee5ced15bafc10
 EBUILD xapp-1.0.1-r2.ebuild 539 BLAKE2B 8b7986950d82e88b26508272a707f42a5ca788e361d16d7fb5334c2cca8ab40cb5cc13be457a4f3a43a969df0c6b9738114c4774a9622835b559ac3f756ecd8b SHA512 a6f92d911cfcf74e93bc60660d96d16b08f69658123299e3281fad32e2dc0a646331d8e4ff01eb75bbaac1dc89fbbf6d6ee38284fd78240df16208ad3445c379
+EBUILD xapp-1.8.1.ebuild 574 BLAKE2B 368b918c0a170a725282942dfd300bfe710643a8d5b87d127893f70243c28b206acd800083d04284dbd7b1d537e1ea0def8535f1467fa0aa7ad36232ff6d4576 SHA512 b7a32bd5160438dd3b029851cc51f4757166ab178a6f325b82268f0f39fbc053b8d34d6a1bb12265dbeaa475d6926dcc800a98ed763cf1b0e8ceca3faa12f692
 MISC metadata.xml 220 BLAKE2B 3d3008b71006a64b0bc1899c37b1ea3c2048806badd09c02be51a29f1481475c704c5561d84f7caa1905c57e94e2ebe787839bb23b647a42543f31a9d8bf869f SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364
diff --git a/dev-python/xapp/xapp-1.8.1.ebuild b/dev-python/xapp/xapp-1.8.1.ebuild
new file mode 100644
index 000000000000..18828c1660e0
--- /dev/null
+++ b/dev-python/xapp/xapp-1.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for x11-libs/xapps"
+HOMEPAGE="https://github.com/linuxmint/python-xapp"
+SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/xapps[introspection]"
+RDEPEND="${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/python-xapp-${PV}"
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index e0e57be35ff9..766d5de70494 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,5 @@
 DIST xmlschema-1.0.16.tar.gz 278082 BLAKE2B 284f71536f86475fbfccefe1130fbea9319282e34ec11a1ca13c6ddd0f8aad2747d66c8cc6443885982c6f98fa074778f2757d012d1380ae46136dc3e5df4a69 SHA512 5dd79e608036995d70b4da627f89c86cd8e7a66f80c2cb87d701395229daa920759769bf7efad34c33dd28ca14971eb155a654f8fec12fb6ace8cb5ecf979650
-EBUILD xmlschema-1.0.16.ebuild 788 BLAKE2B 4330f713ffebe425f9cda5b88ababbb4a143594b0f5c51fde13c244beff14be64ce59d2f145bc3e6447668107f7582cc7a5a8d596d7024fff928db862f1a18be SHA512 9346160fbc672edbd03be189be27049345bc95840bbc20ba643549a0467fe60b90e21269910d6c32858a886fcd425e6d1a29a41a89a16e5c4e2c1d9a0d89c7c7
+DIST xmlschema-1.1.0.tar.gz 285006 BLAKE2B 9369726c6a6680b9a6d9f317ae96df2db68c1cfe8a1024c141bee2211f5ec176898bc147a9597523c872bee6e7519bc9e57972710fe8f983fdeac7ac7984f901 SHA512 6f5e163969ab06a38cf5b36b6b3f6ba31c98753fc5b364e94889b02b5b2c1b2a3bcae8b5c2b809a9c35c1a2cd855f1b98c68723c51ec2b12998db1a4d1c114c9
+EBUILD xmlschema-1.0.16.ebuild 778 BLAKE2B ebaa8b2d12b8b56caf5e09b2524b71929567178fc8aaf8bb28c952c2f8ef681e2bbfd9a72101bfa3313fa64d889e4c102b65950aff185242aa4c93a989b05c88 SHA512 f457c83f85f917579e058dfb4a3b5597dbb64ed5082c5c3bb8b83a1c8e57ab9e03ccbea2b324f547d03d8a79c127bd3cdac47c703ce173002e711ac1b8ddeb2c
+EBUILD xmlschema-1.1.0.ebuild 780 BLAKE2B d3b94f8bd5e388d8f0a913d97b658723567e9efb5ce314b81c8b8fa411395abe69a399f60e9af02207d802feed9fb7b637ca734bdffc0e98b0157b55473b027c SHA512 90061b3aeb1ede74baadc6f7ad3b3e194c6d1cfff61c966b3c33612fc081133cbae542c060d0b8b13b991c0c0d95ff7d85849d5968dd613e7ee63204409dde69
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.0.16.ebuild b/dev-python/xmlschema/xmlschema-1.0.16.ebuild
index f8089f3c2ea6..d23fedd5cddc 100644
--- a/dev-python/xmlschema/xmlschema-1.0.16.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="An XML Schema validator and decoder"
diff --git a/dev-python/xmlschema/xmlschema-1.1.0.ebuild b/dev-python/xmlschema/xmlschema-1.1.0.ebuild
new file mode 100644
index 000000000000..7bdc2f6a6a93
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zVMCloudConnector/Manifest b/dev-python/zVMCloudConnector/Manifest
index 2638f5eb04c8..601be01a72c2 100644
--- a/dev-python/zVMCloudConnector/Manifest
+++ b/dev-python/zVMCloudConnector/Manifest
@@ -1,5 +1,5 @@
 DIST zVMCloudConnector-1.2.2.tar.gz 183984 BLAKE2B cb7c16edb1ec332689ef8c4709e4cf82c64767c49b503279c9280b33b392715a2caaad6275f66a57cbf51f824d9e2f8f207308454955c2fcf89712945e160b28 SHA512 0f947d517efa705dc50494a1e4f2c201f980378eb4e51ef8d98a7af7be8a73ed0dccda836651d5b631fe0bcde58d208d107c54a1109ba892b37d73422db4ffee
 DIST zVMCloudConnector-1.4.1.tar.gz 238562 BLAKE2B 048caf53328cb96589ba4cdba747dce662cf931a9356e10325733800188e945a7f32cbfc5d6eed7900563b384952b8103b446d28c4c5c5ff7b51444605c7a8bc SHA512 206776bd04ef547df530438efe6209db7374c33727d13269f6f3632aa69c74713b358e628dc4fab8afc6657ac65a17bd2ec4c6f2984385de2187581fd734e65c
-EBUILD zVMCloudConnector-1.2.2.ebuild 784 BLAKE2B a39e7eeb5911da36f7848e1be1a6ab4092697cfb846c8eb7c0134f42ae7de03bfe59d387078546eff70bd34c59cddb7a0803666752a3954b30883c811177fd7a SHA512 e8f279f8ad39e8bd066d9876a01597d0803a6d5569013306718983483a1a1b879720fde418a6108d2bf1bc45d41fbe807b231beb0127fb3d0759430ffd035124
-EBUILD zVMCloudConnector-1.4.1.ebuild 794 BLAKE2B dcfdd9840d7e5916e32d6b92c5a9a7acdd7dfb44ba9b7a7db51578817e10da2ad2adb65dbf9f07093b38004fc7f30dd2494bb7b83b621e61dd5951d448089619 SHA512 985bb6ba059cd16ef4d1c43a92dce759ded168f6c5f4eec876f88fba477b20de3871184a15749150c4133e1020283eb80e43d4b12791918e74e0912917c55926
+EBUILD zVMCloudConnector-1.2.2.ebuild 774 BLAKE2B afaddb820e90e05a13c12e9626071ee9109c272bb3b692a1df2b61b537ef7b917e45b5965aaa654a23fdbf89d5cc3c1fed2537b9ac6a96d6a8a68eab2fd83fdb SHA512 92dc3222acf0c5686b8bcc4415c7e9e12c1f2864f62cf86681eae6cfcca738bd160f51e1c956b06de979a41045a133b8e94cc87c5350fa7ef65af18d69761974
+EBUILD zVMCloudConnector-1.4.1.ebuild 784 BLAKE2B 0531a6621db29184af6e3d1b45976767f3acc02aa4f0cf4a63f59c1fa4d49601f8aa65e39c13902f9aa066155ed1c783b8fb959c0d7c91d0f86447e52388adf7 SHA512 d99409e5875d9a27ba4e498dc889d86c155f0c02b659bf4366ac2c90115083d433e89c735a44e9a82242db8e4af38b5c6afb3df7c680989a4c74c5ee25c69b1a
 MISC metadata.xml 530 BLAKE2B 8376b5853991714f02d764dd8a29fc99eea8b524264114fb29118b55a30ac33aa643d1235ad2c8d4ed42836ea6e818e4a544defaa9eb598d13bb1405adb054bd SHA512 0a9490c18da93cc8d55373ba27ac71d4a81a77756bcbf9817a08a74c0903aa00f891cb758903007b0e17ee81256dd0eb4ab559d0e1974c8f94668552a11e5fbc
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
index 2d27d659b8c1..f0ec62c365b2 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="a development sdk for managing z/VM"
diff --git a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
index ba727d9d53ac..a67e4cb26604 100644
--- a/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
+++ b/dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 5cbaf3cb7d31..1e6fcdec77d3 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,5 @@
 DIST zc.lockfile-1.4.tar.gz 11075 BLAKE2B 4fcc18b4d337c1b102916588aef7271fe189f30e442b5d2180b5a20d804f84649d4bf9dc6f601e6b7ee38c4a436c3848b83cbcb1a19974acdf072347b6822b83 SHA512 f145c34088770b50002d1caa88876f9fb11f3b9810fe68b8e1a38d27084d27ce058883228469abb05811f3f11a7b94acdaad8392eb1b6c34c98ddc885cdf77be
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
 EBUILD zc-lockfile-1.4.ebuild 1111 BLAKE2B 1729d2d05c835a3a9490755dba0e72dd09b3ccb4bfad2154d2c6bab13d50be5f2fd97e3a67f93164b40f9ecc7bdc1f0e20fb11f1213cb8dc1757c2b61c17fa57 SHA512 bef3b5165e8a9839b07ee0f4a33175dc2885a18090d0305d8d75b48b525411153bb19fcd4dfdfa0134e46b372eaac0b86d0709c4fa9f1ea83b15e4e3a5253562
-EBUILD zc-lockfile-2.0.ebuild 1042 BLAKE2B 0aedf5a624f33aa0892f941a74026b82c3fd88462033b42595aa586f0fc28dedbbf90bafa46b67c7f711a9f7a65a408f1ba3b6664e97a4c827724ff00f45a815 SHA512 78b862f992366812481c66ec095d75a1c0615026937f4be0c49f5e7422b5a9d265c7116e36c21eb22a9cf3c915fa6997670bac88a2d9e21bff7c30090ebdfcd9
+EBUILD zc-lockfile-2.0.ebuild 1047 BLAKE2B 90c871b949a93b7fdf7f11f2a88ecdac5fbdda4428e9f7270cc7dc0b7c5cc50a56c4972b4a303ee74f19abd498a48af2e96f145df6b52b6f9827fcadcd234d40 SHA512 68ec87c47b87f18bfbb43fd6fabea87a5f3cc3f3f621b8c52a4b8ce68e6d92112c6837565714120a9dbcd865d9370177fbec314d04b169bc283b3f7ccf459b51
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index 9b71a0beccb4..a92d5f9a547e 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/setuptools-3.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 9c7f0b526188..bfd10681b90f 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,3 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
-EBUILD zeep-3.4.0.ebuild 880 BLAKE2B c9a4260932387566142b4d6af957973a22c30b800c63a37a0b5781586b0337f690caff6b5acf8ac308478cf0992bc72a3b4abf3b67c5dfed4d7d73897454f770 SHA512 376729d9a6af0c6f810758d6b555b407fa178a8664ed0fae5a900dabb46b4348e5134edc7d086029118e3235edf0d0acbd547c08ebcc0c492512c03bed0ac70a
+EBUILD zeep-3.4.0.ebuild 1104 BLAKE2B 574fec4955e588977abc0e66ca4c71984cea96d02f12e889106647acae0933bdc7ec4179898d69b9b17e4b870712450e1963e86935de04836b04b363099d8f57 SHA512 cc0e4bbfadef38cdeb1007d7fc42d3599c33dbff8f8ba33bbf73f18390f7743a20cf9449f70c052d3f32e6e7c29d33fc6302e185d205560393e1b37a0d4c37d3
 MISC metadata.xml 589 BLAKE2B 7753eafe2db0c0494f397bdb185d121f6cf380a7007241d2a8a5e87b8a9080c026ee07c8d64d1ca1e661137c315492e28a6f6fd33578bcdc54432d9f183586c2 SHA512 b6d919287e23bc7a9aebaa3103678b7ca3927d7348a3470a266eaae25795851840c479307fd19a8fadb13f1e051b60bc617726fcfcd14983085fc33670f826ae
diff --git a/dev-python/zeep/zeep-3.4.0.ebuild b/dev-python/zeep/zeep-3.4.0.ebuild
index e3416ee73b7f..8a508a3b5ca2 100644
--- a/dev-python/zeep/zeep-3.4.0.ebuild
+++ b/dev-python/zeep/zeep-3.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
@@ -17,20 +17,20 @@ IUSE="async -tornado"
 
 DEPEND="dev-python/setuptools"
 RDEPEND="${DEPEND}
-	>=dev-python/appdirs-1.4.0
-	>=dev-python/attrs-17.2.0
-	>=dev-python/cached-property-1.3.0
-	>=dev-python/defusedxml-0.4.1
-	>=dev-python/isodate-0.5.4
-	>=dev-python/lxml-3.1.0
-	>=dev-python/requests-2.7.0
-	>=dev-python/requests-toolbelt-0.7.1
-	>=dev-python/six-1.9.0
-	dev-python/pytz
-	async? ( >=dev-python/aiohttp-1.0 )
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
 	tornado? (
-		>=www-servers/tornado-4.0.2
-		<www-servers/tornado-5
+		>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
+		<www-servers/tornado-5[${PYTHON_USEDEP}]
 		)"
 
 DOCS=( README.rst CHANGES )
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index d71e6907c51a..1bb64126b609 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,7 +1,7 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
 DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
 DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
-EBUILD zict-0.1.2.ebuild 679 BLAKE2B 5e9291882c0293135e17660fb840cc4c24e3768f8782ed893cc71b0d799efbc0b5e024ff163728d061de5036cd64e1885f99c74d6318faff2b2e488b20f6ce23 SHA512 1b0d99cbf31bc12df28f17121f23d0a0be006adb9a44b043da33e6e4bd428db10d337f812086684537e127ebc50cfd16b1a30847986dd82f41b70461d7872053
-EBUILD zict-0.1.3.ebuild 675 BLAKE2B 312ed628deaf8214490e86578090b742bcd3d134910726131def4a9f2a8e571129e30b16979cc3de4bbcc61bae30419b49faea378d6be221b651765b86c62b1a SHA512 8e368d6b22c56fcd3ae40b6f9fe09a22f014a5b760444cda177bace414b13ac1afde8363c63615cacac82e3a6311daebc3f46ccc9e0780cb1d6f7162a22436a3
-EBUILD zict-0.1.4.ebuild 677 BLAKE2B ad580411e4cb78026f7ae1c5425c657e9898d7993c9ebd69f448dc467f5015756e2b793631e1733171af4e0fffea5b30888227eac62fb45723ba95a04872a3d0 SHA512 b35edc9d0e3a88990a3c0ba5693b782ebea8abc3831e7a7a8a74354b87a09a6ccce7d9f856c468fed1606e7603d8d03a023686512f5052585bf026f35e41d41e
+EBUILD zict-0.1.2.ebuild 669 BLAKE2B b563c419e6dd3573f89c4ce172e350ca39d39a2cc6d6f9215d224038d2d3c1a420c5b76beec39c195304e616163e4a9885206d971cf5352c9102833b48ff4abd SHA512 0ead2d7f23ab77351e41b87d6d5d6b03fd8baeb3ff4422cceefd986be277a15994e1c7bc5dbeed776a8a3bd9ce245eae4a6807e969424d5c614ade8a548237b3
+EBUILD zict-0.1.3.ebuild 665 BLAKE2B 6385d935eb958b071f956adcb7df5f43e7a894289aa6f66474b8cc48710f670ce6a32688b67742bae847022573c4b64a01538cb497ddaa3c2850b4cdb5f9dac8 SHA512 337dcab9d414e97d0553e68bc692cbf6c14b9228ccacdd2eedb69a1662116c8cb008530d944fdefc14bc7151a9a12c2b7ff9f40439d8bf54b20895101a2cb1d5
+EBUILD zict-0.1.4.ebuild 667 BLAKE2B 37edefe1c592d0b0d267e12f5f05cbe527630d72254bec8cf93395aa493caf98a9c6261e82044c7e159f4f3ac8679c48f51457279a8c5a5cf8a00fa35a0f3211 SHA512 ec63edb28c8673f0ec20f1629674236aaed8fc4196c4d6bb2cea3d88094b92aef1a889f1b32ebd4eff1a84250cfd51f63fe4b879a731a24a4256851fd9a25411
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
index c2c724b4931b..85e4db0c5b5b 100644
--- a/dev-python/zict/zict-0.1.2.ebuild
+++ b/dev-python/zict/zict-0.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zict/zict-0.1.3.ebuild b/dev-python/zict/zict-0.1.3.ebuild
index 409eb9478ea0..5fb26c305b97 100644
--- a/dev-python/zict/zict-0.1.3.ebuild
+++ b/dev-python/zict/zict-0.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
index 05b954bd6283..ff9e1def3a60 100644
--- a/dev-python/zict/zict-0.1.4.ebuild
+++ b/dev-python/zict/zict-0.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 5f4ea9aac4af..2dc3ad1339ef 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,9 +1,9 @@
-DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
 DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac4598a8f2007b8197c007e90ef39a56d193052d484b36247d73d5712d878ea35d222895e5b3ff21963ba13 SHA512 ac49f0c0aa83398ad0892932b1f067df94e2108691338c80400235053834bcbcb1a58b2b7b5807f398088a09e9d1cb591d94153a2a44ef3ef96506271d817e05
-EBUILD zipp-0.5.2.ebuild 1129 BLAKE2B f2c1151f8c9f27601288c5508dc099ed6c90cf668fc0075610dce2fddcbf442010ac9f3388097459cbb91de012d9cc9912496161517aaac3181d630f421f7ed1 SHA512 1dc2b4335d18b1ccdb7282e1dabe8f7d91fd2e817279de6a7669e38dcd9c3398a27f72331f442882a9b4f5c84adc421072d3672a2e7e27fe63bf998065cf66c0
+DIST zipp-2.1.0.tar.gz 13758 BLAKE2B 1e1c0e0a7d6b7116c12c8f2af8ba9e807d203920450e1673fc0137ba4f47390ae5fd9c677876b582ed2c91cf33677913ada5fedf20f7c8cdd48c38646d3a4afd SHA512 24829aea6f76bf277e2bef9f039f253d5f7cae5830ca7fb0ad9140ba48ad02bb5848b0f5eccb5e72c5282da1f8e18083b98868aea2ca4f7a41d478a03d012235
 EBUILD zipp-0.6.0.ebuild 1196 BLAKE2B f4c446a07369d5d45f2b0563f070ed38cbf353bb66ed7453ea0931d9cb6e9fd77499dba623b869076e8b02de164b72a0bd207ec0238215bee77a751c73446427 SHA512 9f6570677e31aaf885bc458d44c8b9f6e2a67066fa5f284e5ed3681ef566d9caaf94064ba31563e1c881196960d47ef8a67da010180150a7a85adfdc14b4ba35
 EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
 EBUILD zipp-2.0.1.ebuild 913 BLAKE2B edda049af7d5ab070af46d8462496fd14d8ac4168bfd43c3b0a1f804d45370acb97248c84ea66a412554354321b522b8b47f03e37fc7eeb637b9fc23ab9dd72f SHA512 abfe9bf84a3e07145769ebb30fe35d9229daba3783a4eef482f89c5bf3dfd5e1e2d39761f841f4587495af796e6af4c01c4b31c82a48a79dbcb3e2efe471af13
+EBUILD zipp-2.1.0.ebuild 864 BLAKE2B e795456eff91f50caaaf0e0e5d7330f6fc1c13e9188ac5f550c5a5a55686164fcf88ed7e90e9eedf8743bfb6740bb7781726b72f0f9b0419d9566072509164d6 SHA512 c89efb3cfdcface4607e9a78bda1613f038c227d8ae408879ec2fe3299f0aeafca900b26b7ecc0b1930ee3d11ceea1efb0224d0d9518d94ba57b5250ae8f23a5
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.2.ebuild b/dev-python/zipp/zipp-0.5.2.ebuild
deleted file mode 100644
index 5bfbbf4ef3a5..000000000000
--- a/dev-python/zipp/zipp-0.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/zipp-2.1.0.ebuild b/dev-python/zipp/zipp-2.1.0.ebuild
new file mode 100644
index 000000000000..e7606482038e
--- /dev/null
+++ b/dev-python/zipp/zipp-2.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="https://github.com/jaraco/zipp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
+	test? (	dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 267b87aeb51d..ca7ef908a954 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,7 +1,7 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
 DIST zope.event-4.4.tar.gz 18818 BLAKE2B 628625280c1e3f06f2c2e6e9aa88d3e34958718ea4624d54a5b915f8a570e38d4893adc0a0c688a7f09d3c81ffd67fbb69a3bc89ad58d95be498c2de48fff697 SHA512 34dac7ce2e8faf464bdb3861217beb1dd0976b1cc047d45a79f1640dd256bf33162da6e105c00135217fcdb888fc3ac7a4b0b4b047f64ce310c4d11cff71a985
-EBUILD zope-event-4.2.0.ebuild 861 BLAKE2B e3e7aed3ceef623b33d3a9e52a6393ed1d97198a2fdb2f43ff0d0ddd98a471824a441463e50b99b589f6f2ccbdbbc2be0197587787c76eb72389c589765fdd7c SHA512 3752aace579cd1c6618eb43d551b5d0e9e550f2d9344dadefca0abcd934c398cd4af1f544a537207cc07bb7e705c2aa5900b51aa19061ff1666f76fbd8547ed3
+EBUILD zope-event-4.2.0.ebuild 862 BLAKE2B 2d6b84b6f721b5977040b183e379ef39dd6d26c61064c1c20e8431e4efe73ead26c1b0f5bd1a402b6be21c4d0b375f2668ef91bf023953f2bdb3784d676ea7ea SHA512 8ef10d67665f852561961c82f714db7c6a4345138f3be75ba9fd2a7f77281c8d37cecc1261ac9a1f4e79eee554cd473bb6f5b0b4ec0abb2c9b71849e8b47e28c
 EBUILD zope-event-4.3.0.ebuild 1010 BLAKE2B 4c017909de626c4d3e6a47f93a1022ee2c04c956a61fffc2b52005c7845bbe3e2e3e2b6c3aeb446fcf0955166289136ac6f69d12d8b2f07819a571e469f16010 SHA512 7b5724c240a292cc3bad7334fdae7576fc1ba84542be38e6cb34ea3081eabe224e98b0a2f9e1fbbad2217a95a7ef5d98d22391440865649e231c2d3a453b6773
-EBUILD zope-event-4.4.ebuild 1002 BLAKE2B bd2d9c91dd16532a5003356064a2c88999ebe213a397f69c15d40989cf51d8264ad2c6b623381f7ed9c2f34a322918be3c88113760a86356631e7bb7bed0cfd8 SHA512 3d358aa027fbab4b9af8fcb9b72c3bc04dc27d8eaec9687e1b516a2ddc057ab9a0df139f8c901842ab8839b37f3574373990d6e9a2c60db742c69d234b900f8b
+EBUILD zope-event-4.4.ebuild 1003 BLAKE2B 984e3dd675699a58ea534931f52104fe4452c89ddbde0c1478c7d4ff3062ce17ad6b4bea32f9fbc54f83868fcda0bdfdc2a74c64d683726afff7a2d435682763 SHA512 b6f88655d89e0081c79c0b3902d24fb97a7f66d69c50a5c34845f94f44c272af3d677632290b2885e15f36b1e8b132596fb9e354d7546e58f3178bae9616533f
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index a3124c8c010a..e1ebb78e37e2 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-event/zope-event-4.4.ebuild b/dev-python/zope-event/zope-event-4.4.ebuild
index ab2929abdc04..040e31584217 100644
--- a/dev-python/zope-event/zope-event-4.4.ebuild
+++ b/dev-python/zope-event/zope-event-4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index c50893a68169..f0d9eaf93e14 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -4,10 +4,10 @@ DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532
 DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe960130727cf36dce4d6469b84da2747c1dc2eddbc29c779024c40bb7f2457559875ffd39e64c5e0ea7aaa911d7d19e2ca3 SHA512 d3a256723901bf505e4caa0f9988814cd583aefa1adced7ea9ce0a9130e67909f8d6b5dd20d986182a34ea216d63aec1aa4513fc76110e6d96a43a49f1719ee1
 DIST zope.interface-4.6.0.tar.gz 150884 BLAKE2B d31c006553b31f7a5096f69d33341c868723aa0eeee375265c61896fc2dc16109e3f5135a0007604f9e6049fc0cc905e0f8c7ad23e1156a636094d0b334febc7 SHA512 cb82144f0b228dd4d2f7cbfba130ee190265bf809d4e928262935c3b5551a3a298df4eba2dfe7ecde96fed27f39f59ab95e9c11f3eadf0fdc13f61b5c046f78f
 DIST zope.interface-4.7.1.tar.gz 151374 BLAKE2B 87900329d4634456287fe0fc78093df02f9b0e27fe2fd9f6dc039253f5814f2a00936e0f49e6001754c192eed323cfad068cf863d3e52ed31bad6352d83e1d0e SHA512 cb99cdf9733cdd2fb6637163167da0073145db1ed1788ae147098a23a9cafb4d661368a1780a44a231a2ea9f1adfa4fd6acac423a4a8d9cf026ee3a603ca7767
-EBUILD zope-interface-4.1.1.ebuild 954 BLAKE2B dcc901c3edee5205d4d1f735a706ee147fff587dbac4a6a865f5db99d63da3caf13873c4a99a22c6fa70b46a5c52217392e05d4ed4c84be8113681c6558cd6bd SHA512 99a32cf5c438348ee94ef2091dd933f0196a0f8d6aec143f31ac30502dfcc82186eb9452802b56bd6b2389f23834ba1175ed6cbf89904ba894c8b2d06714ffcb
-EBUILD zope-interface-4.3.2.ebuild 1025 BLAKE2B 222c825ccc26b6a9be3fcae15711fc9a3fce9170aecadf19def9720ad82b5e5c0c3ed5f8681f8ab4d14857583663b9573be7d7d56c0e5197d60f00ea49edf36a SHA512 b4358780f94b36da90b8793038107aad616c49f40063c265be097a07ada925a28a1aa035951efa86ba970a569fbaab32b95b445a9ea15c22a435710adffeb8c5
-EBUILD zope-interface-4.4.3.ebuild 1272 BLAKE2B 203ee033b7f725ca28cace533d072c59eb9aadbce948da5064739eb356a7f232a98c49c4044284e8664fe3068698324b299110e045ed30ee2aaa2788cda3349b SHA512 3fd112acef8c3c83968b2e943432cb9ed62d21ec75007eb579fd48be615fd1e726bed7962263549d9a7a2b7162d49c81c9ea462a66a64a6827d7c2ccb3d158b6
+EBUILD zope-interface-4.1.1.ebuild 955 BLAKE2B b19dffab1958f8f9937eff74229cfae6a85bc10465e65a9e49daef71f41890de619e0942b04fedcca15ad9dfaaca66edc6cd7fbfd120abf5842f1ce4ce0ef63f SHA512 f0ba706569204bda90cb5690d6484bb86acda26870d3a400a850adf3b688ef7518fc5772df1930aed9e6d23732df00e5eb1e8b2dea23bb7fafe2f51be77e24eb
+EBUILD zope-interface-4.3.2.ebuild 1026 BLAKE2B 95e56b50d8ae0cf2115820c8b0568bc04ef79ffdc7b01a6bd315c333db0c6c5633f431e381de6bedf97eeffa927f9328a4a762d9ecaa49d5c6412f59fb1034dc SHA512 c7f3e7fe5e39a4ac2db634d05781716846e8f97a5650d2f0049fe7fc28b4da362d0a972d624762530bfced6a572b0f1ee8967fdbe587fcb0a1589ba067ae5a82
+EBUILD zope-interface-4.4.3.ebuild 1273 BLAKE2B 27c1114de4b6e701b69396c5ed826f2326fa73bb16b4a3920b39e1e8fb78bd2bdf65f87e666cbc80b10e90cb3e28c869de5e66d078bd7ae7d02cf5c4eb2e963b SHA512 9b7d05f40cc815f1a1fc7439e9260e1593a1c256a73e3c3bb1096ece1f891fde854ad5c2f72f4dd7b725586fa942ad85e825c96160e9bf659ece2afc6f74242e
 EBUILD zope-interface-4.5.0.ebuild 1287 BLAKE2B a0d06d2b81d4261f847a7592ef96acd3eac851340ec736486b285302013c3412f4bc9cd169282a8957c63f73f6b57d08b55cad2a9f200dbcaaabed373f16df14 SHA512 2db1984cbdd27263f9e7f1447361417de9e389babee55f2125175034efa6972b3cdbc2dc4c97098095a75c07e9d2254bddb94a8e3294d103a94d4739d3724de7
 EBUILD zope-interface-4.6.0.ebuild 1289 BLAKE2B ffcd2ed4bf58637d9a9d88e51992e970013136c31393cd51afbdc05a0db4489d74503b8943fb21830c106f4917a8df0308d1c80f3925f54d2553472fbaf75fba SHA512 13d7fa15da09ae965323f34de9ebad46bd0869c4eda1ba94f48967c41cb9ba0e660a30f4964761dcafc9577bb17a009e7ecca9935f0f46843ecb41ea9c1f0765
-EBUILD zope-interface-4.7.1.ebuild 1212 BLAKE2B ddfa6deb0f189cedef845dcc74a9fc2adbadf442bec18620473df9c9b01079becb3dc2d83b7f5c23df283224c2e148375fe1382575b084a4e60fe9d451516634 SHA512 6097d5782bfbb3eccac0d60e94b8799158f0312081cb27ce0e22cb072da544fec37a11564e39cb7e67409e63d511b76c6d92da3cd21fd421f0021d8a9825eba0
+EBUILD zope-interface-4.7.1.ebuild 1213 BLAKE2B ce78bb28fa465851324a3dc91268f5bde252e68701c84bea406bb45ce1642d649a26883f1c68f30200c91142e77db8a5f7fa1a02d832c4b303831e1dc89c3faa SHA512 b714b26d052f80c4ec44ba03a2358865c65bbd3296bf9d534c1f919eabad928fcfee392f0448f23528cbcd1e0bc87383144e3895356960edd816057243663f6b
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
index 6f20a6aa9600..35e5ff520bbf 100644
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index 46deb02eb6a0..4875bd9e038e 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index 9d5b1af518d7..5f471894b84e 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-interface/zope-interface-4.7.1.ebuild b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
index 4e4e68a5ca5d..d102c52b33e4 100644
--- a/dev-python/zope-interface/zope-interface-4.7.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index fa68a7a20ced..90b24b5ca594 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -5,5 +5,5 @@ DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c
 EBUILD zstandard-0.11.0.ebuild 668 BLAKE2B bf256ad39a55320643dde62e832da92c65bdae8519ff4021bb65ad49c6f8148cd235c1bd0fcb9524fe61dbe4e50d678a2797f5bbaecfa6e81db306a0ab124f3b SHA512 7a0c670db8be5b0bb6f305f6337c72aae5f729ac4129d363a5077ff8f9a1d2f31ae0bd4496b5448f7e0338aa52f3284b129d0d0a241af416ff1eeeacb3360e63
 EBUILD zstandard-0.12.0.ebuild 793 BLAKE2B 76b4881858bbd71bea8498befdd98d65e85a168422d4b7b371eb726b5163257e9f564299f9691a90b995a013cc47114aad48ca5c9809582615aca9f42ea63e3d SHA512 ec6b57a43b9fdfa6a13397aee422bba4cb3e3c9aa404057f537d6a49f37c3894cbb587b4555920a559355775d2a3f2bcbb60664c206aec56c84a5c9714d0a012
 EBUILD zstandard-0.13.0.ebuild 866 BLAKE2B ff64ad96c334aee50b6ded3ecfa3e21f09ffc8f3b0cdc17b1858ae2587374a9df7dc3951740218e5ac3d66b9044b12711604b798ceb5bd24570f95ee45418759 SHA512 c4740f3d3b1f44494188733cef44be83c0475eca24268421f2087aa4956a6039d4863fdcbf9c539a43aff8f5b43d1b9a58103f8dc92e399adeddd8c6a20d7599
-EBUILD zstandard-0.8.1.ebuild 668 BLAKE2B 3f131636cc0ad07f8104bd13ff22036e1d3468c75a3b4abfcf76565d89898f5a515a40e658903e1785c13c6b86d6ddb081e1bf76ace4a70c414411a77577e60a SHA512 d5542c88d82d2a94f68ffaebe78a4cf8711baed9d5fbfec807bea8aa37d287ef3ca2738ca8c282972e420dc6034dbba15cd4c746a7499e9c99f1b77a400b75e0
+EBUILD zstandard-0.8.1.ebuild 669 BLAKE2B fa6f925aae7eabbae84ea33741bd35440fd0f54f9cf25b88620f8588d3ef77ea429c60a0c4d7c12d0d0e9b28d6008675dc8ebbbbb0790a60ab4d6db3fce72d7f SHA512 193088eb182ef81077fcc481069dc64c11c5643942c7e8efcda46ff63e050b23551b4fc1563125dac36a1892dce327a9c16e5c60ff7b8e600975bbdeaa9f4ce0
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 76fb03187463..c3b3382d6b9b 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]